partway towards commands

I got very confused and started mucking about with "spawn" when in fact all I needed was the "inline" extension type in orcx that allows the interpreter to expose custom constants.

orchid-std/src/macros/instantiate_tpl.rs

@@ -1,13 +1,12 @@
 use std::borrow::Cow;
 
 use never::Never;
-use orchid_base::format::fmt;
-use orchid_extension::atom::{Atomic, TAtom};
-use orchid_extension::atom_owned::{OwnedAtom, OwnedVariant, own};
+use orchid_base::fmt;
 use orchid_extension::conv::ToExpr;
 use orchid_extension::coroutine_exec::exec;
 use orchid_extension::expr::Expr;
-use orchid_extension::gen_expr::{GExpr, new_atom};
+use orchid_extension::gen_expr::new_atom;
+use orchid_extension::{Atomic, OwnedAtom, OwnedVariant, TAtom};
 
 use crate::macros::mactree::{MacTok, MacTree};
 
@@ -25,7 +24,7 @@ impl OwnedAtom for InstantiateTplCall {
 	async fn val(&self) -> Cow<'_, Self::Data> { Cow::Owned(()) }
 	type Refs = Never;
 	// Technically must be supported but shouldn't actually ever be called
-	async fn call_ref(&self, arg: Expr) -> GExpr {
+	async fn call_ref(&self, arg: Expr) -> impl ToExpr {
 		if !self.argv.is_empty() {
 			eprintln!(
 				"Copying partially applied instantiate_tpl call. This is an internal value.\
@@ -34,11 +33,11 @@ impl OwnedAtom for InstantiateTplCall {
 		}
 		self.clone().call(arg).await
 	}
-	async fn call(mut self, arg: Expr) -> GExpr {
+	async fn call(mut self, arg: Expr) -> impl ToExpr {
 		exec(async move |mut h| {
 			match h.exec::<TAtom<MacTree>>(arg.clone()).await {
 				Err(_) => panic!("Expected a macro param, found {}", fmt(&arg).await),
-				Ok(t) => self.argv.push(own(&t).await),
+				Ok(t) => self.argv.push(t.own().await),
 			};
 			if self.argv.len() < self.argc {
 				return new_atom(self);
@@ -52,7 +51,5 @@ impl OwnedAtom for InstantiateTplCall {
 			new_atom(ret)
 		})
 		.await
-		.to_gen()
-		.await
 	}
 }