temp commit

orchid-host/src/lex.rs

@@ -12,7 +12,7 @@ use orchid_base::tree::recur;
 
 use crate::api;
 use crate::ctx::Ctx;
-use crate::expr::{Expr, ExprParseCtx};
+use crate::expr::{Expr, ExprParseCtx, ExprWillPanic};
 use crate::parsed::{ParsTok, ParsTokTree};
 use crate::system::System;
 
@@ -25,6 +25,7 @@ pub struct LexCtx<'a> {
 	pub ctx: &'a Ctx,
 }
 impl<'a> LexCtx<'a> {
+	#[must_use]
 	pub fn push<'b>(&'b mut self, pos: u32) -> LexCtx<'b>
 	where 'a: 'b {
 		LexCtx {
@@ -36,11 +37,14 @@ impl<'a> LexCtx<'a> {
 			ctx: self.ctx,
 		}
 	}
+	#[must_use]
 	pub fn get_pos(&self) -> u32 { self.end_pos() - self.tail.len() as u32 }
+	#[must_use]
 	pub fn end_pos(&self) -> u32 { self.source.len() as u32 }
 	pub fn set_pos(&mut self, pos: u32) { self.tail = &self.source[pos as usize..] }
 	pub fn push_pos(&mut self, delta: u32) { self.set_pos(self.get_pos() + delta) }
 	pub fn set_tail(&mut self, tail: &'a str) { self.tail = tail }
+	#[must_use]
 	pub fn strip_prefix(&mut self, tgt: &str) -> bool {
 		if let Some(src) = self.tail.strip_prefix(tgt) {
 			self.tail = src;
@@ -48,26 +52,29 @@ impl<'a> LexCtx<'a> {
 		}
 		false
 	}
+	#[must_use]
 	pub async fn ser_subtree(&mut self, subtree: ParsTokTree) -> api::TokenTree {
 		let mut exprs = self.ctx.common_exprs.clone();
-		let foo = recur(subtree, &|tt, r| {
+		let without_new_expr = recur(subtree, &|tt, r| {
 			if let ParsTok::NewExpr(expr) = tt.tok {
 				return ParsTok::Handle(expr).at(tt.sr);
 			}
 			r(tt)
 		});
-		foo.into_api(&mut exprs, &mut ()).await
+		without_new_expr.into_api(&mut exprs, &mut ExprWillPanic).await
 	}
+	#[must_use]
 	pub async fn des_subtree(&mut self, tree: &api::TokenTree) -> ParsTokTree {
 		ParsTokTree::from_api(
-			&tree,
+			tree,
 			&mut self.ctx.common_exprs.clone(),
-			&mut ExprParseCtx { ctx: self.ctx.clone(), exprs: self.ctx.common_exprs.clone() },
+			&mut ExprParseCtx { ctx: self.ctx, exprs: &self.ctx.common_exprs },
 			self.path,
 			&self.ctx.i,
 		)
 		.await
 	}
+	#[must_use]
 	pub fn strip_char(&mut self, tgt: char) -> bool {
 		if let Some(src) = self.tail.strip_prefix(tgt) {
 			self.tail = src;
@@ -79,6 +86,7 @@ impl<'a> LexCtx<'a> {
 		self.tail = self.tail.trim_start_matches(filter);
 	}
 	pub fn trim_ws(&mut self) { self.trim(|c| c.is_whitespace() && !"\r\n".contains(c)) }
+	#[must_use]
 	pub fn get_start_matches(&mut self, filter: impl Fn(char) -> bool) -> &'a str {
 		let rest = self.tail.trim_start_matches(filter);
 		let matches = &self.tail[..self.tail.len() - rest.len()];
@@ -100,6 +108,7 @@ pub async fn lex_once(ctx: &mut LexCtx<'_>) -> OrcRes<ParsTokTree> {
 		.and_then(|t| t.trim_start_matches(name_char).strip_prefix("::"))
 	{
 		let name = &ctx.tail[..ctx.tail.len() - tail.len() - "::".len()];
+		ctx.set_tail(tail);
 		let body = lex_once(ctx).boxed_local().await?;
 		ParsTok::NS(ctx.ctx.i.i(name).await, Box::new(body))
 	} else if ctx.strip_prefix("--[") {
@@ -107,7 +116,7 @@ pub async fn lex_once(ctx: &mut LexCtx<'_>) -> OrcRes<ParsTokTree> {
 			return Err(mk_errv(
 				ctx.ctx.i.i("Unterminated block comment").await,
 				"This block comment has no ending ]--",
-				[SrcRange::new(start..start + 3, ctx.path).pos().into()],
+				[SrcRange::new(start..start + 3, ctx.path)],
 			));
 		};
 		ctx.set_tail(tail);
@@ -124,7 +133,7 @@ pub async fn lex_once(ctx: &mut LexCtx<'_>) -> OrcRes<ParsTokTree> {
 				return Err(mk_errv(
 					ctx.ctx.i.i("Unclosed lambda").await,
 					"Lambdae started with \\ should separate arguments from body with .",
-					[SrcRange::new(start..start + 1, ctx.path).pos().into()],
+					[SrcRange::new(start..start + 1, ctx.path)],
 				));
 			}
 			arg.push(lex_once(ctx).boxed_local().await?);
@@ -139,7 +148,7 @@ pub async fn lex_once(ctx: &mut LexCtx<'_>) -> OrcRes<ParsTokTree> {
 				return Err(mk_errv(
 					ctx.ctx.i.i("unclosed paren").await,
 					format!("this {lp} has no matching {rp}"),
-					[SrcRange::new(start..start + 1, ctx.path).pos().into()],
+					[SrcRange::new(start..start + 1, ctx.path)],
 				));
 			}
 			body.push(lex_once(ctx).boxed_local().await?);
@@ -189,7 +198,7 @@ pub async fn lex_once(ctx: &mut LexCtx<'_>) -> OrcRes<ParsTokTree> {
 			return Err(mk_errv(
 				ctx.ctx.i.i("Unrecognized character").await,
 				"The following syntax is meaningless.",
-				[SrcRange::new(start..start + 1, ctx.path).pos().into()],
+				[SrcRange::new(start..start + 1, ctx.path)],
 			));
 		}
 	};