New macro system and stdlib additions

orchid-std/src/macros/instantiate_tpl.rs

@@ -4,12 +4,13 @@ use never::Never;
 use orchid_base::format::fmt;
 use orchid_extension::atom::{Atomic, TAtom};
 use orchid_extension::atom_owned::{OwnedAtom, OwnedVariant, own};
+use orchid_extension::context::i;
 use orchid_extension::conv::ToExpr;
 use orchid_extension::coroutine_exec::exec;
 use orchid_extension::expr::Expr;
 use orchid_extension::gen_expr::GExpr;
 
-use crate::macros::mactree::{MacTok, MacTree, map_mactree};
+use crate::macros::mactree::{MacTok, MacTree};
 
 #[derive(Clone)]
 pub struct InstantiateTplCall {
@@ -35,24 +36,24 @@ impl OwnedAtom for InstantiateTplCall {
 		self.clone().call(arg).await
 	}
 	async fn call(mut self, arg: Expr) -> GExpr {
-		exec("macros::instantiate_tpl", async move |mut h| {
+		exec(async move |mut h| {
 			match h.exec::<TAtom<MacTree>>(arg.clone()).await {
-				Err(_) => panic!("Expected a macro param, found {}", fmt(&arg, arg.ctx().i()).await),
-				Ok(t) => self.argv.push(own(t).await),
+				Err(_) => panic!("Expected a macro param, found {}", fmt(&arg, &i()).await),
+				Ok(t) => self.argv.push(own(&t).await),
 			};
 			if self.argv.len() < self.argc {
-				return self.to_expr().await;
+				return self.to_gen().await;
 			}
 			let mut args = self.argv.into_iter();
-			let ret = map_mactree(&self.tpl, &mut false, &mut |mt| match mt.tok() {
+			let ret = self.tpl.map(&mut false, &mut |mt| match mt.tok() {
 				MacTok::Slot => Some(args.next().expect("Not enough arguments to fill all slots")),
 				_ => None,
 			});
 			assert!(args.next().is_none(), "Too many arguments for all slots");
-			ret.to_expr().await
+			ret.to_gen().await
 		})
 		.await
-		.to_expr()
+		.to_gen()
 		.await
 	}
 }