git.delta.rocks / jrsonnet / refs/commits / 7af406eaa740

difftreelog

feat return NumValue directly from parser

rlsuqplzYaroslav Bolyukin2026-04-25parent: #eee6c62.patch.diff
in: master

15 files changed

modifiedbindings/jsonnet/src/val_make.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/val_make.rs
+++ b/bindings/jsonnet/src/val_make.rs
@@ -5,10 +5,7 @@
 	os::raw::{c_char, c_double, c_int},
 };
 
-use jrsonnet_evaluator::{
-	ObjValue, Val,
-	val::{ArrValue, NumValue},
-};
+use jrsonnet_evaluator::{NumValue, ObjValue, Val};
 
 use crate::VM;
 
modifiedcrates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -2,7 +2,9 @@
 
 use jrsonnet_gcmodule::{Acyclic, Trace};
 use jrsonnet_interner::IStr;
-use jrsonnet_ir::{BinaryOpType, Source, SourcePath, Span, Spanned, UnaryOpType};
+use jrsonnet_ir::{
+	BinaryOpType, ConvertNumValueError, Source, SourcePath, Span, Spanned, UnaryOpType,
+};
 use jrsonnet_types::ValType;
 use thiserror::Error;
 
@@ -11,7 +13,6 @@
 	function::{CallLocation, FunctionSignature, ParamName},
 	stdlib::format::FormatError,
 	typed::TypeLocError,
-	val::ConvertNumValueError,
 };
 
 #[derive(Debug, Clone)]
@@ -228,6 +229,11 @@
 		Self::new(e)
 	}
 }
