New macro system and stdlib additions

orchid-host/src/sys_parser.rs

@@ -11,7 +11,6 @@ use orchid_base::tree::ttv_from_api;
 use substack::Substack;
 
 use crate::api;
-use crate::expr::ExprParseCtx;
 use crate::expr_store::ExprStore;
 use crate::parse::HostParseCtx;
 use crate::parsed::{
@@ -35,7 +34,7 @@ impl Parser {
 		comments: Vec<Comment>,
 		callback: &mut impl AsyncFnMut(ModPath<'_>, Vec<ParsTokTree>) -> OrcRes<Vec<Item>>,
 	) -> OrcRes<Vec<Item>> {
-		let mut temp_store = self.system.ext().exprs().derive(true);
+		let mut temp_store = self.system.ctx().exprs.derive();
 		let src_path = line.first().expect("cannot be empty").sr.path();
 		let line =
 			join_all((line.into_iter()).map(|t| async { tt_to_api(&mut temp_store.clone(), t).await }))
@@ -57,7 +56,6 @@ impl Parser {
 					i: self.system.i(),
 					mod_path: &mod_path,
 					ext_exprs: &mut temp_store,
-					pctx: &mut ExprParseCtx { ctx: self.system.ctx(), exprs: self.system.ext().exprs() },
 					src_path: &src_path,
 					sys: &self.system,
 				})
@@ -73,7 +71,6 @@ struct ConvCtx<'a> {
 	src_path: &'a Sym,
 	i: &'a Interner,
 	ext_exprs: &'a mut ExprStore,
-	pctx: &'a mut ExprParseCtx<'a>,
 }
 async fn conv(
 	parsed_v: Vec<api::ParsedLine>,
@@ -87,7 +84,8 @@ async fn conv(
 			api::ParsedLineKind::Member(api::ParsedMember { name, exported, kind }) =>
 				(name, exported, kind),
 			api::ParsedLineKind::Recursive(rec) => {
-				let tokens = ttv_from_api(rec, ctx.ext_exprs, ctx.pctx, ctx.src_path, ctx.i).await;
+				let tokens =
+					ttv_from_api(rec, ctx.ext_exprs, &mut ctx.sys.ctx().clone(), ctx.src_path, ctx.i).await;
 				items.extend(callback(module.clone(), tokens).await?);
 				continue;
 			},