New macro system and stdlib additions

orchid-std/src/std/number/num_lexer.rs

@@ -3,6 +3,7 @@ use std::ops::RangeInclusive;
 use orchid_base::error::OrcRes;
 use orchid_base::number::{num_to_errv, parse_num};
 use orchid_extension::atom::ToAtom;
+use orchid_extension::context::i;
 use orchid_extension::lexer::{LexContext, Lexer};
 use orchid_extension::tree::{GenTokTree, x_tok};
 
@@ -12,13 +13,13 @@ use super::num_atom::Num;
 pub struct NumLexer;
 impl Lexer for NumLexer {
 	const CHAR_FILTER: &'static [RangeInclusive<char>] = &['0'..='9'];
-	async fn lex<'a>(all: &'a str, ctx: &'a LexContext<'a>) -> OrcRes<(&'a str, GenTokTree)> {
+	async fn lex<'a>(all: &'a str, lxcx: &'a LexContext<'a>) -> OrcRes<(&'a str, GenTokTree)> {
 		let ends_at = all.find(|c: char| !c.is_ascii_hexdigit() && !"xX._pP".contains(c));
 		let (chars, tail) = all.split_at(ends_at.unwrap_or(all.len()));
 		let fac = match parse_num(chars) {
 			Ok(numeric) => Num(numeric).to_atom_factory(),
-			Err(e) => return Err(num_to_errv(e, ctx.pos(all), ctx.src(), ctx.ctx.i()).await),
+			Err(e) => return Err(num_to_errv(e, lxcx.pos(all), lxcx.src(), &i()).await),
 		};
-		Ok((tail, x_tok(fac).await.at(ctx.pos_lt(chars.len(), tail))))
+		Ok((tail, x_tok(fac).await.at(lxcx.pos_lt(chars.len(), tail))))
 	}
 }