temp commit

2025-07-12 00:46:10 +02:00
parent 1868f1a506
commit fe89188c4b
60 changed files with 1536 additions and 709 deletions
--- a/orcx/src/main.rs
+++ b/orcx/src/main.rs
@@ -10,19 +10,18 @@ use async_stream::try_stream;
 use camino::Utf8PathBuf;
 use clap::{Parser, Subcommand};
 use futures::{Stream, TryStreamExt, io};
-use orchid_base::error::ReporterImpl;
+use orchid_base::error::Reporter;
 use orchid_base::format::{FmtCtxImpl, Format, take_first};
-use orchid_base::location::Pos;
 use orchid_base::logging::{LogStrategy, Logger};
-use orchid_base::macros::mtreev_fmt;
 use orchid_base::parse::Snippet;
+use orchid_base::sym;
 use orchid_base::tree::ttv_fmt;
 use orchid_host::ctx::Ctx;
 use orchid_host::execute::{ExecCtx, ExecResult};
-use orchid_host::expr::mtreev_to_expr;
+use orchid_host::expr::PathSetBuilder;
 use orchid_host::extension::Extension;
 use orchid_host::lex::lex;
-use orchid_host::parse::{HostParseCtxImpl, parse_items, parse_mtree};
+use orchid_host::parse::{HostParseCtxImpl, parse_expr, parse_items};
 use orchid_host::subprocess::ext_command;
 use orchid_host::system::init_systems;
 use substack::Substack;
