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

--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -63,16 +63,15 @@
 use std::{
 	any::Any,
 	cell::{Ref, RefCell, RefMut},
-	collections::HashMap,
 	fmt::{self, Debug},
 	path::Path,
 };
 
 pub use ctx::*;
 pub use dynamic::*;
-use error::{Error::*, LocError, Result, ResultExt};
+pub use error::{Error::*, LocError, Result, ResultExt};
 pub use evaluate::*;
-use function::{CallLocation, TlaArg};
+use function::CallLocation;
 use gc::{GcHashMap, TraceBox};
 use hashbrown::hash_map::RawEntryMut;
 pub use import::*;
@@ -305,7 +304,7 @@
 				jrsonnet_parser::parse(
 					code,
 					&ParserSettings {
-						file_name: file_name.clone(),
+						source: file_name.clone(),
 					},
 				)
 				.map_err(|e| ImportSyntaxError {
@@ -411,7 +410,7 @@
 		let parsed = jrsonnet_parser::parse(
 			&code,
 			&ParserSettings {
-				file_name: source.clone(),
+				source: source.clone(),
 			},
 		)
 		.map_err(|e| ImportSyntaxError {

14pub use source::{Source, SourceDirectory, SourceFile, SourcePath, SourcePathT, SourceVirtual};14pub use source::{Source, SourceDirectory, SourceFile, SourcePath, SourcePathT, SourceVirtual};
1515
16pub struct ParserSettings {16pub struct ParserSettings {
17	pub file_name: Source,17	pub source: Source,
18}18}
1919
20macro_rules! expr_bin {20macro_rules! expr_bin {
230		pub rule var_expr(s: &ParserSettings) -> Expr230		pub rule var_expr(s: &ParserSettings) -> Expr
231			= n:id() { expr::Expr::Var(n) }231			= n:id() { expr::Expr::Var(n) }
232		pub rule id_loc(s: &ParserSettings) -> LocExpr232		pub rule id_loc(s: &ParserSettings) -> LocExpr
233			= a:position!() n:id() b:position!() { LocExpr(Rc::new(expr::Expr::Str(n)), ExprLocation(s.file_name.clone(), a as u32,b as u32)) }233			= a:position!() n:id() b:position!() { LocExpr(Rc::new(expr::Expr::Str(n)), ExprLocation(s.source.clone(), a as u32,b as u32)) }
234		pub rule if_then_else_expr(s: &ParserSettings) -> Expr234		pub rule if_then_else_expr(s: &ParserSettings) -> Expr
235			= cond:ifspec(s) _ keyword("then") _ cond_then:expr(s) cond_else:(_ keyword("else") _ e:expr(s) {e})? {Expr::IfElse{235			= cond:ifspec(s) _ keyword("then") _ cond_then:expr(s) cond_else:(_ keyword("else") _ e:expr(s) {e})? {Expr::IfElse{
236				cond,236				cond,
293		use UnaryOpType::*;293		use UnaryOpType::*;
294		rule expr(s: &ParserSettings) -> LocExpr294		rule expr(s: &ParserSettings) -> LocExpr
295			= precedence! {295			= precedence! {
296				start:position!() v:@ end:position!() { LocExpr(Rc::new(v), ExprLocation(s.file_name.clone(), start as u32, end as u32)) }296				start:position!() v:@ end:position!() { LocExpr(Rc::new(v), ExprLocation(s.source.clone(), start as u32, end as u32)) }
297				--297				--
298				a:(@) _ binop(<"||">) _ b:@ {expr_bin!(a Or b)}298				a:(@) _ binop(<"||">) _ b:@ {expr_bin!(a Or b)}
299				--299				--
351	let len = str.len();351	let len = str.len();
352	LocExpr(352	LocExpr(
353		Rc::new(Expr::Str(str)),353		Rc::new(Expr::Str(str)),
354		ExprLocation(settings.file_name.clone(), 0, len as u32),354		ExprLocation(settings.source.clone(), 0, len as u32),
355	)355	)
356}356}
357357
368			parse(368			parse(
369				$s,369				$s,
370				&ParserSettings {370				&ParserSettings {
371					file_name: Source::new_virtual("<test>".into(), IStr::empty()),371					source: Source::new_virtual("<test>".into(), IStr::empty()),
372				},372				},
373			)373			)
374			.unwrap()374			.unwrap()
719		let file_name = Source::new_virtual("<test>".into(), IStr::empty());719		let file_name = Source::new_virtual("<test>".into(), IStr::empty());
720		let expr = parse(720		let expr = parse(
721			"{} { local x = 1, x: x } + {}",721			"{} { local x = 1, x: x } + {}",
722			&ParserSettings { file_name },722			&ParserSettings { source: file_name },
723		)723		)
724		.unwrap();724		.unwrap();
725		assert_eq!(725		assert_eq!(

--- a/crates/jrsonnet-stdlib/build.rs
+++ b/crates/jrsonnet-stdlib/build.rs
@@ -7,10 +7,7 @@
 	let parsed = parse(
 		include_str!("./src/std.jsonnet"),
 		&ParserSettings {
-			file_name: Source::new_virtual(
-				"<std>".into(),
-				include_str!("./src/std.jsonnet").into(),
-			),
+			source: Source::new_virtual("<std>".into(), include_str!("./src/std.jsonnet").into()),
 		},
 	)
 	.expect("parse");

--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -215,7 +215,7 @@
 	pub path_resolver: PathResolver,
 }
 
-pub fn extvar_source(name: &str, code: impl Into<IStr>) -> Source {
+fn extvar_source(name: &str, code: impl Into<IStr>) -> Source {
 	let source_name = format!("<extvar:{}>", name);
 	Source::new_virtual(source_name.into(), code.into())
 }
@@ -277,7 +277,7 @@
 		let parsed = jrsonnet_parser::parse(
 			&code,
 			&jrsonnet_parser::ParserSettings {
-				file_name: source.clone(),
+				source: source.clone(),
 			},
 		)
 		.map_err(|e| ImportSyntaxError {