Significantly extended stdlib

orchid-std/src/macros/utils.rs

@@ -11,7 +11,7 @@ use orchid_base::name::{NameLike, Sym, VPath};
 use orchid_extension::atom::{Atomic, TAtom};
 use orchid_extension::atom_owned::{OwnedAtom, OwnedVariant, own};
 use orchid_extension::conv::ToExpr;
-use orchid_extension::gen_expr::{GExpr, sym_ref};
+use orchid_extension::gen_expr::{GExpr, new_atom, sym_ref};
 use orchid_extension::tree::{GenMember, MemKind, cnst, lazy};
 
 use crate::macros::macro_value::{Macro, MacroData, Rule};
@@ -48,7 +48,7 @@ impl OwnedAtom for MacroBodyArgCollector {
 		if self.argc == self.args.len() {
 			(self.cb)(self.args).await.to_gen().await
 		} else {
-			self.to_gen().await
+			new_atom(self)
 		}
 	}
 }
@@ -86,15 +86,20 @@ impl MacroBuilder {
 				let argv = [].into_iter().collect_array().expect("N is 0");
 				MemKind::Const(body(argv).await.to_gen().await)
 			}),
-			1.. => cnst(true, name, MacroBodyArgCollector {
-				argc: N,
-				args: Vec::new(),
-				cb: Rc::new(move |argv| {
-					let arr = argv.into_iter().collect_array::<N>().expect("argc should enforce the length");
-					let body = body.clone();
-					Box::pin(async move { body(arr).await.to_gen().await })
+			1.. => cnst(
+				true,
+				name,
+				new_atom(MacroBodyArgCollector {
+					argc: N,
+					args: Vec::new(),
+					cb: Rc::new(move |argv| {
+						let arr =
+							argv.into_iter().collect_array::<N>().expect("argc should enforce the length");
+						let body = body.clone();
+						Box::pin(async move { body(arr).await.to_gen().await })
+					}),
 				}),
-			}),
+			),
 		});
 		self.patterns.push(pat);
 		self
@@ -105,35 +110,31 @@ impl MacroBuilder {
 		let main_const = lazy(true, &format!("__macro__{name}"), async move |path| {
 			let module = (Sym::new(path.split_last_seg().1.iter().cloned()).await)
 				.expect("Default macro in global root");
-			MemKind::Const(
-				Macro(Rc::new(MacroData {
-					canonical_name: module.suffix([is(name).await]).await,
-					module,
-					prio,
-					rules: stream(async |mut h| {
-						for (counter, pattern) in patterns.into_iter().enumerate() {
-							let mut placeholders = Vec::new();
-							pattern.map(&mut false, &mut |tt| {
-								if let MacTok::Ph(ph) = &*tt.tok {
-									placeholders.push(ph.name.clone())
-								}
-								None
-							});
-							h.emit(Rule {
-								matcher: Matcher::new(pattern.clone()).await.unwrap(),
-								pattern,
-								ph_names: placeholders,
-								body: is(&format!("({name})::{counter}")).await,
-							})
-							.await;
-						}
-					})
-					.collect()
-					.await,
-				}))
-				.to_gen()
+			MemKind::Const(new_atom(Macro(Rc::new(MacroData {
+				canonical_name: module.suffix([is(name).await]).await,
+				module,
+				prio,
+				rules: stream(async |mut h| {
+					for (counter, pattern) in patterns.into_iter().enumerate() {
+						let mut placeholders = Vec::new();
+						pattern.map(&mut false, &mut |tt| {
+							if let MacTok::Ph(ph) = &*tt.tok {
+								placeholders.push(ph.name.clone())
+							}
+							None
+						});
+						h.emit(Rule {
+							matcher: Matcher::new(pattern.clone()).await.unwrap(),
+							pattern,
+							ph_names: placeholders,
+							body: is(&format!("({name})::{counter}")).await,
+						})
+						.await;
+					}
+				})
+				.collect()
 				.await,
-			)
+			}))))
 		});
 		let kw_consts = own_kws[1..].iter().flat_map(|kw| {
 			lazy(true, &format!("__macro__{kw}"), async move |path| {