git.delta.rocks / jrsonnet / refs/commits / 150f28648ad3

difftreelog

refactor always use prepared calls

wulxrvxzYaroslav Bolyukin2026-04-04parent: #0f5b614.patch.diff
in: master

17 files changed

modifiedcrates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -19,7 +19,7 @@
 	destructure::evaluate_dest,
 	error::{ErrorKind::*, suggest_object_fields},
 	evaluate::operator::{evaluate_binary_op_special, evaluate_unary_op},
-	function::{CallLocation, FuncDesc, FuncVal},
+	function::{CallLocation, FuncDesc, FuncVal, PreparedFuncVal},
 	gc::WithCapacityExt as _,
 	in_frame,
 	typed::{FromUntyped, IntoUntyped as _, Typed},
@@ -430,11 +430,25 @@
 	let value = evaluate(ctx.clone(), value)?;
 	Ok(match value {
 		Val::Func(f) => {
-			let body = || f.evaluate(ctx, loc, args, tailstrict);
+			let name = f.name();
+			let prepare = PreparedFuncVal::new(f, args.unnamed.len(), &args.names)?;
+			let unnamed = args
+				.unnamed
+				.iter()
+				.cloned()
+				.map(|un| evaluate_thunk(ctx.clone(), un, tailstrict))
+				.collect::<Result<Vec<_>>>()?;
+			let named = args
+				.values
+				.iter()
+				.cloned()
+				.map(|un| evaluate_thunk(ctx.clone(), un, tailstrict))
+				.collect::<Result<Vec<_>>>()?;
+			let body = || prepare.call(loc, &unnamed, &named);
 			if tailstrict {
 				body()?
 			} else {
-				in_frame(loc, || format!("function <{}> call", f.name()), body)?
+				in_frame(loc, || format!("function <{name}> call"), body)?
 			}
 		}
 		v => bail!(OnlyFunctionsCanBeCalledGot(v.value_type())),
@@ -479,6 +493,13 @@
 	})
 }
 
+pub fn evaluate_thunk(ctx: Context, expr: Rc<Expr>, tailstrict: bool) -> Result<Thunk<Val>> {
+	Ok(if tailstrict {
+		Thunk::evaluated(evaluate(ctx, &expr)?)
+	} else {
+		Thunk!(move || { evaluate(ctx, &expr) })
+	})
+}
 #[allow(clippy::too_many_lines)]
 pub fn evaluate(ctx: Context, expr: &Expr) -> Result<Val> {
 	use Expr::*;
modifiedcrates/jrsonnet-evaluator/src/function/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function/mod.rs
+++ b/crates/jrsonnet-evaluator/src/function/mod.rs
@@ -3,12 +3,12 @@
 use educe::Educe;
 use jrsonnet_gcmodule::{Cc, Trace};
 use jrsonnet_interner::IStr;
-use jrsonnet_ir::{ArgsDesc, Destruct, Expr, ExprParams, Span};
+use jrsonnet_ir::{Destruct, Expr, ExprParams, Span};
 pub use jrsonnet_macros::builtin;
 
 use self::{
 	builtin::Builtin,
-	parse::{parse_builtin_call, parse_default_function_call, parse_function_call},
+	parse::parse_default_function_call,
 	prepared::{PreparedCall, parse_prepared_builtin_call, parse_prepared_function_call},
 };
 use crate::{
@@ -22,7 +22,7 @@
 
 pub use jrsonnet_ir::function::*;
 pub use native::NativeFn;
-pub use prepared::PreparedFuncVal;
+pub(crate) use prepared::PreparedFuncVal;
 
 /// Function callsite location.
 /// Either from other jsonnet code, specified by expression location, or from native (without location).
@@ -77,16 +77,6 @@
 		parse_default_function_call(self.ctx.clone(), &self.params)
 	}
 
-	/// Create context, with which body code will run
-	pub(crate) fn call_body_context(
-		&self,
-		call_ctx: Context,
-		args: &ArgsDesc,
-		tailstrict: bool,
-	) -> Result<Context> {
-		parse_function_call(call_ctx, self.ctx.clone(), &self.params, args, tailstrict)
-	}
-
 	pub fn evaluate_trivial(&self) -> Option<Val> {
 		evaluate_trivial(&self.body)
 	}
@@ -137,27 +127,6 @@
 		match self {
 			Self::Normal(normal) => normal.name.clone(),
 			Self::Builtin(builtin) => builtin.name().into(),
-		}
-	}
-	/// Call function using arguments evaluated in specified `call_ctx` [`Context`].
-	///
-	/// If `tailstrict` is specified - then arguments will be evaluated before being passed to function body.
-	pub fn evaluate(
-		&self,
-		call_ctx: Context,
-		loc: CallLocation<'_>,
-		args: &ArgsDesc,
-		tailstrict: bool,
-	) -> Result<Val> {
-		match self {
-			Self::Normal(func) => {
-				let body_ctx = func.call_body_context(call_ctx, args, tailstrict)?;
-				evaluate(body_ctx, &func.body)
-			}
-			Self::Builtin(b) => {
-				let args = parse_builtin_call(call_ctx, b.params(), args, tailstrict)?;
-				b.call(loc, &args)
-			}
 		}
 	}
 
modifiedcrates/jrsonnet-evaluator/src/function/native.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function/native.rs
+++ b/crates/jrsonnet-evaluator/src/function/native.rs
@@ -39,12 +39,19 @@
 		impl<$($gen,)* O> FromUntyped for NativeFn<($($gen,)* O,)> {
 			fn from_untyped(untyped: Val) -> Result<Self> {
 				let func = FuncVal::from_untyped(untyped)?;
+				Self::try_from(func)
+			}
+		}
+		impl<$($gen,)* O> TryFrom<FuncVal> for NativeFn<($($gen,)* O,)> {
+			type Error = crate::Error;
+			fn try_from(v: FuncVal) -> Result<Self> {
 				Ok(Self(
-					PreparedFuncVal::new(func, $i, &[])?,
+					PreparedFuncVal::new(v, $i, &[])?,
 					PhantomData,
 				))
 			}
 		}