@@ -83,9 +82,9 @@ fn get_all_extensions<'a>(

 #[tokio::main]
 async fn main() -> io::Result<ExitCode> {
-	let code = Rc::new(RefCell::new(ExitCode::SUCCESS));
+	let exit_code = Rc::new(RefCell::new(ExitCode::SUCCESS));
 	let local_set = LocalSet::new();
-	let code1 = code.clone();
+	let exit_code1 = exit_code.clone();
 	local_set.spawn_local(async move {
 		let args = Args::parse();
 		let ctx = &Ctx::new(Rc::new(|fut| mem::drop(spawn_local(fut))));
@@ -103,7 +102,7 @@ async fn main() -> io::Result<ExitCode> {
 				let mut file = File::open(file.as_std_path()).unwrap();
 				let mut buf = String::new();
 				file.read_to_string(&mut buf).unwrap();
-				let lexemes = lex(i.i(&buf).await, &systems, ctx).await.unwrap();
+				let lexemes = lex(i.i(&buf).await, sym!(usercode; i).await, &systems, ctx).await.unwrap();
 				println!("{}", take_first(&ttv_fmt(&lexemes, &FmtCtxImpl { i }).await, true))
 			},
 			Commands::Parse { file } => {
@@ -111,23 +110,28 @@ async fn main() -> io::Result<ExitCode> {
 				let mut file = File::open(file.as_std_path()).unwrap();
 				let mut buf = String::new();
 				file.read_to_string(&mut buf).unwrap();
-				let lexemes = lex(i.i(&buf).await, &systems, ctx).await.unwrap();
+				let lexemes = lex(i.i(&buf).await, sym!(usercode; i).await, &systems, ctx).await.unwrap();
 				let Some(first) = lexemes.first() else {
 					println!("File empty!");
 					return;
 				};
-				let reporter = ReporterImpl::new();
-				let pctx = HostParseCtxImpl { reporter: &reporter, systems: &systems };
-				let snip = Snippet::new(first, &lexemes, i);
+				let reporter = Reporter::new();
+				let pctx = HostParseCtxImpl {
+					reporter: &reporter,
+					systems: &systems,
+					ctx: ctx.clone(),
+					src: sym!(usercode; i).await,
+				};
+				let snip = Snippet::new(first, &lexemes);
 				let ptree = parse_items(&pctx, Substack::Bottom, snip).await.unwrap();
 				if let Some(errv) = reporter.errv() {
 					eprintln!("{errv}");
-					*code1.borrow_mut() = ExitCode::FAILURE;
+					*exit_code1.borrow_mut() = ExitCode::FAILURE;
 					return;
 				}
 				if ptree.is_empty() {
 					eprintln!("File empty only after parsing, but no errors were reported");
-					*code1.borrow_mut() = ExitCode::FAILURE;
+					*exit_code1.borrow_mut() = ExitCode::FAILURE;
 					return;
 				}
 				for item in ptree {
@@ -140,23 +144,38 @@ async fn main() -> io::Result<ExitCode> {
 				std::io::stdout().flush().unwrap();
 				let mut prompt = String::new();
 				stdin().read_line(&mut prompt).await.unwrap();
-				let lexemes = lex(i.i(prompt.trim()).await, &systems, ctx).await.unwrap();
+				eprintln!("lexing");
+				let lexemes =
+					lex(i.i(prompt.trim()).await, sym!(usercode; i).await, &systems, ctx).await.unwrap();
+				eprintln!("lexed");
 				if args.logs {
 					println!("lexed: {}", take_first(&ttv_fmt(&lexemes, &FmtCtxImpl { i }).await, true));
 				}
-				let mtreev = parse_mtree(
-					Snippet::new(&lexemes[0], &lexemes, i),
-					Substack::Bottom.push(i.i("orcx").await).push(i.i("input").await),
+				let path = sym!(usercode; i).await;
+				let reporter = Reporter::new();
+				let parse_ctx = HostParseCtxImpl {
+					ctx: ctx.clone(),
+					reporter: &reporter,
+					src: path.clone(),
+					systems: &systems[..],
+				};
+				let parse_res = parse_expr(
+					&parse_ctx,
+					path.clone(),
+					PathSetBuilder::new(),
+					Snippet::new(&lexemes[0], &lexemes),
 				)
-				.await
-				.unwrap();
-				if args.logs {
-					let fmt = mtreev_fmt(&mtreev, &FmtCtxImpl { i }).await;
-					println!("parsed: {}", take_first(&fmt, true));
-				}
-				let expr = mtreev_to_expr(&mtreev, Substack::Bottom, ctx).await;
-				let mut xctx =
-					ExecCtx::new(ctx.clone(), logger.clone(), root.clone(), expr.at(Pos::None)).await;
+				.await;
+				eprintln!("parsed");
+				let expr = match reporter.merge(parse_res) {
+					Ok(expr) => expr,
+					Err(e) => {
+						eprintln!("{e}");
+						continue;
+					},
+				};
+				let mut xctx = ExecCtx::new(ctx.clone(), logger.clone(), root.clone(), expr).await;
+				eprintln!("executed");
 				xctx.set_gas(Some(1000));
 				xctx.execute().await;
 				match xctx.result() {
@@ -168,18 +187,35 @@ async fn main() -> io::Result<ExitCode> {
 			},
 			Commands::Execute { code } => {
 				let (root, systems) = init_systems(&args.system, &extensions).await.unwrap();
-				let lexemes = lex(i.i(code.trim()).await, &systems, ctx).await.unwrap();
+				let lexemes =
+					lex(i.i(code.trim()).await, sym!(usercode; i).await, &systems, ctx).await.unwrap();
 				if args.logs {
 					println!("lexed: {}", take_first(&ttv_fmt(&lexemes, &FmtCtxImpl { i }).await, true));
 				}
-				let mtreev =
-					parse_mtree(Snippet::new(&lexemes[0], &lexemes, i), Substack::Bottom).await.unwrap();
-				if args.logs {
-					let fmt = mtreev_fmt(&mtreev, &FmtCtxImpl { i }).await;
-					println!("parsed: {}", take_first(&fmt, true));
-				}
-				let expr = mtreev_to_expr(&mtreev, Substack::Bottom, ctx).await;
-				let mut xctx = ExecCtx::new(ctx.clone(), logger.clone(), root, expr.at(Pos::None)).await;
+				let path = sym!(usercode; i).await;
+				let reporter = Reporter::new();
+				let parse_ctx = HostParseCtxImpl {
+					ctx: ctx.clone(),
+					reporter: &reporter,
+					src: path.clone(),
+					systems: &systems[..],
+				};
+				let parse_res = parse_expr(
+					&parse_ctx,
+					path.clone(),
+					PathSetBuilder::new(),
+					Snippet::new(&lexemes[0], &lexemes),
+				)
+				.await;
+				let expr = match reporter.merge(parse_res) {
+					Ok(expr) => expr,
+					Err(e) => {
+						eprintln!("{e}");
+						*exit_code1.borrow_mut() = ExitCode::FAILURE;
+						return;
+					},
+				};
+				let mut xctx = ExecCtx::new(ctx.clone(), logger.clone(), root, expr).await;
 				xctx.set_gas(Some(1000));
 				xctx.execute().await;
 				match xctx.result() {
@@ -192,6 +228,6 @@ async fn main() -> io::Result<ExitCode> {
 		}
 	});
 	local_set.await;
-	let x = *code.borrow();
+	let x = *exit_code.borrow();
 	Ok(x)
 }