Macro system done in theory

too afraid to begin debugging, resting for a moment

orchid-host/src/tree.rs

@@ -2,6 +2,7 @@
 //! once
 use std::cell::RefCell;
 use std::rc::{Rc, Weak};
+use std::slice;
 
 use async_once_cell::OnceCell;
 use async_std::sync::RwLock;
@@ -10,7 +11,7 @@ use hashbrown::HashMap;
 use hashbrown::hash_map::Entry;
 use itertools::Itertools;
 use orchid_base::clone;
-use orchid_base::error::{OrcRes, Reporter, mk_err, mk_errv};
+use orchid_base::error::{OrcRes, Reporter, mk_errv};
 use orchid_base::interner::Tok;
 use orchid_base::location::{CodeGenInfo, Pos};
 use orchid_base::name::{NameLike, Sym, VPath};
@@ -152,8 +153,8 @@ impl<'a> TreeFromApiCtx<'a> {
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ResolvedImport {
-	target: Sym,
-	pos: Pos,
+	pub target: Sym,
+	pub pos: Pos,
 }
 
 #[derive(Clone, Default)]
@@ -258,18 +259,16 @@ impl Module {
 				match abs_path_res {
 					Err(e) => ctx.rep.report(e.err_obj(&ctx.ctx.i, sr.pos(), &import.to_string()).await),
 					Ok(abs_path) => {
-						imports.insert(
-							key,
-							Ok(ResolvedImport { target: abs_path.to_sym(&ctx.ctx.i).await, pos: sr.pos() }),
-						);
+						let target = abs_path.to_sym(&ctx.ctx.i).await;
+						imports.insert(key, Ok(ResolvedImport { target, pos: sr.pos() }));
 					},
 				}
 			} else {
 				for item in values {
-					ctx.rep.report(mk_err(
+					ctx.rep.report(mk_errv(
 						conflicting_imports_msg.clone(),
 						format!("{key} is imported multiple times from different modules"),
-						[item.sr.pos().into()],
+						[item.sr.pos()],
 					));
 				}
 			}
@@ -294,11 +293,12 @@ impl Module {
 		let self_referential_msg = ctx.ctx.i.i("Self-referential import").await;
 		for (key, value) in imports.iter() {
 			let Ok(import) = value else { continue };
-			if import.target.strip_prefix(&path[..]).is_some_and(|t| t.starts_with(&[key.clone()])) {
-				ctx.rep.report(mk_err(
+			if import.target.strip_prefix(&path[..]).is_some_and(|t| t.starts_with(slice::from_ref(key)))
+			{
+				ctx.rep.report(mk_errv(
 					self_referential_msg.clone(),
 					format!("import {} points to itself or a path within itself", &import.target),
-					[import.pos.clone().into()],
+					[import.pos.clone()],
 				));
 			}
 		}