+impl From<ConvertNumValueError> for Error {
+	fn from(e: ConvertNumValueError) -> Self {
+		Self::new(ErrorKind::ConvertNumValue(e))
+	}
+}
 
 impl From<Infallible> for Error {
 	fn from(_value: Infallible) -> Self {
modifiedcrates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -21,7 +21,7 @@
 	function::{CallLocation, FuncDesc, FuncVal, PreparedFuncVal},
 	in_frame,
 	typed::{FromUntyped, IntoUntyped as _, Typed},
-	val::{CachedUnbound, IndexableVal, NumValue, StrValue, Thunk},
+	val::{CachedUnbound, IndexableVal, StrValue, Thunk},
 	with_state,
 };
 pub mod destructure;
@@ -58,9 +58,7 @@
 	}
 	Some(match expr {
 		Expr::Str(s) => Val::string(s.clone()),
-		Expr::Num(n) => {
-			Val::Num(NumValue::new(*n).expect("parser will not allow non-finite values"))
-		}
+		Expr::Num(n) => Val::Num(*n),
 		Expr::Literal(LiteralType::False) => Val::Bool(false),
 		Expr::Literal(LiteralType::True) => Val::Bool(true),
 		Expr::Literal(LiteralType::Null) => Val::Null,
modifiedcrates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/integrations/serde.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/serde.rs
@@ -1,6 +1,7 @@
 use std::borrow::Cow;
 
 use jrsonnet_interner::{IBytes, IStr};
+use jrsonnet_ir::NumValue;
 use serde::{
 	Deserialize, Serialize, Serializer,
 	de::{self, Visitor},
@@ -12,7 +13,6 @@
 
 use crate::{
 	Error as JrError, ObjValue, ObjValueBuilder, Result, Val, in_description_frame, runtime_error,
-	val::NumValue,
 };
 
 impl<'de> Deserialize<'de> for Val {
modifiedcrates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -42,6 +42,7 @@
 use jrsonnet_gcmodule::{Cc, Trace, cc_dyn};
 pub use jrsonnet_interner::{IBytes, IStr};
 pub use jrsonnet_ir as parser;
+pub use jrsonnet_ir::NumValue;
 use jrsonnet_ir::{Expr, Source, SourcePath};
 #[doc(hidden)]
 pub use jrsonnet_macros;
modifiedcrates/jrsonnet-evaluator/src/stdlib/format.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/stdlib/format.rs
+++ b/crates/jrsonnet-evaluator/src/stdlib/format.rs
@@ -829,7 +829,7 @@
 #[cfg(test)]
 pub mod test_format {
 	use super::*;
-	use crate::val::NumValue;
+	use crate::NumValue;
 
 	#[test]
 	fn parse() {
modifiedcrates/jrsonnet-evaluator/src/typed/conversions.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/typed/conversions.rs
+++ b/crates/jrsonnet-evaluator/src/typed/conversions.rs
@@ -2,6 +2,8 @@
 
 use jrsonnet_gcmodule::Trace;
 use jrsonnet_interner::{IBytes, IStr};
+use jrsonnet_ir::NumValue;
+pub use jrsonnet_ir::{MAX_SAFE_INTEGER, MIN_SAFE_INTEGER};
 use jrsonnet_types::{ComplexValType, ValType};
 
 use crate::{
@@ -10,7 +12,7 @@
 	bail,
 	function::FuncVal,
 	typed::CheckType,
-	val::{IndexableVal, NumValue, StrValue, ThunkMapper},
+	val::{IndexableVal, StrValue, ThunkMapper},
 };
 
 #[doc(hidden)]
@@ -219,11 +221,6 @@
 		Ok(inner.map(<ThunkFromUntyped<T>>::default()))
 	}
 }
-
-#[expect(clippy::cast_precision_loss, reason = "checked to not overflow")]
-pub const MAX_SAFE_INTEGER: f64 = ((1u64 << (f64::MANTISSA_DIGITS)) - 1) as f64;
-#[expect(clippy::cast_precision_loss, reason = "checked to not overflow")]
-pub const MIN_SAFE_INTEGER: f64 = (-((1i64 << (f64::MANTISSA_DIGITS)) - 1)) as f64;
 
 macro_rules! impl_int {
 	($($ty:ty)*) => {$(
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -5,7 +5,6 @@
 	marker::PhantomData,
 	mem::replace,
 	num::NonZeroU32,
-	ops::Deref,
 	rc::Rc,
 };
 
@@ -14,16 +13,15 @@
 pub use jrsonnet_macros::Thunk;
 use jrsonnet_types::ValType;
 use rustc_hash::FxHashMap;
-use thiserror::Error;
 
 pub use crate::arr::{ArrValue, ArrayLike};
 use crate::{
-	ObjValue, Result, SupThis, Unbound, WeakSupThis, bail,
+	NumValue, ObjValue, Result, SupThis, Unbound, WeakSupThis, bail,
 	error::{Error, ErrorKind::*},
 	function::FuncVal,
 	gc::WithCapacityExt as _,
 	manifest::{ManifestFormat, ToStringFormat},
-	typed::{BoundedUsize, MAX_SAFE_INTEGER, MIN_SAFE_INTEGER},
+	typed::BoundedUsize,
 };
 
 pub trait ThunkValue: Trace {
@@ -439,134 +437,6 @@
 		let a = self.clone().into_flat();
 		let b = other.clone().into_flat();
 		a.cmp(&b)
-	}
-}
-
-/// Represents jsonnet number
-/// Jsonnet numbers are finite f64, with NaNs disallowed
-#[derive(Trace, Clone, Copy)]
-#[repr(transparent)]
-pub struct NumValue(f64);
-impl NumValue {
-	/// Creates a [`NumValue`], if value is finite and not NaN
-	pub fn new(v: f64) -> Option<Self> {
-		if !v.is_finite() {
-			return None;
-		}
-		Some(Self(v))
-	}
-	#[inline]
-	pub const fn get(&self) -> f64 {
-		self.0
-	}
-	pub(crate) fn truncate_for_bitwise(self) -> Result<i64> {
-		if self.0 < MIN_SAFE_INTEGER || self.0 > MAX_SAFE_INTEGER {
-			bail!("numberic value outside of safe integer range for bitwise operation");
-		}
-		#[expect(clippy::cast_possible_truncation, reason = "intended")]
-		Ok(self.0 as i64)
-	}
-}
-impl PartialEq for NumValue {
-	fn eq(&self, other: &Self) -> bool {
-		self.0 == other.0
-	}
-}
-impl Eq for NumValue {}
-impl Ord for NumValue {
-	#[inline]
-	fn cmp(&self, other: &Self) -> Ordering {
-		// Can't use `total_cmp`: its behavior for `-0` and `0`
-		// is not following wanted.
-		unsafe { self.0.partial_cmp(&other.0).unwrap_unchecked() }
-	}
-}
-impl PartialOrd for NumValue {
-	#[inline]
-	fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-		Some(self.cmp(other))
-	}
-}
-impl Debug for NumValue {
-	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-		Debug::fmt(&self.0, f)
-	}
-}
-impl Display for NumValue {
-	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-		Display::fmt(&self.0, f)
-	}
-}
-impl Deref for NumValue {
-	type Target = f64;
-
-	#[inline]
-	fn deref(&self) -> &Self::Target {
-		&self.0
-	}
-}
-macro_rules! impl_num {
-	($($ty:ty),+) => {$(
-		impl From<$ty> for NumValue {
-			#[inline]
-			fn from(value: $ty) -> Self {
-				Self(value.into())
-			}
-		}
-	)+};
-}
-impl_num!(i8, u8, i16, u16, i32, u32);
-
-#[derive(Clone, Copy, Debug, Error, Trace)]
-pub enum ConvertNumValueError {
-	#[error("overflow")]
-	Overflow,
-	#[error("underflow")]
-	Underflow,
-	#[error("non-finite")]
-	NonFinite,
-}
-impl From<ConvertNumValueError> for Error {
-	fn from(e: ConvertNumValueError) -> Self {
-		Self::new(e.into())
-	}
-}
-
-macro_rules! impl_try_num {
-	($($ty:ty),+) => {$(
-		impl TryFrom<$ty> for NumValue {
-			type Error = ConvertNumValueError;
-			#[inline]
-			fn try_from(value: $ty) -> Result<Self, ConvertNumValueError> {
-				#[expect(clippy::cast_precision_loss, reason = "precision loss is explicitly handled")]
-				let value = value as f64;
-				if value < MIN_SAFE_INTEGER {
-					return Err(ConvertNumValueError::Underflow)
-				} else if value > MAX_SAFE_INTEGER {
-					return Err(ConvertNumValueError::Overflow)
-				}
-				// Number is finite.
-				Ok(Self(value))
-			}
-		}
-	)+};
-}
-impl_try_num!(usize, isize, i64, u64);
-
-impl TryFrom<f64> for NumValue {
-	type Error = ConvertNumValueError;
-
-	#[inline]
-	fn try_from(value: f64) -> Result<Self, Self::Error> {
-		Self::new(value).ok_or(ConvertNumValueError::NonFinite)
-	}
-}
-impl TryFrom<f32> for NumValue {
-	type Error = ConvertNumValueError;
-
-	#[inline]
-	fn try_from(value: f32) -> Result<Self, Self::Error> {
-		Self::new(f64::from(value)).ok_or(ConvertNumValueError::NonFinite)
 	}
 }
 
modifiedcrates/jrsonnet-ir-parser/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-ir-parser/src/lib.rs
+++ b/crates/jrsonnet-ir-parser/src/lib.rs
@@ -4,8 +4,8 @@
 use jrsonnet_ir::{
 	ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BinaryOpType, BindSpec, CompSpec, Destruct, Expr,
 	ExprParam, ExprParams, FieldMember, FieldName, ForSpecData, IStr, IfElse, IfSpecData,
-	ImportKind, IndexPart, LiteralType, Member, ObjBody, ObjComp, ObjMembers, Slice, SliceDesc,
-	Source, Span, Spanned, UnaryOpType, Visibility, unescape,
+	ImportKind, IndexPart, LiteralType, Member, NumValue, ObjBody, ObjComp, ObjMembers, Slice,
+	SliceDesc, Source, Span, Spanned, UnaryOpType, Visibility, unescape,
 };
 use jrsonnet_lexer::{Lexeme, Lexer, Span as LexSpan, SyntaxKind, T, collect_lexed_str_block};
 
@@ -202,17 +202,21 @@
 	)
 }
 