+
 	};
 	($i:expr; $($cur:ident)* @ $c:ident $($rest:ident)*) => {
 		impl_native_desc!($i; $($cur)*);
modifiedcrates/jrsonnet-evaluator/src/function/parse.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function/parse.rs
+++ b/crates/jrsonnet-evaluator/src/function/parse.rs
@@ -1,215 +1,13 @@
-use std::rc::Rc;
-
-use jrsonnet_ir::{
-	ArgsDesc, Expr, ExprParams,
-	function::{FunctionSignature, ParamName},
-};
+use jrsonnet_ir::ExprParams;
 use rustc_hash::FxHashMap;
 
 use crate::{
-	Context, Pending, Thunk, Val, bail,
+	Context, Thunk,
 	destructure::destruct,
 	error::{ErrorKind::*, Result},
-	evaluate, evaluate_named_param,
+	evaluate_named_param,
 	gc::WithCapacityExt as _,
 };
-
-fn eval_arg(ctx: Context, arg: &Rc<Expr>, tailstrict: bool) -> Result<Thunk<Val>> {
-	if tailstrict {
-		Ok(Thunk::evaluated(evaluate(ctx, arg)?))
-	} else {
-		let arg = arg.clone();
-		Ok(Thunk!(move || evaluate(ctx, &arg)))
-	}
-}
-
-/// Creates correct [context](Context) for function body evaluation returning error on invalid call.
-///
-/// ## Parameters
-/// * `ctx`: used for passed argument expressions' execution and for body execution (if `body_ctx` is not set)
-/// * `body_ctx`: used for default parameter values' execution and for body execution (if set)
-/// * `params`: function parameters' definition
-/// * `args`: passed function arguments
-/// * `tailstrict`: if set to `true` function arguments are eagerly executed, otherwise - lazily
-pub(crate) fn parse_function_call(
-	ctx: Context,
-	body_ctx: Context,
-	params: &ExprParams,
-	args: &ArgsDesc,
-	tailstrict: bool,
-) -> Result<Context> {
-	let mut passed_args = FxHashMap::with_capacity(params.binds_len());
-	if args.unnamed.len() > params.signature.len() {
-		bail!(TooManyArgsFunctionHas(
-			params.signature.len(),
-			params.signature.clone(),
-		))
-	}
-
-	let mut filled_named = 0;
-	let mut filled_positionals = 0;
-
-	for (id, arg) in args.unnamed.iter().enumerate() {
-		destruct(
-			&params.exprs[id].destruct,
-			eval_arg(ctx.clone(), arg, tailstrict)?,
-			Pending::new_filled(ctx.clone()),
-			&mut passed_args,
-		)?;
-		filled_positionals += 1;
-	}
-
-	for (name, value) in &args.named {
-		// FIXME: O(n) for arg existence check
-		if !params.exprs.iter().any(|p| &p.destruct.name() == name) {
-			bail!(UnknownFunctionParameter(name.clone()));
-		}
-		if passed_args
-			.insert(name.clone(), eval_arg(ctx.clone(), value, tailstrict)?)
-			.is_some()
-		{
-			bail!(BindingParameterASecondTime(name.clone()));
-		}
-		filled_named += 1;
-	}
-
-	if filled_named + filled_positionals < params.len() {
-		// Some args are unset, but maybe we have defaults for them
-		// Default values should be created in newly created context
-		let fctx = Context::new_future();
-		let mut defaults =
-			FxHashMap::with_capacity(params.binds_len() - filled_named - filled_positionals);
-
-		for (idx, into, default) in params
-			.exprs
-			.iter()
-			.enumerate()
-			.filter_map(|(i, p)| Some((i, &p.destruct, p.default.as_ref()?)))
-		{
-			if let ParamName::Named(name) = into.name() {
-				if passed_args.contains_key(&name) {
-					continue;
-				}
-			} else if idx < filled_positionals {
-				continue;
-			}
-
-			destruct(
-				into,
-				{
-					let ctx = fctx.clone();
-					let name = into.name();
-					let value = default.clone();
-					Thunk!(move || evaluate_named_param(ctx.unwrap(), &value, name))
-				},
-				fctx.clone(),
-				&mut defaults,
-			)?;
-			if into.name().is_named() {
-				filled_named += 1;
-			} else {
-				filled_positionals += 1;
-			}
-		}
-
-		// Some args still weren't filled
-		if filled_named + filled_positionals != params.len() {
-			for param in params.exprs.iter().skip(args.unnamed.len()) {
-				let mut found = false;
-				for (name, _) in &args.named {
-					if &param.destruct.name() == name {
-						found = true;
-					}
-				}
-				if !found {
-					bail!(FunctionParameterNotBoundInCall(
-						param.destruct.name(),
-						params.signature.clone()
-					));
-				}
-			}
-			unreachable!();
-		}
-
-		Ok(body_ctx
-			.extend_bindings(passed_args)
-			.extend_bindings(defaults)
-			.into_future(fctx))
-	} else {
-		let body_ctx = body_ctx.extend_bindings(passed_args);
-		Ok(body_ctx)
-	}
-}
-
-/// You shouldn't probally use this function, use `jrsonnet_macros::builtin` instead
-///
-/// ## Parameters
-/// * `ctx`: used for passed argument expressions' execution and for body execution (if `body_ctx` is not set)
-/// * `params`: function parameters' definition
-/// * `args`: passed function arguments
-/// * `tailstrict`: if set to `true` function arguments are eagerly executed, otherwise - lazily
-pub fn parse_builtin_call(
-	ctx: Context,
-	params: FunctionSignature,
-	args: &ArgsDesc,
-	tailstrict: bool,
-) -> Result<Vec<Option<Thunk<Val>>>> {
-	let mut passed_args: Vec<Option<Thunk<Val>>> = vec![None; params.len()];
-	if args.unnamed.len() > params.len() {
-		bail!(TooManyArgsFunctionHas(params.len(), params,))
-	}
-
-	let mut filled_args = 0;
-
-	for (id, arg) in args.unnamed.iter().enumerate() {
-		passed_args[id] = Some(eval_arg(ctx.clone(), arg, tailstrict)?);
-		filled_args += 1;
-	}
-
-	for (name, arg) in &args.named {
-		// FIXME: O(n) for arg existence check
-		let id = params
-			.iter()
-			.position(|p| p.name() == name)
-			.ok_or_else(|| UnknownFunctionParameter(name.clone()))?;
-		if passed_args[id]
-			.replace(eval_arg(ctx.clone(), arg, tailstrict)?)
-			.is_some()
-		{
-			bail!(BindingParameterASecondTime(name.clone()));
-		}
-		filled_args += 1;
-	}
-
-	if filled_args < params.len() {
-		for (id, _) in params.iter().enumerate().filter(|(_, p)| p.has_default()) {
-			if passed_args[id].is_some() {
-				continue;
-			}
-			filled_args += 1;
-		}
-
-		// Some args still wasn't filled
-		if filled_args != params.len() {
-			for param in params.iter().skip(args.unnamed.len()) {
-				let mut found = false;
-				for (name, _) in &args.named {
-					if param.name() == name {
-						found = true;
-					}
-				}
-				if !found {
-					bail!(FunctionParameterNotBoundInCall(
-						param.name().clone(),
-						params,
-					));
-				}
-			}
-			unreachable!();
-		}
-	}
-	Ok(passed_args)
-}
 
 /// Creates Context, which has all argument default values applied
 /// and with unbound values causing error to be returned
modifiedcrates/jrsonnet-ir-parser/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-ir-parser/src/lib.rs
+++ b/crates/jrsonnet-ir-parser/src/lib.rs
@@ -416,10 +416,11 @@
 
 fn args(p: &mut Parser<'_>) -> Result<ArgsDesc> {
 	if p.at(T![')']) {
-		return Ok(ArgsDesc::new(Vec::new(), Vec::new()));
+		return Ok(ArgsDesc::new(Vec::new(), Vec::new(), Vec::new()));
 	}
 	let mut unnamed = Vec::new();
-	let mut named = Vec::new();
+	let mut names = Vec::new();
+	let mut values = Vec::new();
 	let mut named_started = false;
 	loop {
 		let is_named = p.at(SyntaxKind::IDENT) && {
@@ -430,7 +431,9 @@
 			let name: IStr = ident(p)?;
 			p.eat(T![=])?;
 			let value = Rc::new(expr(p)?);
-			named.push((name, value));
+
+			names.push(name);
+			values.push(value);
 			named_started = true;
 		} else {
 			if named_started {
@@ -445,7 +448,7 @@
 			break;
 		}
 	}
-	Ok(ArgsDesc::new(unnamed, named))
+	Ok(ArgsDesc::new(unnamed, names, values))
 }
 
 fn bind(p: &mut Parser<'_>) -> Result<BindSpec> {
modifiedcrates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__function_and_call.snapdiffbeforeafterboth
--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__function_and_call.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__function_and_call.snap
@@ -66,12 +66,12 @@
                     2.0,
                 ),
             ],
-            named: [
-                (
-                    "y",
-                    Num(
-                        3.0,
-                    ),
+            names: [
+                "y",
+            ],
+            values: [
+                Num(
+                    3.0,
                 ),
             ],
         } from virtual:<test>:26-34,
modifiedcrates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__index_and_suffix.snapdiffbeforeafterboth
--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__index_and_suffix.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__index_and_suffix.snap
@@ -23,7 +23,8 @@
                     2.0,
                 ),
             ],
-            named: [],
+            names: [],
+            values: [],
         } from virtual:<test>:8-11,
         false,
     ),
modifiedcrates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@array_comp.jsonnet.snapdiffbeforeafterboth
--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@array_comp.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@array_comp.jsonnet.snap
@@ -26,7 +26,8 @@
                             "x" from virtual:<test>:16-17,
                         ),
                     ],
-                    named: [],
+                    names: [],
+                    values: [],
                 } from virtual:<test>:15-18,
                 false,
             ),
modifiedcrates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@reserved.jsonnet.snapdiffbeforeafterboth
--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@reserved.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@reserved.jsonnet.snap
@@ -24,7 +24,8 @@
                         "null_fields" from virtual:<test>:20-31,
                     ),
                 ],
-                named: [],
+                names: [],
+                values: [],
             } from virtual:<test>:16-32,
             false,
         ),
modifiedcrates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@suffix.jsonnet.snapdiffbeforeafterboth
--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@suffix.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@suffix.jsonnet.snap
@@ -28,7 +28,8 @@
                         2.0,
                     ),
                 ],
