sync commit

orchid-base/src/parse.rs

@@ -113,14 +113,23 @@ pub fn strip_fluff<A: ExprRepr, X: ExtraTok>(tt: &TokTree<A, X>) -> Option<TokTr
 #[derive(Clone, Debug)]
 pub struct Comment {
 	pub text: Tok<String>,
-	pub pos: Pos,
+	pub range: Range<u32>,
 }
 impl Comment {
-	pub fn to_api(&self) -> api::Comment {
-		api::Comment { location: self.pos.to_api(), text: self.text.to_api() }
+	pub async fn from_api(c: &api::Comment, i: &Interner) -> Self {
+		Self { text: i.ex(c.text).await, range: c.range.clone() }
 	}
-	pub async fn from_api(api: &api::Comment, i: &Interner) -> Self {
-		Self { pos: Pos::from_api(&api.location, i).await, text: Tok::from_api(api.text, i).await }
+	pub async fn from_tk(tk: &TokTree<impl ExprRepr, impl ExtraTok>, i: &Interner) -> Option<Self> {
+		match &tk.tok {
+			Token::Comment(text) => Some(Self { text: i.i(&**text).await, range: tk.range.clone() }),
+			_ => None,
+		}
+	}
+	pub fn to_tk<R: ExprRepr, X: ExtraTok>(&self) -> TokTree<R, X> {
+		TokTree { tok: Token::Comment(self.text.rc().clone()), range: self.range.clone() }
+	}
+	pub fn to_api(&self) -> api::Comment {
+		api::Comment { range: self.range.clone(), text: self.text.to_api() }
 	}
 }
 
@@ -145,11 +154,7 @@ pub async fn line_items<'a, A: ExprRepr, X: ExtraTok>(
 			Some(i) => {
 				let (cmts, tail) = line.split_at(i);
 				let comments = join_all(comments.drain(..).chain(cmts.cur).map(|t| async {
-					match &t.tok {
-						Token::Comment(c) =>
-							Comment { text: ctx.i().i(&**c).await, pos: Pos::Range(t.range.clone()) },
-						_ => unreachable!("All are comments checked above"),
-					}
+					Comment::from_tk(t, ctx.i()).await.expect("All are comments checked above")
 				}))
 				.await;
 				items.push(Parsed { output: comments, tail });

orchid-base/src/tree.rs

@@ -4,7 +4,6 @@ use std::future::Future;
 use std::marker::PhantomData;
 use std::ops::Range;
 use std::rc::Rc;
-use std::sync::Arc;
 
 use async_stream::stream;
 use futures::future::join_all;
@@ -216,7 +215,7 @@ pub enum Token<H: ExprRepr, X: ExtraTok> {
 	/// Information about the code addressed to the human reader or dev tooling
 	/// It has no effect on the behaviour of the program unless it's explicitly
 	/// read via reflection
-	Comment(Arc<String>),
+	Comment(Rc<String>),
 	/// The part of a lambda between `\` and `.` enclosing the argument. The body
 	/// stretches to the end of the enclosing parens or the end of the const line
 	LambdaHead(Vec<TokTree<H, X>>),