temp commit

orchid-std/src/macros/mactree_lexer.rs

@@ -3,13 +3,9 @@ use std::rc::Rc;
 
 use futures::FutureExt;
 use orchid_base::error::{OrcRes, mk_errv};
-use orchid_base::location::Pos;
-use orchid_base::parse::name_start;
 use orchid_base::tokens::PARENS;
-use orchid_extension::atom::AtomicFeatures;
-use orchid_extension::gen_expr::atom;
 use orchid_extension::lexer::{LexContext, Lexer, err_not_applicable};
-use orchid_extension::tree::{GenTok, GenTokTree};
+use orchid_extension::tree::{GenTok, GenTokTree, x_tok};
 
 use crate::macros::mactree::{MacTok, MacTree};
 
@@ -17,15 +13,14 @@ use crate::macros::mactree::{MacTok, MacTree};
 pub struct MacTreeLexer;
 impl Lexer for MacTreeLexer {
 	const CHAR_FILTER: &'static [RangeInclusive<char>] = &['\''..='\''];
-	async fn lex<'a>(tail: &'a str, ctx: &'a LexContext<'a>) -> OrcRes<(&'a str, GenTokTree<'a>)> {
+	async fn lex<'a>(tail: &'a str, ctx: &'a LexContext<'a>) -> OrcRes<(&'a str, GenTokTree)> {
 		let Some(tail2) = tail.strip_prefix('\'') else {
-			return Err(err_not_applicable(ctx.i).await.into());
+			return Err(err_not_applicable(ctx.i()).await.into());
 		};
 		let tail3 = tail2.trim_start();
 		return match mac_tree(tail3, ctx).await {
-			Ok((tail4, mactree)) =>
-				Ok((tail4, GenTok::X(mactree.factory()).at(ctx.pos(tail)..ctx.pos(tail4)))),
-			Err(e) => Ok((tail2, GenTok::Bottom(e).at(ctx.tok_ran(1, tail2)))),
+			Ok((tail4, mactree)) => Ok((tail4, x_tok(mactree).at(ctx.pos_tt(tail, tail4)))),
+			Err(e) => Ok((tail2, GenTok::Bottom(e).at(ctx.pos_lt(1, tail2)))),
 		};
 		async fn mac_tree<'a>(tail: &'a str, ctx: &'a LexContext<'a>) -> OrcRes<(&'a str, MacTree)> {
 			for (lp, rp, paren) in PARENS {
@@ -35,14 +30,14 @@ impl Lexer for MacTreeLexer {
 					let tail2 = body_tail.trim();
 					if let Some(tail3) = tail2.strip_prefix(*rp) {
 						break Ok((tail3, MacTree {
-							pos: Pos::Range(ctx.pos(tail)..ctx.pos(tail3)),
+							pos: ctx.pos_tt(tail, tail3).pos(),
 							tok: Rc::new(MacTok::S(*paren, items)),
 						}));
 					} else if tail2.is_empty() {
 						return Err(mk_errv(
-							ctx.i.i("Unclosed block").await,
+							ctx.i().i("Unclosed block").await,
 							format!("Expected closing {rp}"),
-							[Pos::Range(ctx.tok_ran(1, tail)).into()],
+							[ctx.pos_lt(1, tail)],
 						));
 					}
 					let (new_tail, new_item) = mac_tree(tail2, ctx).boxed_local().await?;
@@ -53,11 +48,13 @@ impl Lexer for MacTreeLexer {
 			const INTERPOL: &[&str] = &["$", "..$"];
 			for pref in INTERPOL {
 				let Some(code) = tail.strip_prefix(pref) else { continue };
+				todo!("Register parameter, and push this onto the argument stack held in the atom")
 			}
+			todo!("recursive lexer call");
 			return Err(mk_errv(
-				ctx.i.i("Expected token after '").await,
+				ctx.i().i("Expected token after '").await,
 				format!("Expected a token after ', found {tail:?}"),
-				[Pos::Range(ctx.tok_ran(1, tail)).into()],
+				[ctx.pos_lt(1, tail)],
 			));
 		}
 	}