-                named: [],
+                names: [],
+                values: [],
             } from virtual:<test>:15-18,
             false,
         ),
@@ -52,7 +53,8 @@
                         2.0,
                     ),
                 ],
-                named: [],
+                names: [],
+                values: [],
             } from virtual:<test>:28-31,
             false,
         ),
modifiedcrates/jrsonnet-ir/src/expr.rsdiffbeforeafterboth
--- a/crates/jrsonnet-ir/src/expr.rs
+++ b/crates/jrsonnet-ir/src/expr.rs
@@ -195,11 +195,16 @@
 #[derive(Debug, PartialEq, Acyclic)]
 pub struct ArgsDesc {
 	pub unnamed: Vec<Rc<Expr>>,
-	pub named: Vec<(IStr, Rc<Expr>)>,
+	pub names: Vec<IStr>,
+	pub values: Vec<Rc<Expr>>,
 }
 impl ArgsDesc {
-	pub fn new(unnamed: Vec<Rc<Expr>>, named: Vec<(IStr, Rc<Expr>)>) -> Self {
-		Self { unnamed, named }
+	pub fn new(unnamed: Vec<Rc<Expr>>, names: Vec<IStr>, values: Vec<Rc<Expr>>) -> Self {
+		Self {
+			unnamed,
+			names,
+			values,
+		}
 	}
 }
 
modifiedcrates/jrsonnet-ir/src/visit.rsdiffbeforeafterboth
--- a/crates/jrsonnet-ir/src/visit.rs
+++ b/crates/jrsonnet-ir/src/visit.rs
@@ -216,11 +216,15 @@
 		}
 		Expr::Apply(expr, spanned, _) => {
 			v.visit_expr(expr);
-			let ArgsDesc { unnamed, named } = &**spanned;
+			let ArgsDesc {
+				unnamed,
+				names: _,
+				values,
+			} = &**spanned;
 			for unnamed in unnamed {
 				v.visit_expr(unnamed);
 			}
-			for (_name, named) in named {
+			for named in values {
 				v.visit_expr(named);
 			}
 		}
modifiedcrates/jrsonnet-peg-parser/src/lib.rsdiffbeforeafterboth
before · crates/jrsonnet-peg-parser/src/lib.rs
1use std::rc::Rc;23use jrsonnet_gcmodule::Acyclic;4use jrsonnet_ir::{5	ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BindSpec, CompSpec, Destruct, DestructRest, Expr,6	ExprParam, ExprParams, FieldMember, FieldName, ForSpecData, IStr, IfElse, IfSpecData,7	ImportKind, IndexPart, LiteralType, Member, ObjBody, ObjComp, ObjMembers, Slice, SliceDesc,8	Source, Span, Spanned, Visibility, unescape,9};10use peg::parser;1112pub struct ParserSettings {13	pub source: Source,14}1516macro_rules! expr_bin {17	($a:ident $op:ident $b:ident) => {18		Expr::BinaryOp(Box::new(BinaryOp {19			lhs: $a,20			op: $op,21			rhs: $b,22		}))23	};24}25macro_rules! expr_un {26	($op:ident $a:ident) => {27		Expr::UnaryOp($op, Box::new($a))28	};29}3031parser! {32	grammar jsonnet_parser() for str {33		use peg::ParseLiteral;3435		rule eof() = quiet!{![_]} / expected!("<eof>")36		rule eol() = "\n" / eof()3738		/// Standard C-like comments39		rule comment()40			= "//" (!eol()[_])* eol()41			/ "/*" (!("*/")[_])* "*/"42			/ "#" (!eol()[_])* eol()4344		rule single_whitespace() = quiet!{([' ' | '\r' | '\n' | '\t'] / comment())} / expected!("<whitespace>")45		rule _() = quiet!{([' ' | '\r' | '\n' | '\t']+) / comment()}* / expected!("<whitespace>")4647		/// For comma-delimited elements48		rule comma() = quiet!{_ "," _} / expected!("<comma>")49		rule alpha() -> char = c:$(['_' | 'a'..='z' | 'A'..='Z']) {c.chars().next().unwrap()}50		rule digit() -> char = d:$(['0'..='9']) {d.chars().next().unwrap()}51		rule end_of_ident() = !['0'..='9' | '_' | 'a'..='z' | 'A'..='Z']52		/// Sequence of digits53		rule uint_str() -> &'input str = a:$(digit()+ ("_" digit()+)*) { a }54		/// Number in scientific notation format55		rule number() -> f64 = quiet!{a:$(uint_str() ("." uint_str())? (['e'|'E'] (s:['+'|'-'])? uint_str())?) {? a.replace("_","").parse().map_err(|_| "<number>") }} / expected!("<number>")5657		/// Reserved word followed by any non-alphanumberic58		rule reserved() = ("assert" / "else" / "error" / "false" / "for" / "function" / "if" / "import" / "importstr" / "importbin" / "in" / "local" / "null" / "tailstrict" / "then" / "self" / "super" / "true") end_of_ident()59		rule id() -> IStr = v:$(quiet!{ !reserved() alpha() (alpha() / digit())*} / expected!("<identifier>")) { v.into() }6061		rule keyword(id: &'static str) -> ()62			= #parse_string_literal(id) end_of_ident()6364		pub rule param(s: &ParserSettings) -> ExprParam = destruct:destruct(s) expr:(_ "=" _ expr:expr(s){expr})? { ExprParam { destruct, default: expr.map(Rc::new) } }65		pub rule params(s: &ParserSettings) -> ExprParams66			= params:param(s) ** comma() comma()? { ExprParams::new(params) }67			/ { ExprParams::new(Vec::new()) }6869		pub rule arg(s: &ParserSettings) -> (Option<IStr>, Rc<Expr>)70			= name:(quiet! { (s:id() _ "=" !['='] _ {s})? } / expected!("<argument name>")) expr:expr(s) {(name, Rc::new(expr))}7172		pub rule args(s: &ParserSettings) -> ArgsDesc73			= args:arg(s)**comma() comma()? {?74				let unnamed_count = args.iter().take_while(|(n, _)| n.is_none()).count();75				let mut unnamed = Vec::with_capacity(unnamed_count);76				let mut named = Vec::with_capacity(args.len() - unnamed_count);77				let mut named_started = false;78				for (name, value) in args {79					if let Some(name) = name {80						named_started = true;81						named.push((name, value));82					} else {83						if named_started {84							return Err("<named argument>")85						}86						unnamed.push(value);87					}88				}89				Ok(ArgsDesc::new(unnamed, named))90			}9192		pub rule destruct_rest() -> DestructRest93			= "..." into:(_ into:id() {into})? {if let Some(into) = into {94				DestructRest::Keep(into)95			} else {DestructRest::Drop}}96		pub rule destruct_array(s: &ParserSettings) -> Destruct97			= "[" _ start:destruct(s)**comma() rest:(98				comma() _ rest:destruct_rest()? end:(99					comma() end:destruct(s)**comma() (_ comma())? {end}100					/ comma()? {Vec::new()}101				) {(rest, end)}102				/ comma()? {(None, Vec::new())}103			) _ "]" {?104				#[cfg(feature = "exp-destruct")] return Ok(Destruct::Array {105					start,106					rest: rest.0,107					end: rest.1,108				});109				#[cfg(not(feature = "exp-destruct"))] Err("!!!experimental destructuring was not enabled")110			}111		pub rule destruct_object(s: &ParserSettings) -> Destruct112			= "{" _113				fields:(name:id() into:(_ ":" _ into:destruct(s) {into})? default:(_ "=" _ v:spanned(<expr(s)>, s) {v})? {(name, into, default.map(Rc::new))})**comma()114				rest:(115					comma() rest:destruct_rest()? {rest}116					/ comma()? {None}117				)118			_ "}" {?119				#[cfg(feature = "exp-destruct")] return Ok(Destruct::Object {120					fields,121					rest,122				});123				#[cfg(not(feature = "exp-destruct"))] Err("!!!experimental destructuring was not enabled")124			}125		pub rule destruct(s: &ParserSettings) -> Destruct126			= v:id() {Destruct::Full(v)}127			/ "?" {?128				#[cfg(feature = "exp-destruct")] return Ok(Destruct::Skip);129				#[cfg(not(feature = "exp-destruct"))] Err("!!!experimental destructuring was not enabled")130			}131			/ arr:destruct_array(s) {arr}132			/ obj:destruct_object(s) {obj}133134		pub rule bind(s: &ParserSettings) -> BindSpec135			= into:destruct(s) _ "=" _ value:expr(s) {BindSpec::Field{into, value: Rc::new(value)}}136			/ name:id() _ "(" _ params:params(s) _ ")" _ "=" _ value:expr(s) {BindSpec::Function{name, params, value: Rc::new(value)}}137138		pub rule assertion(s: &ParserSettings) -> AssertStmt139			= keyword("assert") _ cond:spanned(<expr(s)>, s) msg:(_ ":" _ e:spanned(<expr(s)>, s) {e})? { AssertStmt(cond, msg) }140141		pub rule whole_line() -> &'input str142			= str:$((!['\n'][_])* "\n") {str}143		pub rule string_block() -> String144			= "|||" chomped:"-"? (!['\n']single_whitespace())* "\n"145			empty_lines:$(['\n']*)146			prefix:[' ' | '\t']+ first_line:whole_line()147			lines:("\n" {"\n"} / [' ' | '\t']*<{prefix.len()}> s:whole_line() {s})*148			[' ' | '\t']*<, {prefix.len() - 1}> "|||"149			{150				let mut l = empty_lines.to_owned();151				l.push_str(first_line);152				l.extend(lines);153				if chomped.is_some() {154					debug_assert!(l.ends_with('\n'));155					l.truncate(l.len() - 1);156				}157				l158			}159160		rule hex_char()161			= quiet! { ['0'..='9' | 'a'..='f' | 'A'..='F'] } / expected!("<hex char>")162163		rule string_char(c: rule<()>)164			= (!['\\']!c()[_])+165			/ "\\\\"166			/ "\\u" hex_char() hex_char() hex_char() hex_char()167			/ "\\x" hex_char() hex_char()168			/ ['\\'] (quiet! { ['b' | 'f' | 'n' | 'r' | 't' | '"' | '\''] } / expected!("<escape character>"))169		pub rule string() -> String170			= ['"'] str:$(string_char(<"\"">)*) ['"'] {? unescape::unescape(str).ok_or("<escaped string>")}171			/ ['\''] str:$(string_char(<"\'">)*) ['\''] {? unescape::unescape(str).ok_or("<escaped string>")}172			/ quiet!{ "@'" str:$(("''" / (!['\''][_]))*) "'" {str.replace("''", "'")}173			/ "@\"" str:$(("\"\"" / (!['"'][_]))*) "\"" {str.replace("\"\"", "\"")}174			/ string_block() } / expected!("<string>")175176		pub rule field_name(s: &ParserSettings) -> FieldName177			= name:id() {FieldName::Fixed(name)}178			/ name:string() {FieldName::Fixed(name.into())}179			/ "[" _ expr:expr(s) _ "]" {FieldName::Dyn(expr)}180		pub rule visibility() -> Visibility181			= ":::" {Visibility::Unhide}182			/ "::" {Visibility::Hidden}183			/ ":" {Visibility::Normal}184		pub rule field(s: &ParserSettings) -> FieldMember185			= name:spanned(<field_name(s)>, s) _ plus:"+"? _ visibility:visibility() _ value:expr(s) {FieldMember{186				name,187				plus: plus.is_some(),188				params: None,189				visibility,190				value: Rc::new(value),191			}}192			/ name:spanned(<field_name(s)>, s) _ "(" _ params:params(s) _ ")" _ visibility:visibility() _ value:expr(s) {FieldMember{193				name,194				plus: false,195				params: Some(params),196				visibility,197				value: Rc::new(value),198			}}199		pub rule obj_local(s: &ParserSettings) -> BindSpec200			= keyword("local") _ bind:bind(s) {bind}201		pub rule member(s: &ParserSettings) -> Member202			= bind:obj_local(s) {Member::BindStmt(bind)}203			/ assertion:assertion(s) {Member::AssertStmt(assertion)}204			/ field:field(s) {Member::Field(field)}205		pub rule objinside(s: &ParserSettings) -> ObjBody206			=  members:(member(s) ** comma()) comma()? _ compspecs:compspecs(s)? {?207				Ok(if let Some(compspecs) = compspecs {208					let mut locals = Vec::new();209					let mut field = None;210					for member in members {211						match member {212							Member::Field(field_member) => if field.replace(field_member).is_some() {213								return Err("<object comprehension can only contain one field>")214							},215							Member::BindStmt(bind_spec) => locals.push(bind_spec),216							Member::AssertStmt(assert_stmt) => return Err("<asserts are unsupported in object comprehension>"),217						}218					}219					ObjBody::ObjComp(ObjComp {220						locals: Rc::new(locals),221						field: field.map(Rc::new).ok_or("<missing object comprehension field>")?,222						compspecs223					})224				} else {225					let mut locals = Vec::new();226					let mut asserts = Vec::new();227					let mut fields = Vec::new();228					for member in members {229						match member {230							Member::Field(field_member) => fields.push(field_member),231							Member::BindStmt(bind_spec) => locals.push(bind_spec),232							Member::AssertStmt(assert_stmt) => asserts.push(assert_stmt),233						}234					}235					ObjBody::MemberList(ObjMembers {236						locals: Rc::new(locals),237						asserts: Rc::new(asserts),238						fields239					})240				})241			}242		pub rule ifspec(s: &ParserSettings) -> IfSpecData243			= i:spanned(<keyword("if")>, s) _ cond:expr(s) {IfSpecData { span: i.span, cond }}244		pub rule forspec(s: &ParserSettings) -> ForSpecData245			= keyword("for") _ destruct:destruct(s) _ keyword("in") _ over:expr(s) { ForSpecData { destruct, over } }246		rule compspec(s: &ParserSettings) -> CompSpec247			= i:ifspec(s) { CompSpec::IfSpec(i) } / f:forspec(s) {CompSpec::ForSpec(f)}248		pub rule compspecs(s: &ParserSettings) -> Vec<CompSpec>249			= specs:compspec(s) ++ _ {?250				if !matches!(specs[0], CompSpec::ForSpec(_)) {251					return Err("<first compspec should be for>")252				}253				Ok(specs)254			}255		pub rule local_expr(s: &ParserSettings) -> Expr256			= keyword("local") _ binds:bind(s) ** comma() (_ ",")? _ ";" _ expr:expr(s) { Expr::LocalExpr(binds, Box::new(expr)) }257		pub rule string_expr(s: &ParserSettings) -> Expr258			= s:string() {Expr::Str(s.into())}259		pub rule obj_expr(s: &ParserSettings) -> Expr260			= "{" _ body:objinside(s) _ "}" {Expr::Obj(body)}261		pub rule array_expr(s: &ParserSettings) -> Expr262			= "[" _ elems:(expr(s) ** comma()) _ comma()? "]" {Expr::Arr(Rc::new(elems))}263		pub rule array_comp_expr(s: &ParserSettings) -> Expr264			= "[" _ expr:expr(s) _ comma()? _ specs:(r: compspecs(s) _ {r}) "]" {265				Expr::ArrComp(Rc::new(expr), specs)266			}267		pub rule number_expr(s: &ParserSettings) -> Expr268			= n:number() {? if n.is_finite() {269				Ok(Expr::Num(n))270			} else {271				Err("!!!numbers are finite")272			}}273274		rule spanned<T: Acyclic>(x: rule<T>, s: &ParserSettings) -> Spanned<T>275			= a:position!() n:x() b:position!() { Spanned::new(n, Span(s.source.clone(), a as u32, b as u32)) }276277		pub rule var_expr(s: &ParserSettings) -> Expr278			= n:spanned(<id()>, s) { Expr::Var(n) }279		pub rule id_loc(s: &ParserSettings) -> Spanned<Expr>280			= a:position!() n:id() b:position!() { Spanned::new(Expr::Str(n), Span(s.source.clone(), a as u32,b as u32)) }281		pub rule if_then_else_expr(s: &ParserSettings) -> Expr282			= cond:ifspec(s) _ keyword("then") _ cond_then:expr(s) cond_else:(_ keyword("else") _ e:expr(s) {e})? {Expr::IfElse(Box::new(IfElse{283				cond,284				cond_then,285				cond_else,286			}))}287288		pub rule literal(s: &ParserSettings) -> Expr289			= v:(290				keyword("null") {LiteralType::Null}291				/ keyword("true") {LiteralType::True}292				/ keyword("false") {LiteralType::False}293				/ keyword("self") {LiteralType::This}294				/ keyword("$") {LiteralType::Dollar}295				/ keyword("super") {LiteralType::Super}296			) {Expr::Literal(v)}297298		rule import_kind() -> ImportKind299			= keyword("importstr") { ImportKind::Str }300			/ keyword("importbin") { ImportKind::Bin }301			/ keyword("import") { ImportKind::Normal }302303		pub rule expr_basic(s: &ParserSettings) -> Expr304			= literal(s)305306			/ string_expr(s) / number_expr(s)307			/ array_expr(s)308			/ obj_expr(s)309			/ array_expr(s)310			/ array_comp_expr(s)311312			/ kind:spanned(<import_kind()>, s) _ path:expr(s) {Expr::Import(kind, Box::new(path))}313314			/ var_expr(s)315			/ local_expr(s)316			/ if_then_else_expr(s)317318			/ keyword("function") _ "(" _ params:params(s) _ ")" _ expr:expr(s) {Expr::Function(params, Rc::new(expr))}319			/ assert:assertion(s) _ ";" _ rest:expr(s) { Expr::AssertExpr(Rc::new(AssertExpr{320				assert, rest321			})) }322323			/ err_kw:spanned(<keyword("error")>, s) _ expr:expr(s) { Expr::ErrorStmt(err_kw.span, Box::new(expr)) }324325		rule slice_part(s: &ParserSettings) -> Option<Spanned<Expr>>326			= _ e:(e:spanned(<expr(s)>, s) _{e})? {e}327		pub rule slice_desc(s: &ParserSettings) -> SliceDesc328			= start:slice_part(s) ":" pair:(end:slice_part(s) step:(":" e:slice_part(s){e})? {(end, step.flatten())})? {329				let (end, step) = if let Some((end, step)) = pair {330					(end, step)331				}else{332					(None, None)333				};334335				SliceDesc { start, end, step }336			}337338		rule binop(x: rule<()>) -> ()339			= quiet!{ x() } / expected!("<binary op>")340		rule unaryop(x: rule<()>) -> ()341			= quiet!{ x() } / expected!("<unary op>")342343		rule ensure_null_coaelse()344			= "" {?345				#[cfg(not(feature = "exp-null-coaelse"))] return Err("!!!experimental null coaelscing was not enabled");346				#[cfg(feature = "exp-null-coaelse")] Ok(())347			}348		use jrsonnet_ir::BinaryOpType::*;349		use jrsonnet_ir::UnaryOpType::*;350		rule expr(s: &ParserSettings) -> Expr351			= precedence! {352				a:(@) _ binop(<"||">) _ b:@ {expr_bin!(a Or b)}353				a:(@) _ binop(<"??">) _ ensure_null_coaelse() b:@ {354					#[cfg(feature = "exp-null-coaelse")] return expr_bin!(a NullCoaelse b);355					unreachable!("ensure_null_coaelse will fail if feature is not enabled")356				}357				--358				a:(@) _ binop(<"&&">) _ b:@ {expr_bin!(a And b)}359				--360				a:(@) _ binop(<"|">) _ b:@ {expr_bin!(a BitOr b)}361				--362				a:@ _ binop(<"^">) _ b:(@) {expr_bin!(a BitXor b)}363				--364				a:(@) _ binop(<"&">) _ b:@ {expr_bin!(a BitAnd b)}365				--366				a:(@) _ binop(<"==">) _ b:@ {expr_bin!(a Eq b)}367				a:(@) _ binop(<"!=">) _ b:@ {expr_bin!(a Neq b)}368				--369				a:(@) _ binop(<"<">) _ b:@ {expr_bin!(a Lt b)}370				a:(@) _ binop(<">">) _ b:@ {expr_bin!(a Gt b)}371				a:(@) _ binop(<"<=">) _ b:@ {expr_bin!(a Lte b)}372				a:(@) _ binop(<">=">) _ b:@ {expr_bin!(a Gte b)}373				a:(@) _ binop(<keyword("in")>) _ b:@ {expr_bin!(a In b)}374				--375				a:(@) _ binop(<"<<">) _ b:@ {expr_bin!(a Lhs b)}376				a:(@) _ binop(<">>">) _ b:@ {expr_bin!(a Rhs b)}377				--378				a:(@) _ binop(<"+">) _ b:@ {expr_bin!(a Add b)}379				a:(@) _ binop(<"-">) _ b:@ {expr_bin!(a Sub b)}380				--381				a:(@) _ binop(<"*">) _ b:@ {expr_bin!(a Mul b)}382				a:(@) _ binop(<"/">) _ b:@ {expr_bin!(a Div b)}383				a:(@) _ binop(<"%">) _ b:@ {expr_bin!(a Mod b)}384				--385						unaryop(<"+">) _ b:@ {expr_un!(Plus b)}386						unaryop(<"-">) _ b:@ {expr_un!(Minus b)}387						unaryop(<"!">) _ b:@ {expr_un!(Not b)}388						unaryop(<"~">) _ b:@ {expr_un!(BitNot b)}389				--390				value:(@) _ "[" _ slice:slice_desc(s) _ "]" {Expr::Slice(Box::new(Slice{value, slice}))}391				indexable:(@) _ parts:index_part(s)+ {Expr::Index{indexable: Box::new(indexable), parts}}392				a:(@) _ args:spanned(<"(" _ a:args(s) _ ")" {a}>, s) ts:(_ keyword("tailstrict"))? {Expr::Apply(Box::new(a), args, ts.is_some())}393				a:(@) _ "{" _ body:objinside(s) _ "}" {Expr::ObjExtend(Rc::new(a), body)}394				--395				e:expr_basic(s) {e}396				"(" _ e:expr(s) _ ")" {e}397			}398		pub rule index_part(s: &ParserSettings) -> IndexPart399		= n:("?" _ ensure_null_coaelse())? "." _ value:id_loc(s) {IndexPart {400			span: value.span,401			value: value.value,402			#[cfg(feature = "exp-null-coaelse")]403			null_coaelse: n.is_some(),404		}}405		/ n:("?" _ "." _ ensure_null_coaelse())? value:spanned(<"[" _ v:expr(s) _ "]" {v}>, s) {IndexPart {406			span: value.span,407			value: value.value,408			#[cfg(feature = "exp-null-coaelse")]409			null_coaelse: n.is_some(),410		}}411412		pub rule jsonnet(s: &ParserSettings) -> Expr = _ e:expr(s) _ {e}413	}414}415416pub type ParseError = peg::error::ParseError<peg::str::LineCol>;417pub fn parse(str: &str, settings: &ParserSettings) -> Result<Expr, ParseError> {418	jsonnet_parser::jsonnet(str, settings)419}420/// Used for importstr values421pub fn string_to_expr(str: IStr, settings: &ParserSettings) -> Spanned<Expr> {422	let len = str.len();423	Spanned::new(Expr::Str(str), Span(settings.source.clone(), 0, len as u32))424}425426#[cfg(test)]427mod tests {428	use std::fs;429430	use insta::{assert_snapshot, glob};431	use jrsonnet_ir::{IStr, Source};432433	use crate::{ParserSettings, parse};434435	#[test]436	fn snapshots() {437		glob!("tests/*.jsonnet", |path| {438			let input = fs::read_to_string(path).expect("read test file");439			let v = parse(440				&input,441				&ParserSettings {442					source: Source::new_virtual("<test>".into(), IStr::empty()),443				},444			)445			.unwrap();446			let v = format!("{v:#?}");447			assert_snapshot!(v);448		});449	}450}
after · crates/jrsonnet-peg-parser/src/lib.rs
1use std::rc::Rc;23use jrsonnet_gcmodule::Acyclic;4use jrsonnet_ir::{5	ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BindSpec, CompSpec, Destruct, DestructRest, Expr,6	ExprParam, ExprParams, FieldMember, FieldName, ForSpecData, IStr, IfElse, IfSpecData,7	ImportKind, IndexPart, LiteralType, Member, ObjBody, ObjComp, ObjMembers, Slice, SliceDesc,8	Source, Span, Spanned, Visibility, unescape,9};10use peg::parser;1112pub struct ParserSettings {13	pub source: Source,14}1516macro_rules! expr_bin {17	($a:ident $op:ident $b:ident) => {18		Expr::BinaryOp(Box::new(BinaryOp {19			lhs: $a,20			op: $op,21			rhs: $b,22		}))23	};24}25macro_rules! expr_un {26	($op:ident $a:ident) => {27		Expr::UnaryOp($op, Box::new($a))28	};29}3031parser! {32	grammar jsonnet_parser() for str {33		use peg::ParseLiteral;3435		rule eof() = quiet!{![_]} / expected!("<eof>")36		rule eol() = "\n" / eof()3738		/// Standard C-like comments39		rule comment()40			= "//" (!eol()[_])* eol()41			/ "/*" (!("*/")[_])* "*/"42			/ "#" (!eol()[_])* eol()4344		rule single_whitespace() = quiet!{([' ' | '\r' | '\n' | '\t'] / comment())} / expected!("<whitespace>")45		rule _() = quiet!{([' ' | '\r' | '\n' | '\t']+) / comment()}* / expected!("<whitespace>")4647		/// For comma-delimited elements48		rule comma() = quiet!{_ "," _} / expected!("<comma>")49		rule alpha() -> char = c:$(['_' | 'a'..='z' | 'A'..='Z']) {c.chars().next().unwrap()}50		rule digit() -> char = d:$(['0'..='9']) {d.chars().next().unwrap()}51		rule end_of_ident() = !['0'..='9' | '_' | 'a'..='z' | 'A'..='Z']52		/// Sequence of digits53		rule uint_str() -> &'input str = a:$(digit()+ ("_" digit()+)*) { a }54		/// Number in scientific notation format55		rule number() -> f64 = quiet!{a:$(uint_str() ("." uint_str())? (['e'|'E'] (s:['+'|'-'])? uint_str())?) {? a.replace("_","").parse().map_err(|_| "<number>") }} / expected!("<number>")5657		/// Reserved word followed by any non-alphanumberic58		rule reserved() = ("assert" / "else" / "error" / "false" / "for" / "function" / "if" / "import" / "importstr" / "importbin" / "in" / "local" / "null" / "tailstrict" / "then" / "self" / "super" / "true") end_of_ident()59		rule id() -> IStr = v:$(quiet!{ !reserved() alpha() (alpha() / digit())*} / expected!("<identifier>")) { v.into() }6061		rule keyword(id: &'static str) -> ()62			= #parse_string_literal(id) end_of_ident()6364		pub rule param(s: &ParserSettings) -> ExprParam = destruct:destruct(s) expr:(_ "=" _ expr:expr(s){expr})? { ExprParam { destruct, default: expr.map(Rc::new) } }65		pub rule params(s: &ParserSettings) -> ExprParams66			= params:param(s) ** comma() comma()? { ExprParams::new(params) }67			/ { ExprParams::new(Vec::new()) }6869		pub rule arg(s: &ParserSettings) -> (Option<IStr>, Rc<Expr>)70			= name:(quiet! { (s:id() _ "=" !['='] _ {s})? } / expected!("<argument name>")) expr:expr(s) {(name, Rc::new(expr))}7172		pub rule args(s: &ParserSettings) -> ArgsDesc73			= args:arg(s)**comma() comma()? {?74				let unnamed_count = args.iter().take_while(|(n, _)| n.is_none()).count();75				let mut unnamed = Vec::with_capacity(unnamed_count);76				let mut names = Vec::with_capacity(args.len() - unnamed_count);77				let mut values = Vec::with_capacity(args.len() - unnamed_count);78				let mut named_started = false;79				for (name, value) in args {80					if let Some(name) = name {81						named_started = true;82						names.push(name);83						values.push(value);84					} else {85						if named_started {86							return Err("<named argument>")87						}88						unnamed.push(value);89					}90				}91				Ok(ArgsDesc{unnamed, names, values})92			}9394		pub rule destruct_rest() -> DestructRest95			= "..." into:(_ into:id() {into})? {if let Some(into) = into {96				DestructRest::Keep(into)97			} else {DestructRest::Drop}}98		pub rule destruct_array(s: &ParserSettings) -> Destruct99			= "[" _ start:destruct(s)**comma() rest:(100				comma() _ rest:destruct_rest()? end:(101					comma() end:destruct(s)**comma() (_ comma())? {end}102					/ comma()? {Vec::new()}103				) {(rest, end)}104				/ comma()? {(None, Vec::new())}105			) _ "]" {?106				#[cfg(feature = "exp-destruct")] return Ok(Destruct::Array {107					start,108					rest: rest.0,109					end: rest.1,110				});111				#[cfg(not(feature = "exp-destruct"))] Err("!!!experimental destructuring was not enabled")112			}113		pub rule destruct_object(s: &ParserSettings) -> Destruct114			= "{" _115				fields:(name:id() into:(_ ":" _ into:destruct(s) {into})? default:(_ "=" _ v:spanned(<expr(s)>, s) {v})? {(name, into, default.map(Rc::new))})**comma()116				rest:(117					comma() rest:destruct_rest()? {rest}118					/ comma()? {None}119				)120			_ "}" {?121				#[cfg(feature = "exp-destruct")] return Ok(Destruct::Object {122					fields,123					rest,124				});125				#[cfg(not(feature = "exp-destruct"))] Err("!!!experimental destructuring was not enabled")126			}127		pub rule destruct(s: &ParserSettings) -> Destruct128			= v:id() {Destruct::Full(v)}129			/ "?" {?130				#[cfg(feature = "exp-destruct")] return Ok(Destruct::Skip);131				#[cfg(not(feature = "exp-destruct"))] Err("!!!experimental destructuring was not enabled")132			}133			/ arr:destruct_array(s) {arr}134			/ obj:destruct_object(s) {obj}135136		pub rule bind(s: &ParserSettings) -> BindSpec137			= into:destruct(s) _ "=" _ value:expr(s) {BindSpec::Field{into, value: Rc::new(value)}}138			/ name:id() _ "(" _ params:params(s) _ ")" _ "=" _ value:expr(s) {BindSpec::Function{name, params, value: Rc::new(value)}}139140		pub rule assertion(s: &ParserSettings) -> AssertStmt141			= keyword("assert") _ cond:spanned(<expr(s)>, s) msg:(_ ":" _ e:spanned(<expr(s)>, s) {e})? { AssertStmt(cond, msg) }142143		pub rule whole_line() -> &'input str144			= str:$((!['\n'][_])* "\n") {str}145		pub rule string_block() -> String146			= "|||" chomped:"-"? (!['\n']single_whitespace())* "\n"147			empty_lines:$(['\n']*)148			prefix:[' ' | '\t']+ first_line:whole_line()149			lines:("\n" {"\n"} / [' ' | '\t']*<{prefix.len()}> s:whole_line() {s})*150			[' ' | '\t']*<, {prefix.len() - 1}> "|||"151			{152				let mut l = empty_lines.to_owned();153				l.push_str(first_line);154				l.extend(lines);155				if chomped.is_some() {156					debug_assert!(l.ends_with('\n'));157					l.truncate(l.len() - 1);158				}159				l160			}161162		rule hex_char()163			= quiet! { ['0'..='9' | 'a'..='f' | 'A'..='F'] } / expected!("<hex char>")164165		rule string_char(c: rule<()>)166			= (!['\\']!c()[_])+167			/ "\\\\"168			/ "\\u" hex_char() hex_char() hex_char() hex_char()169			/ "\\x" hex_char() hex_char()170			/ ['\\'] (quiet! { ['b' | 'f' | 'n' | 'r' | 't' | '"' | '\''] } / expected!("<escape character>"))171		pub rule string() -> String172			= ['"'] str:$(string_char(<"\"">)*) ['"'] {? unescape::unescape(str).ok_or("<escaped string>")}173			/ ['\''] str:$(string_char(<"\'">)*) ['\''] {? unescape::unescape(str).ok_or("<escaped string>")}174			/ quiet!{ "@'" str:$(("''" / (!['\''][_]))*) "'" {str.replace("''", "'")}175			/ "@\"" str:$(("\"\"" / (!['"'][_]))*) "\"" {str.replace("\"\"", "\"")}176			/ string_block() } / expected!("<string>")177178		pub rule field_name(s: &ParserSettings) -> FieldName179			= name:id() {FieldName::Fixed(name)}180			/ name:string() {FieldName::Fixed(name.into())}181			/ "[" _ expr:expr(s) _ "]" {FieldName::Dyn(expr)}182		pub rule visibility() -> Visibility183			= ":::" {Visibility::Unhide}184			/ "::" {Visibility::Hidden}185			/ ":" {Visibility::Normal}186		pub rule field(s: &ParserSettings) -> FieldMember187			= name:spanned(<field_name(s)>, s) _ plus:"+"? _ visibility:visibility() _ value:expr(s) {FieldMember{188				name,189				plus: plus.is_some(),190				params: None,191				visibility,192				value: Rc::new(value),193			}}194			/ name:spanned(<field_name(s)>, s) _ "(" _ params:params(s) _ ")" _ visibility:visibility() _ value:expr(s) {FieldMember{195				name,196				plus: false,197				params: Some(params),198				visibility,199				value: Rc::new(value),200			}}201		pub rule obj_local(s: &ParserSettings) -> BindSpec202			= keyword("local") _ bind:bind(s) {bind}203		pub rule member(s: &ParserSettings) -> Member204			= bind:obj_local(s) {Member::BindStmt(bind)}205			/ assertion:assertion(s) {Member::AssertStmt(assertion)}206			/ field:field(s) {Member::Field(field)}207		pub rule objinside(s: &ParserSettings) -> ObjBody208			=  members:(member(s) ** comma()) comma()? _ compspecs:compspecs(s)? {?209				Ok(if let Some(compspecs) = compspecs {210					let mut locals = Vec::new();211					let mut field = None;212					for member in members {213						match member {214							Member::Field(field_member) => if field.replace(field_member).is_some() {215								return Err("<object comprehension can only contain one field>")216							},217							Member::BindStmt(bind_spec) => locals.push(bind_spec),218							Member::AssertStmt(assert_stmt) => return Err("<asserts are unsupported in object comprehension>"),219						}220					}221					ObjBody::ObjComp(ObjComp {222						locals: Rc::new(locals),223						field: field.map(Rc::new).ok_or("<missing object comprehension field>")?,224						compspecs225					})226				} else {227					let mut locals = Vec::new();228					let mut asserts = Vec::new();229					let mut fields = Vec::new();230					for member in members {231						match member {232							Member::Field(field_member) => fields.push(field_member),233							Member::BindStmt(bind_spec) => locals.push(bind_spec),234							Member::AssertStmt(assert_stmt) => asserts.push(assert_stmt),235						}236					}237					ObjBody::MemberList(ObjMembers {238						locals: Rc::new(locals),239						asserts: Rc::new(asserts),240						fields241					})242				})243			}244		pub rule ifspec(s: &ParserSettings) -> IfSpecData245			= i:spanned(<keyword("if")>, s) _ cond:expr(s) {IfSpecData { span: i.span, cond }}246		pub rule forspec(s: &ParserSettings) -> ForSpecData247			= keyword("for") _ destruct:destruct(s) _ keyword("in") _ over:expr(s) { ForSpecData { destruct, over } }248		rule compspec(s: &ParserSettings) -> CompSpec249			= i:ifspec(s) { CompSpec::IfSpec(i) } / f:forspec(s) {CompSpec::ForSpec(f)}250		pub rule compspecs(s: &ParserSettings) -> Vec<CompSpec>251			= specs:compspec(s) ++ _ {?252				if !matches!(specs[0], CompSpec::ForSpec(_)) {253					return Err("<first compspec should be for>")254				}255				Ok(specs)256			}257		pub rule local_expr(s: &ParserSettings) -> Expr258			= keyword("local") _ binds:bind(s) ** comma() (_ ",")? _ ";" _ expr:expr(s) { Expr::LocalExpr(binds, Box::new(expr)) }259		pub rule string_expr(s: &ParserSettings) -> Expr260			= s:string() {Expr::Str(s.into())}261		pub rule obj_expr(s: &ParserSettings) -> Expr262			= "{" _ body:objinside(s) _ "}" {Expr::Obj(body)}263		pub rule array_expr(s: &ParserSettings) -> Expr264			= "[" _ elems:(expr(s) ** comma()) _ comma()? "]" {Expr::Arr(Rc::new(elems))}265		pub rule array_comp_expr(s: &ParserSettings) -> Expr266			= "[" _ expr:expr(s) _ comma()? _ specs:(r: compspecs(s) _ {r}) "]" {267				Expr::ArrComp(Rc::new(expr), specs)268			}269		pub rule number_expr(s: &ParserSettings) -> Expr270			= n:number() {? if n.is_finite() {271				Ok(Expr::Num(n))272			} else {273				Err("!!!numbers are finite")274			}}275276		rule spanned<T: Acyclic>(x: rule<T>, s: &ParserSettings) -> Spanned<T>277			= a:position!() n:x() b:position!() { Spanned::new(n, Span(s.source.clone(), a as u32, b as u32)) }278279		pub rule var_expr(s: &ParserSettings) -> Expr280			= n:spanned(<id()>, s) { Expr::Var(n) }281		pub rule id_loc(s: &ParserSettings) -> Spanned<Expr>282			= a:position!() n:id() b:position!() { Spanned::new(Expr::Str(n), Span(s.source.clone(), a as u32,b as u32)) }283		pub rule if_then_else_expr(s: &ParserSettings) -> Expr284			= cond:ifspec(s) _ keyword("then") _ cond_then:expr(s) cond_else:(_ keyword("else") _ e:expr(s) {e})? {Expr::IfElse(Box::new(IfElse{285				cond,286				cond_then,287				cond_else,288			}))}289290		pub rule literal(s: &ParserSettings) -> Expr291			= v:(292				keyword("null") {LiteralType::Null}293				/ keyword("true") {LiteralType::True}294				/ keyword("false") {LiteralType::False}295				/ keyword("self") {LiteralType::This}296				/ keyword("$") {LiteralType::Dollar}297				/ keyword("super") {LiteralType::Super}298			) {Expr::Literal(v)}299300		rule import_kind() -> ImportKind301			= keyword("importstr") { ImportKind::Str }302			/ keyword("importbin") { ImportKind::Bin }303			/ keyword("import") { ImportKind::Normal }304305		pub rule expr_basic(s: &ParserSettings) -> Expr306			= literal(s)307308			/ string_expr(s) / number_expr(s)309			/ array_expr(s)310			/ obj_expr(s)311			/ array_expr(s)312			/ array_comp_expr(s)313314			/ kind:spanned(<import_kind()>, s) _ path:expr(s) {Expr::Import(kind, Box::new(path))}315316			/ var_expr(s)317			/ local_expr(s)318			/ if_then_else_expr(s)319320			/ keyword("function") _ "(" _ params:params(s) _ ")" _ expr:expr(s) {Expr::Function(params, Rc::new(expr))}321			/ assert:assertion(s) _ ";" _ rest:expr(s) { Expr::AssertExpr(Rc::new(AssertExpr{322				assert, rest323			})) }324325			/ err_kw:spanned(<keyword("error")>, s) _ expr:expr(s) { Expr::ErrorStmt(err_kw.span, Box::new(expr)) }326327		rule slice_part(s: &ParserSettings) -> Option<Spanned<Expr>>328			= _ e:(e:spanned(<expr(s)>, s) _{e})? {e}329		pub rule slice_desc(s: &ParserSettings) -> SliceDesc330			= start:slice_part(s) ":" pair:(end:slice_part(s) step:(":" e:slice_part(s){e})? {(end, step.flatten())})? {331				let (end, step) = if let Some((end, step)) = pair {332					(end, step)333				}else{334					(None, None)335				};336337				SliceDesc { start, end, step }338			}339340		rule binop(x: rule<()>) -> ()341			= quiet!{ x() } / expected!("<binary op>")342		rule unaryop(x: rule<()>) -> ()343			= quiet!{ x() } / expected!("<unary op>")344345		rule ensure_null_coaelse()346			= "" {?347				#[cfg(not(feature = "exp-null-coaelse"))] return Err("!!!experimental null coaelscing was not enabled");348				#[cfg(feature = "exp-null-coaelse")] Ok(())349			}350		use jrsonnet_ir::BinaryOpType::*;351		use jrsonnet_ir::UnaryOpType::*;352		rule expr(s: &ParserSettings) -> Expr353			= precedence! {354				a:(@) _ binop(<"||">) _ b:@ {expr_bin!(a Or b)}355				a:(@) _ binop(<"??">) _ ensure_null_coaelse() b:@ {356					#[cfg(feature = "exp-null-coaelse")] return expr_bin!(a NullCoaelse b);357					unreachable!("ensure_null_coaelse will fail if feature is not enabled")358				}359				--360				a:(@) _ binop(<"&&">) _ b:@ {expr_bin!(a And b)}361				--362				a:(@) _ binop(<"|">) _ b:@ {expr_bin!(a BitOr b)}363				--364				a:@ _ binop(<"^">) _ b:(@) {expr_bin!(a BitXor b)}365				--366				a:(@) _ binop(<"&">) _ b:@ {expr_bin!(a BitAnd b)}367				--368				a:(@) _ binop(<"==">) _ b:@ {expr_bin!(a Eq b)}369				a:(@) _ binop(<"!=">) _ b:@ {expr_bin!(a Neq b)}370				--371				a:(@) _ binop(<"<">) _ b:@ {expr_bin!(a Lt b)}372				a:(@) _ binop(<">">) _ b:@ {expr_bin!(a Gt b)}373				a:(@) _ binop(<"<=">) _ b:@ {expr_bin!(a Lte b)}374				a:(@) _ binop(<">=">) _ b:@ {expr_bin!(a Gte b)}375				a:(@) _ binop(<keyword("in")>) _ b:@ {expr_bin!(a In b)}376				--377				a:(@) _ binop(<"<<">) _ b:@ {expr_bin!(a Lhs b)}378				a:(@) _ binop(<">>">) _ b:@ {expr_bin!(a Rhs b)}379				--380				a:(@) _ binop(<"+">) _ b:@ {expr_bin!(a Add b)}381				a:(@) _ binop(<"-">) _ b:@ {expr_bin!(a Sub b)}382				--383				a:(@) _ binop(<"*">) _ b:@ {expr_bin!(a Mul b)}384				a:(@) _ binop(<"/">) _ b:@ {expr_bin!(a Div b)}385				a:(@) _ binop(<"%">) _ b:@ {expr_bin!(a Mod b)}386				--387						unaryop(<"+">) _ b:@ {expr_un!(Plus b)}388						unaryop(<"-">) _ b:@ {expr_un!(Minus b)}389						unaryop(<"!">) _ b:@ {expr_un!(Not b)}390						unaryop(<"~">) _ b:@ {expr_un!(BitNot b)}391				--392				value:(@) _ "[" _ slice:slice_desc(s) _ "]" {Expr::Slice(Box::new(Slice{value, slice}))}393				indexable:(@) _ parts:index_part(s)+ {Expr::Index{indexable: Box::new(indexable), parts}}394				a:(@) _ args:spanned(<"(" _ a:args(s) _ ")" {a}>, s) ts:(_ keyword("tailstrict"))? {Expr::Apply(Box::new(a), args, ts.is_some())}395				a:(@) _ "{" _ body:objinside(s) _ "}" {Expr::ObjExtend(Rc::new(a), body)}396				--397				e:expr_basic(s) {e}398				"(" _ e:expr(s) _ ")" {e}399			}400		pub rule index_part(s: &ParserSettings) -> IndexPart401		= n:("?" _ ensure_null_coaelse())? "." _ value:id_loc(s) {IndexPart {402			span: value.span,403			value: value.value,404			#[cfg(feature = "exp-null-coaelse")]405			null_coaelse: n.is_some(),406		}}407		/ n:("?" _ "." _ ensure_null_coaelse())? value:spanned(<"[" _ v:expr(s) _ "]" {v}>, s) {IndexPart {408			span: value.span,409			value: value.value,410			#[cfg(feature = "exp-null-coaelse")]411			null_coaelse: n.is_some(),412		}}413414		pub rule jsonnet(s: &ParserSettings) -> Expr = _ e:expr(s) _ {e}415	}416}417418pub type ParseError = peg::error::ParseError<peg::str::LineCol>;419pub fn parse(str: &str, settings: &ParserSettings) -> Result<Expr, ParseError> {420	jsonnet_parser::jsonnet(str, settings)421}422/// Used for importstr values423pub fn string_to_expr(str: IStr, settings: &ParserSettings) -> Spanned<Expr> {424	let len = str.len();425	Spanned::new(Expr::Str(str), Span(settings.source.clone(), 0, len as u32))426}427428#[cfg(test)]429mod tests {430	use std::fs;431432	use insta::{assert_snapshot, glob};433	use jrsonnet_ir::{IStr, Source};434435	use crate::{ParserSettings, parse};436437	#[test]438	fn snapshots() {439		glob!("tests/*.jsonnet", |path| {440			let input = fs::read_to_string(path).expect("read test file");441			let v = parse(442				&input,443				&ParserSettings {444					source: Source::new_virtual("<test>".into(), IStr::empty()),445				},446			)447			.unwrap();448			let v = format!("{v:#?}");449			assert_snapshot!(v);450		});451	}452}
modifiedcrates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@array_comp.jsonnet.snapdiffbeforeafterboth
--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@array_comp.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@array_comp.jsonnet.snap
@@ -26,7 +26,8 @@
                             "x" from virtual:<test>:16-17,
                         ),
                     ],
-                    named: [],
+                    names: [],
+                    values: [],
                 } from virtual:<test>:15-18,
                 false,
             ),
modifiedcrates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@reserved.jsonnet.snapdiffbeforeafterboth
--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@reserved.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@reserved.jsonnet.snap
@@ -24,7 +24,8 @@
                         "null_fields" from virtual:<test>:20-31,
                     ),
                 ],