-fn parse_number(p: &mut Parser<'_>) -> Result<f64> {
+fn parse_number(p: &mut Parser<'_>) -> Result<NumValue> {
 	let text = p.text();
 	let n: f64 = text
 		.replace('_', "")
 		.parse()
 		.map_err(|_| p.error(format!("invalid number literal: {text}")))?;
-	if !n.is_finite() {
-		return Err(p.error("numbers are finite".into()));
-	}
+
+	let v = match NumValue::try_from(n) {
+		Ok(v) => v,
+		Err(e) => return Err(p.error(format!("invalid number value: {e}"))),
+	};
+
 	p.eat_any();
-	Ok(n)
+
+	Ok(v)
 }
 
 fn ident(p: &mut Parser<'_>) -> Result<IStr> {
modifiedcrates/jrsonnet-ir/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-ir/Cargo.toml
+++ b/crates/jrsonnet-ir/Cargo.toml
@@ -19,6 +19,7 @@
 static_assertions.workspace = true
 
 peg.workspace = true
+thiserror.workspace = true
 
 [dev-dependencies]
 insta.workspace = true
modifiedcrates/jrsonnet-ir/src/expr.rsdiffbeforeafterboth
--- a/crates/jrsonnet-ir/src/expr.rs
+++ b/crates/jrsonnet-ir/src/expr.rs
@@ -8,6 +8,7 @@
 use jrsonnet_interner::IStr;
 
 use crate::{
+	NumValue,
 	function::{FunctionSignature, ParamDefault, ParamName, ParamParse},
 	source::Source,
 };
@@ -398,7 +399,7 @@
 	/// String value: "hello"
 	Str(IStr),
 	/// Number: 1, 2.0, 2e+20
-	Num(f64),
+	Num(NumValue),
 	/// Variable name: test
 	Var(Spanned<IStr>),
 
modifiedcrates/jrsonnet-ir/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-ir/src/lib.rs
+++ b/crates/jrsonnet-ir/src/lib.rs
@@ -1,7 +1,10 @@
 #![allow(clippy::redundant_closure_call, clippy::derive_partial_eq_without_eq)]
 
 mod expr;
+use std::{cmp::Ordering, fmt, ops::Deref};
+
 pub use expr::*;
+use jrsonnet_gcmodule::Acyclic;
 pub use jrsonnet_interner::IStr;
 pub mod function;
 mod location;
@@ -14,3 +17,134 @@
 	Source, SourceDefaultIgnoreJpath, SourceDirectory, SourceFifo, SourceFile, SourcePath,
 	SourcePathT, SourceVirtual,
 };
+
+// It seels to be a wrong place for this kind of stuff, but as it would also be used for static analysis and
+// is already wanted for NumValue, I don't know a better place.
+#[expect(clippy::cast_precision_loss, reason = "checked to not overflow")]
+pub const MAX_SAFE_INTEGER: f64 = ((1u64 << (f64::MANTISSA_DIGITS)) - 1) as f64;
+#[expect(clippy::cast_precision_loss, reason = "checked to not overflow")]
+pub const MIN_SAFE_INTEGER: f64 = (-((1i64 << (f64::MANTISSA_DIGITS)) - 1)) as f64;
+
+/// Represents jsonnet number
+/// Jsonnet numbers are finite f64, with NaNs disallowed
+#[derive(Acyclic, Clone, Copy)]
+pub struct NumValue(f64);
+impl NumValue {
+	/// Creates a [`NumValue`], if value is finite and not NaN
+	pub fn new(v: f64) -> Option<Self> {
+		if !v.is_finite() {
+			return None;
+		}
+		Some(Self(v))
+	}
+	#[inline]
+	pub const fn get(&self) -> f64 {
+		self.0
+	}
+	pub fn truncate_for_bitwise(self) -> Result<i64, ConvertNumValueError> {
+		if self.0 < MIN_SAFE_INTEGER || self.0 > MAX_SAFE_INTEGER {
+			return Err(ConvertNumValueError::BitwiseSafeRange);
+		}
+		#[expect(clippy::cast_possible_truncation, reason = "intended")]
+		Ok(self.0 as i64)
+	}
+}
+impl PartialEq for NumValue {
+	fn eq(&self, other: &Self) -> bool {
+		self.0 == other.0
+	}
+}
+impl Eq for NumValue {}
+impl Ord for NumValue {
+	#[inline]
+	fn cmp(&self, other: &Self) -> Ordering {
+		// Can't use `total_cmp`: its behavior for `-0` and `0`
+		// is not following wanted.
+		unsafe { self.0.partial_cmp(&other.0).unwrap_unchecked() }
+	}
+}
+impl PartialOrd for NumValue {
+	#[inline]
+	fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+		Some(self.cmp(other))
+	}
+}
+impl fmt::Debug for NumValue {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		fmt::Debug::fmt(&self.0, f)
+	}
+}
+impl fmt::Display for NumValue {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		fmt::Display::fmt(&self.0, f)
+	}
+}
+impl Deref for NumValue {
+	type Target = f64;
+
+	#[inline]
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+macro_rules! impl_num {
+	($($ty:ty),+) => {$(
+		impl From<$ty> for NumValue {
+			#[inline]
+			fn from(value: $ty) -> Self {
+				Self(value.into())
+			}
+		}
+	)+};
+}
+impl_num!(i8, u8, i16, u16, i32, u32);
+
+#[derive(Clone, Copy, Debug, thiserror::Error, Acyclic)]
+pub enum ConvertNumValueError {
+	#[error("overflow")]
+	Overflow,
+	#[error("underflow")]
+	Underflow,
+	#[error("non-finite")]
+	NonFinite,
+	#[error("float out of safe int range")]
+	BitwiseSafeRange,
+}
+
+macro_rules! impl_try_num {
+	($($ty:ty),+) => {$(
+		impl TryFrom<$ty> for NumValue {
+			type Error = ConvertNumValueError;
+			#[inline]
+			fn try_from(value: $ty) -> Result<Self, ConvertNumValueError> {
+				#[expect(clippy::cast_precision_loss, reason = "precision loss is explicitly handled")]
+				let value = value as f64;
+				if value < MIN_SAFE_INTEGER {
+					return Err(ConvertNumValueError::Underflow)
+				} else if value > MAX_SAFE_INTEGER {
+					return Err(ConvertNumValueError::Overflow)
+				}
+				// Number is finite.
+				Ok(Self(value))
+			}
+		}
+	)+};
+}
+impl_try_num!(usize, isize, i64, u64);
+
+impl TryFrom<f64> for NumValue {
+	type Error = ConvertNumValueError;
+
+	#[inline]
+	fn try_from(value: f64) -> Result<Self, Self::Error> {
+		Self::new(value).ok_or(ConvertNumValueError::NonFinite)
+	}
+}
+impl TryFrom<f32> for NumValue {
+	type Error = ConvertNumValueError;
+
+	#[inline]
+	fn try_from(value: f32) -> Result<Self, Self::Error> {
+		Self::new(f64::from(value)).ok_or(ConvertNumValueError::NonFinite)
+	}
+}
modifiedcrates/jrsonnet-peg-parser/src/lib.rsdiffbeforeafterboth
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, NumValue, ObjBody, ObjComp, ObjMembers, Slice,8	SliceDesc, 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") _ assertion:spanned(<expr(s)>, s) message:(_ ":" _ e:expr(s) {e})? { AssertStmt{assertion, message} }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 let Some(n) = NumValue::new(n) {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-stdlib/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -12,13 +12,12 @@
 pub use encoding::*;
 pub use hash::*;
 use jrsonnet_evaluator::{
-	ContextBuilder, IStr, ObjValue, ObjValueBuilder, Thunk, Val,
+	ContextBuilder, IStr, NumValue, ObjValue, ObjValueBuilder, Thunk, Val,
 	error::Result,
 	function::{CallLocation, FuncVal, builtin_id},
 	tla::TlaArg,
 	trace::PathResolver,
 	typed::SerializeTypedObj as _,
-	val::NumValue,
 };
 use jrsonnet_gcmodule::{Acyclic, Cc, Trace};
 use jrsonnet_ir::Source;
modifiedcrates/jrsonnet-stdlib/src/operator.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/operator.rs
+++ b/crates/jrsonnet-stdlib/src/operator.rs
@@ -2,12 +2,12 @@
 //! However, in our case we instead implement them in native, and implement native functions on top of core for backwards compatibility
 
 use jrsonnet_evaluator::{
-	IStr, Result, Val,
+	IStr, NumValue, Result, Val,
 	function::builtin,
 	operator::evaluate_mod_op,
 	stdlib::std_format,
 	typed::{Either, Either2},
-	val::{NumValue, equals, primitive_equals},
+	val::{equals, primitive_equals},
 };
 
 #[builtin]