Significantly extended stdlib

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

@@ -2,7 +2,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::conv::ToExpr;
 use orchid_extension::lexer::{LexContext, Lexer};
 use orchid_extension::tree::{GenTokTree, x_tok};
 
@@ -15,10 +15,10 @@ impl Lexer for NumLexer {
 	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, lxcx.pos(all), lxcx.src()).await),
-		};
-		Ok((tail, x_tok(fac).await.at(lxcx.pos_lt(chars.len(), tail))))
+		match parse_num(chars) {
+			Ok(numeric) =>
+				Ok((tail, x_tok(Num(numeric).to_gen().await).await.at(lxcx.pos_lt(chars.len(), tail)))),
+			Err(e) => Err(num_to_errv(e, lxcx.pos(all), lxcx.src()).await),
+		}
 	}
 }