New macro system and stdlib additions

orchid-host/src/lex.rs

@@ -13,7 +13,7 @@ use orchid_base::tree::recur;
 
 use crate::api;
 use crate::ctx::Ctx;
-use crate::expr::{Expr, ExprParseCtx};
+use crate::expr::Expr;
 use crate::expr_store::ExprStore;
 use crate::parsed::{ParsTok, ParsTokTree, tt_to_api};
 use crate::system::System;
@@ -60,14 +60,7 @@ impl<'a> LexCtx<'a> {
 	}
 	#[must_use]
 	pub async fn des_subtree(&mut self, tree: &api::TokenTree, exprs: ExprStore) -> ParsTokTree {
-		ParsTokTree::from_api(
-			tree,
-			&mut { exprs },
-			&mut ExprParseCtx { ctx: self.ctx, exprs: &self.ctx.common_exprs },
-			self.path,
-			&self.ctx.i,
-		)
-		.await
+		ParsTokTree::from_api(tree, &mut { exprs }, &mut self.ctx.clone(), self.path, &self.ctx.i).await
 	}
 	#[must_use]
 	pub fn strip_char(&mut self, tgt: char) -> bool {
@@ -146,9 +139,9 @@ pub async fn lex_once(ctx: &mut LexCtx<'_>) -> OrcRes<ParsTokTree> {
 			let mut errors = Vec::new();
 			if ctx.tail.starts_with(|c| sys.can_lex(c)) {
 				let (source, pos, path) = (ctx.source.clone(), ctx.get_pos(), ctx.path.clone());
+				let temp_store = ctx.ctx.exprs.derive();
 				let ctx_lck = &Mutex::new(&mut *ctx);
 				let errors_lck = &Mutex::new(&mut errors);
-				let temp_store = sys.ext().exprs().derive(true);
 				let temp_store_cb = temp_store.clone();
 				let lx = sys
 					.lex(source, path, pos, |pos| {