git.delta.rocks / jrsonnet / refs/commits / 4a793257644c

--- a/crates/jrsonnet-evaluator/src/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/manifest.rs
@@ -413,18 +413,19 @@
 				val.value_type()
 			)
 		};
-		if !arr.is_empty() {
-			for (i, v) in arr.iter().enumerate() {
-				let v = v.with_description(|| format!("elem <{i}> evaluation"))?;
-				out.push_str("---\n");
-				in_description_frame(
-					|| format!("elem <{i}> manifestification"),
-					|| self.inner.manifest_buf(v, out),
-				)?;
+		for (i, v) in arr.iter().enumerate() {
+			if i != 0 {
 				out.push('\n');
 			}
+			let v = v.with_description(|| format!("elem <{i}> evaluation"))?;
+			out.push_str("---\n");
+			in_description_frame(
+				|| format!("elem <{i}> manifestification"),
+				|| self.inner.manifest_buf(v, out),
+			)?;
 		}
 		if self.c_document_end {
+			out.push('\n');
 			out.push_str("...");
 		}
 		if self.end_newline {

--- a/crates/jrsonnet-parser/src/lib.rs
+++ b/crates/jrsonnet-parser/src/lib.rs
@@ -237,7 +237,11 @@
 				Expr::ArrComp(expr, specs)
 			}
 		pub rule number_expr(s: &ParserSettings) -> Expr
-			= n:number() { expr::Expr::Num(n) }
+			= n:number() {? if n.is_finite() {
+				Ok(expr::Expr::Num(n))
+			} else {
+				Err("!!!numbers are finite")
+			}}
 		pub rule var_expr(s: &ParserSettings) -> Expr
 			= n:id() { expr::Expr::Var(n) }
 		pub rule id_loc(s: &ParserSettings) -> LocExpr

3use std::{3use std::{
4	cell::{Ref, RefCell, RefMut},4	cell::{Ref, RefCell, RefMut},
5	collections::HashMap,5	collections::HashMap,
6	f64,
6	rc::Rc,7	rc::Rc,
7};8};
89
14	error::{ErrorKind::*, Result},15	error::{ErrorKind::*, Result},
15	function::{CallLocation, FuncVal, TlaArg},16	function::{CallLocation, FuncVal, TlaArg},
16	trace::PathResolver,17	trace::PathResolver,
18	val::NumValue,
17	ContextBuilder, IStr, ObjValue, ObjValueBuilder, Thunk, Val,19	ContextBuilder, IStr, ObjValue, ObjValueBuilder, Thunk, Val,
18};20};
19use jrsonnet_gcmodule::{Acyclic, Cc, Trace};21use jrsonnet_gcmodule::{Acyclic, Cc, Trace};
63		("isObject", builtin_is_object::INST),65		("isObject", builtin_is_object::INST),
64		("isArray", builtin_is_array::INST),66		("isArray", builtin_is_array::INST),
65		("isFunction", builtin_is_function::INST),67		("isFunction", builtin_is_function::INST),
68		("isNull", builtin_is_null::INST),
66		// Arrays69		// Arrays
67		("makeArray", builtin_make_array::INST),70		("makeArray", builtin_make_array::INST),
68		("repeat", builtin_repeat::INST),71		("repeat", builtin_repeat::INST),
104		("floor", builtin_floor::INST),107		("floor", builtin_floor::INST),
105		("ceil", builtin_ceil::INST),108		("ceil", builtin_ceil::INST),
106		("log", builtin_log::INST),109		("log", builtin_log::INST),
110		("log2", builtin_log2::INST),
111		("log10", builtin_log10::INST),
107		("pow", builtin_pow::INST),112		("pow", builtin_pow::INST),
108		("sqrt", builtin_sqrt::INST),113		("sqrt", builtin_sqrt::INST),
109		("sin", builtin_sin::INST),114		("sin", builtin_sin::INST),
121		("isOdd", builtin_is_odd::INST),126		("isOdd", builtin_is_odd::INST),
122		("isInteger", builtin_is_integer::INST),127		("isInteger", builtin_is_integer::INST),
123		("isDecimal", builtin_is_decimal::INST),128		("isDecimal", builtin_is_decimal::INST),
129		("deg2rad", builtin_deg2rad::INST),
130		("rad2deg", builtin_rad2deg::INST),
131		("hypot", builtin_hypot::INST),
124		// Operator132		// Operator
125		("mod", builtin_mod::INST),133		("mod", builtin_mod::INST),
126		("primitiveEquals", builtin_primitive_equals::INST),134		("primitiveEquals", builtin_primitive_equals::INST),
201		("lstripChars", builtin_lstrip_chars::INST),209		("lstripChars", builtin_lstrip_chars::INST),
202		("rstripChars", builtin_rstrip_chars::INST),210		("rstripChars", builtin_rstrip_chars::INST),
203		("stripChars", builtin_strip_chars::INST),211		("stripChars", builtin_strip_chars::INST),
212		("trim", builtin_trim::INST),
204		// Misc213		// Misc
205		("length", builtin_length::INST),214		("length", builtin_length::INST),
206		("get", builtin_get::INST),215		("get", builtin_get::INST),
248	builder.method("trace", builtin_trace { settings });257	builder.method("trace", builtin_trace { settings });
249	builder.method("id", FuncVal::Id);258	builder.method("id", FuncVal::Id);
259
260	builder.field("pi").hide().value(Val::Num(
261		NumValue::new(f64::consts::PI).expect("pi is finite"),
262	));
250263
251	#[cfg(feature = "exp-regex")]264	#[cfg(feature = "exp-regex")]
252	{265	{

--- a/crates/jrsonnet-stdlib/src/math.rs
+++ b/crates/jrsonnet-stdlib/src/math.rs
@@ -1,3 +1,5 @@
+use std::f64;
+
 use jrsonnet_evaluator::{function::builtin, typed::PositiveF64};
 
 #[builtin]
@@ -56,6 +58,16 @@
 }
 
 #[builtin]
+pub fn builtin_log2(x: f64) -> f64 {
+	x.log2()
+}
+
+#[builtin]
+pub fn builtin_log10(x: f64) -> f64 {
+	x.log10()
+}
+
+#[builtin]
 pub fn builtin_pow(x: f64, n: f64) -> f64 {
 	x.powf(n)
 }
@@ -153,3 +165,18 @@
 pub fn builtin_is_decimal(x: f64) -> bool {
 	builtin_round(x) != x
 }
+
+#[builtin]
+pub fn builtin_deg2rad(x: f64) -> f64 {
+	x * f64::consts::PI / 180.0
+}
+
+#[builtin]
+pub fn builtin_rad2deg(x: f64) -> f64 {
+	x * 180.0 / f64::consts::PI
+}
+
+#[builtin]
+pub fn builtin_hypot(x: f64, y: f64) -> f64 {
+	x.hypot(y)
+}

--- a/crates/jrsonnet-stdlib/src/misc.rs
+++ b/crates/jrsonnet-stdlib/src/misc.rs
@@ -156,8 +156,16 @@
 		#[cfg(feature = "exp-preserve-order")]
 		true,
 	);