-                named: [],
+                names: [],
+                values: [],
             } from virtual:<test>:16-32,
             false,
         ),
modifiedcrates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@suffix.jsonnet.snapdiffbeforeafterboth
--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@suffix.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@suffix.jsonnet.snap
@@ -28,7 +28,8 @@
                         2.0,
                     ),
                 ],
-                named: [],
+                names: [],
+                values: [],
             } from virtual:<test>:15-18,
             false,
         ),
@@ -52,7 +53,8 @@
                         2.0,
                     ),
                 ],
-                named: [],
+                names: [],
+                values: [],
             } from virtual:<test>:28-31,
             false,
         ),
modifiedcrates/jrsonnet-stdlib/src/keyf.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/keyf.rs
+++ b/crates/jrsonnet-stdlib/src/keyf.rs
@@ -1,14 +1,16 @@
 use jrsonnet_evaluator::{
 	Error, Result, Thunk, Val,
-	function::{CallLocation, FuncVal, PreparedFuncVal},
+	function::{FuncVal, NativeFn},
 	typed::{ComplexValType, FromUntyped, Typed, ValType},
 };
 
+type PreparedKeyF = NativeFn!((Thunk<Val>) -> Val);
+
 #[derive(Default, Clone)]
 pub enum KeyF {
 	#[default]
 	Identity,
-	Prepared(PreparedFuncVal),
+	Prepared(PreparedKeyF),
 	PrepareFailure(Error),
 }
 impl KeyF {
@@ -19,13 +21,13 @@
 		if val.is_identity() {
 			Self::Identity
 		} else {
-			PreparedFuncVal::new(val, 1, &[]).map_or_else(Self::PrepareFailure, Self::Prepared)
+			PreparedKeyF::try_from(val).map_or_else(Self::PrepareFailure, Self::Prepared)
 		}
 	}
 	pub fn eval(&self, val: impl Into<Thunk<Val>>) -> Result<Val> {
 		match self {
 			KeyF::Identity => val.into().evaluate(),
-			KeyF::Prepared(p) => p.call(CallLocation::native(), &[val.into()], &[]),
+			KeyF::Prepared(p) => p.call(val.into()),
 			KeyF::PrepareFailure(e) => Err(e.clone()),
 		}
 	}