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

--- a/crates/jsonnet-evaluator/build.rs
+++ b/crates/jsonnet-evaluator/build.rs
@@ -15,7 +15,7 @@
 	let parsed = parse(
 		STDLIB_STR,
 		&ParserSettings {
-			file_name: PathBuf::from("std.jsonnet"),
+			file_name: Rc::new(PathBuf::from("std.jsonnet")),
 			loc_data: true,
 		},
 	)

--- a/crates/jsonnet-evaluator/src/error.rs
+++ b/crates/jsonnet-evaluator/src/error.rs
@@ -38,7 +38,7 @@
 }
 
 #[derive(Clone, Debug)]
-pub struct StackTraceElement(pub Rc<ExprLocation>, pub String);
+pub struct StackTraceElement(pub ExprLocation, pub String);
 #[derive(Debug, Clone)]
 pub struct StackTrace(pub Vec<StackTraceElement>);
 

--- a/crates/jsonnet-evaluator/src/lib.rs
+++ b/crates/jsonnet-evaluator/src/lib.rs
@@ -117,7 +117,7 @@
 				parse(
 					&code,
 					&ParserSettings {
-						file_name: name,
+						file_name: Rc::new(name),
 						loc_data: true,
 					},
 				)?,
@@ -198,7 +198,7 @@
 		let parsed = parse(
 			&code,
 			&ParserSettings {
-				file_name: PathBuf::from("raw.jsonnet"),
+				file_name: Rc::new(PathBuf::from("raw.jsonnet")),
 				loc_data: true,
 			},
 		)
@@ -320,11 +320,11 @@
 		let state = EvaluationState::default();
 		state
 			.push(
-				Rc::new(ExprLocation(PathBuf::from("test1.jsonnet"), 10, 20)),
+				ExprLocation(Rc::new(PathBuf::from("test1.jsonnet")), 10, 20),
 				"outer".to_owned(),
 				|| {
 					state.push(
-						Rc::new(ExprLocation(PathBuf::from("test2.jsonnet"), 30, 40)),
+						ExprLocation(Rc::new(PathBuf::from("test2.jsonnet")), 30, 40),
 						"inner".to_owned(),
 						|| {
 							state.print_stack_trace();

--- a/crates/jsonnet-parser/src/expr.rs
+++ b/crates/jsonnet-parser/src/expr.rs
@@ -207,7 +207,7 @@
 
 /// file, begin offset, end offset
 #[derive(Clone, PartialEq, Serialize, Deserialize)]
-pub struct ExprLocation(pub PathBuf, pub usize, pub usize);
+pub struct ExprLocation(pub Rc<PathBuf>, pub usize, pub usize);
 impl Debug for ExprLocation {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		write!(f, "{:?}:{:?}-{:?}", self.0, self.1, self.2)
@@ -216,7 +216,7 @@
 
 /// Holds AST expression and its location in source file+
 #[derive(Clone, PartialEq, Serialize, Deserialize)]
-pub struct LocExpr(pub Rc<Expr>, pub Option<Rc<ExprLocation>>);
+pub struct LocExpr(pub Rc<Expr>, pub Option<ExprLocation>);
 impl Debug for LocExpr {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		write!(f, "{:?} from {:?}", self.0, self.1)
@@ -230,11 +230,7 @@
 		LocExpr(
 			std::rc::Rc::new($expr),
 			if $need_loc {
-				Some(std::rc::Rc::new(ExprLocation(
-					$name.to_owned(),
-					$start,
-					$end,
-				)))
+				Some(ExprLocation($name, $start, $end))
 			} else {
 				None
 				},

1111
12pub struct ParserSettings {12pub struct ParserSettings {
13	pub loc_data: bool,13	pub loc_data: bool,
14	pub file_name: PathBuf,14	pub file_name: Rc<PathBuf>,
15}15}
1616
17parser! {17parser! {
289			} end:position!() {289			} end:position!() {
290				let LocExpr(e, _) = a;290				let LocExpr(e, _) = a;
291				LocExpr(e, if s.loc_data {291				LocExpr(e, if s.loc_data {
292					Some(Rc::new(ExprLocation(s.file_name.to_owned(), start, end)))292					Some(ExprLocation(s.file_name.clone(), start, end))
293				} else {293				} else {
294					None294					None
295				})295				})
317	use super::{expr::*, parse};317	use super::{expr::*, parse};
318	use crate::ParserSettings;318	use crate::ParserSettings;
319	use std::path::PathBuf;319	use std::path::PathBuf;
320	use std::rc::Rc;
320321
321	macro_rules! parse {322	macro_rules! parse {
322		($s:expr) => {323		($s:expr) => {
323			parse(324			parse(
324				$s,325				$s,
325				&ParserSettings {326				&ParserSettings {
326					loc_data: false,327					loc_data: false,
327					file_name: PathBuf::from("/test.jsonnet"),328					file_name: Rc::new(PathBuf::from("/test.jsonnet")),
328					},329					},
329				)330				)
330			.unwrap()331			.unwrap()