-	let a = a.manifest(&format).description("<a> manifestification")?;
-	let b = b.manifest(&format).description("<b> manifestification")?;
+	let a = if let Some(a) = a.as_str() {
+		format!("<A>\n{a}\n</A>")
+	} else {
+		a.manifest(&format).description("<a> manifestification")?
+	};
+	let b = if let Some(b) = b.as_str() {
+		format!("<B>\n{b}\n</B>")
+	} else {
+		b.manifest(&format).description("<b> manifestification")?
+	};
 	bail!("assertion failed: A != B\nA: {a}\nB: {b}")
 }
 
@@ -166,9 +174,7 @@
 	let Some(patch) = patch.as_obj() else {
 		return Ok(patch);
 	};
-	let Some(target) = target.as_obj() else {
-		return Ok(Val::Obj(patch));
-	};
+	let target = target.as_obj().unwrap_or_else(|| ObjValue::new_empty());
 	let target_fields = target
 		.fields(
 			// FIXME: Makes no sense to preserve order for BTreeSet, it would be better to use IndexSet here?
@@ -203,10 +209,7 @@
 		if matches!(field_patch, Val::Null) {
 			continue;
 		}
-		let Some(field_target) = target.get(field.clone())? else {
-			out.field(field.clone()).value(field_patch);
-			continue;
-		};
+		let field_target = target.get(field.clone())?.unwrap_or(Val::Null);
 		out.field(field.clone())
 			.value(builtin_merge_patch(field_target, field_patch)?);
 	}

--- a/crates/jrsonnet-stdlib/src/objects.rs
+++ b/crates/jrsonnet-stdlib/src/objects.rs
@@ -1,7 +1,8 @@
 use jrsonnet_evaluator::{
 	function::builtin,
+	rustc_hash::FxHashSet,
 	val::{ArrValue, Val},
-	IStr, ObjValue, ObjValueBuilder,
+	IStr, MaybeUnbound, ObjValue, ObjValueBuilder, Thunk,
 };
 
 #[builtin]
@@ -166,14 +167,31 @@
 	preserve_order: bool,
 ) -> ObjValue {
 	let mut new_obj = ObjValueBuilder::with_capacity(obj.len() - 1);
-	for (k, v) in obj.iter(
+	let all_fields = obj.fields_ex(
+		true,
 		#[cfg(feature = "exp-preserve-order")]
 		preserve_order,
-	) {
-		if k == key {
+	);
+	let visible_fields = obj
+		.fields_ex(
+			false,
+			#[cfg(feature = "exp-preserve-order")]
+			preserve_order,
+		)
+		.into_iter()
+		.collect::<FxHashSet<_>>();
+
+	for field in &all_fields {
+		if *field == key {
 			continue;
 		}
-		new_obj.field(k).value(v.unwrap());
+		let mut b = new_obj.field(field.clone());
+		if !visible_fields.contains(&field) {
+			b = b.hide();
+		}
+		let _ = b.binding(MaybeUnbound::Bound(Thunk::result(
+			obj.get(field.clone()).transpose().expect("field exists"),
+		)));
 	}
 
 	new_obj.build()

--- a/crates/jrsonnet-stdlib/src/strings.rs
+++ b/crates/jrsonnet-stdlib/src/strings.rs
@@ -254,6 +254,19 @@
 	Ok(str.as_str().trim_matches(pattern).into())
 }
 
+#[builtin]
+pub fn builtin_trim(str: IStr) -> String {
+	let filter =
+		|v: char| {
+			v == ' '
+				|| v == '\t' || v == '\n'
+				|| v == '\u{000c}'
+				|| v == '\r' || v == '\u{0085}'
+				|| v == '\u{00a0}'
+		};
+	str.as_str().trim_matches(filter).to_string()
+}
+
 fn new_trim_pattern(chars: IndexableVal) -> Result<impl Fn(char) -> bool> {
 	let chars: BTreeSet<char> = match chars {
 		IndexableVal::Str(chars) => chars.chars().collect(),

--- a/crates/jrsonnet-stdlib/src/types.rs
+++ b/crates/jrsonnet-stdlib/src/types.rs
@@ -29,3 +29,7 @@
 pub fn builtin_is_function(v: Val) -> bool {
 	matches!(v, Val::Func(_))
 }
+#[builtin]
+pub fn builtin_is_null(v: Val) -> bool {
+	matches!(v, Val::Null)
+}