Added support for defining macros in Rust within the macro system

Also fixed a lot of bugs

orchid-std/src/macros/mactree_lexer.rs

@@ -1,15 +1,16 @@
 use std::ops::RangeInclusive;
 
 use futures::FutureExt;
+use itertools::chain;
 use orchid_base::error::{OrcRes, mk_errv};
 use orchid_base::parse::ParseCtx;
-use orchid_base::sym;
 use orchid_base::tokens::PARENS;
 use orchid_base::tree::Paren;
 use orchid_extension::lexer::{LexContext, Lexer, err_not_applicable};
 use orchid_extension::parser::p_tree2gen;
-use orchid_extension::tree::{GenTok, GenTokTree, ref_tok, x_tok};
+use orchid_extension::tree::{GenTok, GenTokTree, x_tok};
 
+use crate::macros::instantiate_tpl::InstantiateTplCall;
 use crate::macros::let_line::parse_tok;
 use crate::macros::mactree::{MacTok, MacTree};
 
@@ -29,12 +30,9 @@ impl Lexer for MacTreeLexer {
 				let tok = match &args[..] {
 					[] => x_tok(mactree).await,
 					_ => {
-						let call = ([
-							ref_tok(sym!(macros::instantiate_tpl; ctx.i()).await).await.at(range.clone()),
-							x_tok(mactree).await.at(range.clone()),
-						]
-						.into_iter())
-						.chain(args.into_iter());
+						let instantiate_tpl_call =
+							InstantiateTplCall { argc: args.len(), argv: vec![], tpl: mactree };
+						let call = chain!([x_tok(instantiate_tpl_call).await.at(range.clone())], args);
 						GenTok::S(Paren::Round, call.collect())
 					},
 				};