git.delta.rocks / jrsonnet / refs/commits / da1c5af22cb6

--- a/crates/jrsonnet-rowan-parser/src/event.rs
+++ b/crates/jrsonnet-rowan-parser/src/event.rs
@@ -23,7 +23,7 @@
 	/// Eat token
 	Token { kind: SyntaxKind },
 	/// Push token, but do not eat anything,
-	VirtualToken { kind: SyntaxKind },
+	// VirtualToken { kind: SyntaxKind },
 	/// Position of finished node
 	Finish {
 		/// Same as forward_parent of Start, but for wrapping
@@ -120,13 +120,13 @@
 					self.token(kind);
 					eat_start_whitespace = true;
 				}
-				Event::VirtualToken { kind } => {
-					if eat_start_whitespace {
-						self.skip_whitespace();
-					}
-					self.virtual_token(kind);
-					eat_start_whitespace = false;
-				}
+				// Event::VirtualToken { kind } => {
+				// 	if eat_start_whitespace {
+				// 		self.skip_whitespace();
+				// 	}
+				// 	self.virtual_token(kind);
+				// 	eat_start_whitespace = false;
+				// }
 				Event::Finish { wrapper, error } => {
 					if depth == 1 {
 						self.skip_whitespace();
@@ -183,9 +183,9 @@
 			errors: self.errors,
 		}
 	}
-	fn virtual_token(&mut self, kind: SyntaxKind) {
-		self.builder.token(JsonnetLanguage::kind_to_raw(kind), "")
-	}
+	// fn virtual_token(&mut self, kind: SyntaxKind) {
+	// 	self.builder.token(JsonnetLanguage::kind_to_raw(kind), "")
+	// }
 	fn token(&mut self, kind: SyntaxKind) {
 		let lexeme = self.lexemes[self.offset];
 		self.builder

--- a/crates/jrsonnet-rowan-parser/src/marker.rs
+++ b/crates/jrsonnet-rowan-parser/src/marker.rs
@@ -8,17 +8,17 @@
 	SyntaxKind,
 };
 
-pub struct Ranger {
-	pub pos: usize,
-}
-impl Ranger {
-	pub fn finish(self, p: &Parser) -> FinishedRanger {
-		FinishedRanger {
-			start_token: self.pos,
-			end_token: self.pos.max(p.offset.saturating_sub(1)),
-		}
-	}
-}
+// pub struct Ranger {
+// 	pub pos: usize,
+// }
+// impl Ranger {
+// 	pub fn finish(self, p: &Parser) -> FinishedRanger {
+// 		FinishedRanger {
+// 			start_token: self.pos,
+// 			end_token: self.pos.max(p.offset.saturating_sub(1)),
+// 		}
+// 	}
+// }
 
 pub struct FinishedRanger {
 	pub start_token: usize,
@@ -79,10 +79,10 @@
 			finish_event_idx,
 		}
 	}
-	pub fn complete(mut self, p: &mut Parser, kind: SyntaxKind) -> CompletedMarker {
+	pub fn complete(self, p: &mut Parser, kind: SyntaxKind) -> CompletedMarker {
 		self.complete_raw(p, kind, None)
 	}
-	pub fn complete_error(mut self, p: &mut Parser, msg: impl AsRef<str>) -> CompletedMarker {
+	pub fn complete_error(self, p: &mut Parser, msg: impl AsRef<str>) -> CompletedMarker {
 		self.complete_raw(
 			p,
 			SyntaxKind::ERROR_CUSTOM,
@@ -91,7 +91,7 @@
 			}),
 		)
 	}
-	pub fn complete_missing(mut self, p: &mut Parser, expected: ExpectedSyntax) -> CompletedMarker {
+	pub fn complete_missing(self, p: &mut Parser, expected: ExpectedSyntax) -> CompletedMarker {
 		self.complete_raw(
 			p,
 			SyntaxKind::ERROR_MISSING_TOKEN,
@@ -99,7 +99,7 @@
 		)
 	}
 	pub fn complete_unexpected(
-		mut self,
+		self,
 		p: &mut Parser,
 		expected: ExpectedSyntax,
 		found: SyntaxKind,

55
6use crate::{6use crate::{
7	event::Event,7	event::Event,
8	marker::{CompletedMarker, Marker, Ranger},8	marker::{CompletedMarker, Marker},
9	nodes::{BinaryOperatorKind, Literal, Number, Text, UnaryOperatorKind},9	nodes::{BinaryOperatorKind, Literal, Number, Text, UnaryOperatorKind},
10	token_set::SyntaxKindSet,10	token_set::SyntaxKindSet,
11	AstToken, SyntaxKind,11	AstToken, SyntaxKind,
107		self.entered += 1;107		self.entered += 1;
108		Marker::new(start_event_idx)108		Marker::new(start_event_idx)
109	}109	}
110	pub fn start_ranger(&mut self) -> Ranger {110	// pub fn start_ranger(&mut self) -> Ranger {
111		let pos = self.offset;111	// 	let pos = self.offset;
112		Ranger { pos }112	// 	Ranger { pos }
113	}113	// }
114	pub fn parse(mut self) -> Vec<Event> {114	pub fn parse(mut self) -> Vec<Event> {
115		let m = self.start();115		let m = self.start();
116		expr(&mut self);116		expr(&mut self);
144		}144		}
145	}145	}
146146
147	pub(crate) fn expect_with_no_skip(&mut self, kind: SyntaxKind) {147	// pub(crate) fn expect_with_no_skip(&mut self, kind: SyntaxKind) {
148		if self.at(kind) {148	// 	if self.at(kind) {
149			self.bump();149	// 		self.bump();
150		} else {150	// 	} else {
151			self.error_with_no_skip();151	// 		self.error_with_no_skip();
152		}152	// 	}
153	}153	// }
154	pub fn error_with_no_skip(&mut self) -> CompletedMarker {154	pub fn error_with_no_skip(&mut self) -> CompletedMarker {
155		self.error_with_recovery_set(SyntaxKindSet::ALL)155		self.error_with_recovery_set(SyntaxKindSet::ALL)
156	}156	}
773		m.complete(p, DESTRUCT_SKIP)773		m.complete(p, DESTRUCT_SKIP)
774	} else if p.at(T!['[']) {774	} else if p.at(T!['[']) {
775		p.bump();775		p.bump();
776		let mut had_rest = false;776		// let mut had_rest = false;
777		loop {777		loop {
778			if p.at(T![']']) {778			if p.at(T![']']) {
779				p.bump();779				p.bump();
780				break;780				break;
781			} else if p.at(T![...]) {781			} else if p.at(T![...]) {
782				let m_err = p.start_ranger();782				// let m_err = p.start_ranger();
783				destruct_rest(p);783				destruct_rest(p);
784				// if had_rest {784				// if had_rest {
785				// 	p.custom_error(m_err.finish(p), "only one rest can be present in array");785				// 	p.custom_error(m_err.finish(p), "only one rest can be present in array");
786				// }786				// }
787				had_rest = true;787				// had_rest = true;
788			} else {788			} else {
789				destruct(p);789				destruct(p);
790			}790			}
804				p.bump();804				p.bump();
805				break;805				break;
806			} else if p.at(T![...]) {806			} else if p.at(T![...]) {
807				let m_err = p.start_ranger();807				// let m_err = p.start_ranger();
808				destruct_rest(p);808				destruct_rest(p);
809				// if had_rest {809				// if had_rest {
810				// 	p.custom_error(m_err.finish(p), "only one rest can be present in object");810				// 	p.custom_error(m_err.finish(p), "only one rest can be present in object");