git.delta.rocks / jrsonnet / refs/commits / 407517ff4770

difftreelog

refactor rewrite builtins to new type system

Yaroslav Bolyukin2020-12-01parent: #028057c.patch.diff
in: master

8 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -169,6 +169,7 @@
  "indexmap",
  "jrsonnet-parser",
  "jrsonnet-stdlib",
+ "jrsonnet-types",
  "md5",
  "pathdiff",
  "rustc-hash",
@@ -195,6 +196,10 @@
 version = "0.3.3"
 
 [[package]]
+name = "jrsonnet-types"
+version = "0.3.2"
+
+[[package]]
 name = "jsonnet"
 version = "0.3.3"
 dependencies = [
modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,8 +4,9 @@
 	"crates/jrsonnet-evaluator",
 	"crates/jrsonnet-stdlib",
 	"crates/jrsonnet-cli",
+	"crates/jrsonnet-types",
 	"bindings/jsonnet",
-	"cmds/jrsonnet"
+	"cmds/jrsonnet",
 ]
 
 [profile.test]
modifiedcrates/jrsonnet-evaluator/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/Cargo.toml
+++ b/crates/jrsonnet-evaluator/Cargo.toml
@@ -26,6 +26,7 @@
 [dependencies]
 jrsonnet-parser = { path = "../jrsonnet-parser", version = "0.3.3" }
 jrsonnet-stdlib = { path = "../jrsonnet-stdlib", version = "0.3.3" }
+jrsonnet-types = { path = "../jrsonnet-types", version = "0.3.3" }
 pathdiff = "0.2.0"
 
 closure = "0.3.0"
modifiedcrates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -1,17 +1,20 @@
 use crate::{
 	equals,
 	error::{Error::*, Result},
-	evaluate, parse_args, primitive_equals, push, throw, with_state, Context, FuncVal, Val,
-	ValType,
+	evaluate, parse_args, primitive_equals, push, throw,
+	typed::CheckType,
+	with_state, ArrValue, Context, FuncVal, LazyVal, Val,
 };
 use format::{format_arr, format_obj};
-use jrsonnet_parser::{ArgsDesc, ExprLocation};
-use manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};
-use std::{path::PathBuf, rc::Rc};
+use jrsonnet_parser::{ArgsDesc, BinaryOpType, ExprLocation};
+use jrsonnet_types::{ty, ComplexValType, ValType};
+use std::{collections::HashMap, path::PathBuf, rc::Rc};
 
 pub mod stdlib;
 pub use stdlib::*;
 
+use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};
+
 pub mod format;
 pub mod manifest;
 pub mod sort;
@@ -22,7 +25,7 @@
 		|| format!("std.format of {}", str),
 		|| {
 			Ok(match vals {
-				Val::Arr(vals) => Val::Str(format_arr(&str, &vals)?.into()),
+				Val::Arr(vals) => Val::Str(format_arr(&str, &vals.evaluated()?)?.into()),
 				Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),
 				o => Val::Str(format_arr(&str, &[o])?.into()),
 			})
@@ -30,6 +33,32 @@
 	)
 }
 
+thread_local! {
+	pub static INTRINSICS: HashMap<&'static str, fn(Context, &Option<ExprLocation>, &ArgsDesc) -> Result<Val>> = {
+		let mut out: HashMap<&'static str, _> = HashMap::new();
+		out.insert("length", intrinsic_length);
+		out
+	};
+}
+
+fn intrinsic_length(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+	Ok(parse_args!(context, "length", args, 1, [
+		0, x: ty!((str | obj | [any]));
+	], {
+		Ok(match x {
+			Val::Str(n) => Val::Num(n.chars().count() as f64),
+			Val::Arr(a) => Val::Num(a.len() as f64),
+			Val::Obj(o) => Val::Num(
+				o.fields_visibility()
+					.into_iter()
+					.filter(|(_k, v)| *v)
+					.count() as f64,
+			),
+			_ => unreachable!(),
+		})
+	})?)
+}
+
 #[allow(clippy::cognitive_complexity)]
 pub fn call_builtin(
 	context: Context,
@@ -38,13 +67,12 @@
 	args: &ArgsDesc,
 ) -> Result<Val> {
 	Ok(match name as &str {
-		// arr/string/function
-		"length" => parse_args!(context, "std.length", args, 1, [
-			0, x: [Val::Str|Val::Arr|Val::Obj], vec![ValType::Str, ValType::Arr, ValType::Obj];
+		"length" => parse_args!(context, "length", args, 1, [
+			0, x: ty!((str | obj | [any]));
 		], {
 			Ok(match x {
 				Val::Str(n) => Val::Num(n.chars().count() as f64),
-				Val::Arr(i) => Val::Num(i.len() as f64),
+				Val::Arr(a) => Val::Num(a.len() as f64),
 				Val::Obj(o) => Val::Num(
 					o.fields_visibility()
 						.into_iter()
@@ -54,43 +82,32 @@
 				_ => unreachable!(),
 			})
 		})?,
-		// any
-		"type" => parse_args!(context, "std.type", args, 1, [
-			0, x, vec![];
+		"type" => parse_args!(context, "type", args, 1, [
+			0, x: ty!(any);
 		], {
-			Ok(Val::Str(x.value_type()?.name().into()))
+			Ok(Val::Str(x.value_type().name().into()))
 		})?,
-		// length, idx=>any
-		"makeArray" => parse_args!(context, "std.makeArray", args, 2, [
-			0, sz: [Val::Num]!!Val::Num, vec![ValType::Num];
-			1, func: [Val::Func]!!Val::Func, vec![ValType::Func];
+		"makeArray" => parse_args!(context, "makeArray", args, 2, [
+			0, sz: ty!(number((Some(0.0))..(None))) => Val::Num;
+			1, func: ty!(fn.any) => Val::Func;
 		], {
-			if sz < 0.0 {
-				throw!(RuntimeError(format!("makeArray requires size >= 0, got {}", sz).into()));
-			}
 			let mut out = Vec::with_capacity(sz as usize);
 			for i in 0..sz as usize {
-				out.push(func.evaluate_values(
+				out.push(LazyVal::new_resolved(func.evaluate_values(
 					Context::new(),
 					&[Val::Num(i as f64)]
-				)?)
+				)?))
 			}
-			Ok(Val::Arr(Rc::new(out)))
+			Ok(Val::Arr(out.into()))
 		})?,
-		// string
-		"codepoint" => parse_args!(context, "std.codepoint", args, 1, [
-			0, str: [Val::Str]!!Val::Str, vec![ValType::Str];
+		"codepoint" => parse_args!(context, "codepoint", args, 1, [
+			0, str: ty!(char) => Val::Str;
 		], {
-			assert!(
-				str.chars().count() == 1,
-				"std.codepoint should receive single char string"
-			);
 			Ok(Val::Num(str.chars().take(1).next().unwrap() as u32 as f64))
 		})?,
-		// object, includeHidden
-		"objectFieldsEx" => parse_args!(context, "std.objectFieldsEx",args, 2, [
-			0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];
-			1, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];
+		"objectFieldsEx" => parse_args!(context, "objectFieldsEx", args, 2, [
+			0, obj: ty!(obj) => Val::Obj;
+			1, inc_hidden: ty!(bool) => Val::Bool;
 		], {
 			let mut out = obj.fields_visibility()
 				.into_iter()
@@ -98,13 +115,12 @@
 				.map(|(k, _v)|k)
 				.collect::<Vec<_>>();
 			out.sort();
-			Ok(Val::Arr(Rc::new(out.into_iter().map(Val::Str).collect())))
+			Ok(Val::Arr(out.into_iter().map(Val::Str).collect::<Vec<_>>().into()))
 		})?,
-		// object, field, includeHidden
-		"objectHasEx" => parse_args!(context, "std.objectHasEx", args, 3, [
-			0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];
-			1, f: [Val::Str]!!Val::Str, vec![ValType::Str];
-			2, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];
+		"objectHasEx" => parse_args!(context, "objectHasEx", args, 3, [
+			0, obj: ty!(obj) => Val::Obj;
+			1, f: ty!(str) => Val::Str;
+			2, inc_hidden: ty!(bool) => Val::Bool;
 		], {
 			Ok(Val::Bool(
 				obj.fields_visibility()
@@ -113,13 +129,12 @@
 					.any(|(k, _v)| *k == *f),
 			))
 		})?,
-
 		// faster
 		"slice" => parse_args!(context, "slice", args, 4, [
-			0, indexable: [Val::Str | Val::Arr], vec![ValType::Str, ValType::Arr];
-			1, index, vec![ValType::Num, ValType::Null];
-			2, end, vec![ValType::Num, ValType::Null];
-			3, step, vec![ValType::Num, ValType::Null];
+			0, indexable: ty!((str | [any]));
+			1, index: ty!((num | null));
+			2, end: ty!((num | null));
+			3, step: ty!((num | null));
 		], {
 			let index = match index {
 				Val::Num(v) => v as usize,
@@ -145,53 +160,53 @@
 					Ok(Val::Str((s.chars().skip(index).take(end-index).step_by(step).collect::<String>()).into()))
 				}
 				Val::Arr(arr) => {
-					Ok(Val::Arr((arr.iter().skip(index).take(end-index).step_by(step).cloned().collect::<Vec<Val>>()).into()))
+					Ok(Val::Arr((arr.iter().skip(index).take(end-index).step_by(step).collect::<Result<Vec<Val>>>()?).into()))
 				}
 				_ => unreachable!()
 			}
 		})?,
-		"primitiveEquals" => parse_args!(context, "std.primitiveEquals", args, 2, [
-			0, a, vec![];
-			1, b, vec![];
+		"primitiveEquals" => parse_args!(context, "primitiveEquals", args, 2, [
+			0, a: ty!(any);
+			1, b: ty!(any);
 		], {
 			Ok(Val::Bool(primitive_equals(&a, &b)?))
 		})?,
 		// faster
-		"equals" => parse_args!(context, "std.equals", args, 2, [
-			0, a, vec![];
-			1, b, vec![];
+		"equals" => parse_args!(context, "equals", args, 2, [
+			0, a: ty!(any);
+			1, b: ty!(any);
 		], {
 			Ok(Val::Bool(equals(&a, &b)?))
 		})?,
-		"mod" => parse_args!(context, "std.mod", args, 2, [
-			0, a: [Val::Num | Val::Str], vec![ValType::Num, ValType::Str];
-			1, b, vec![];
+		"modulo" => parse_args!(context, "modulo", args, 2, [
+			0, a: ty!(num) => Val::Num;
+			1, b: ty!(num) => Val::Num;
+		], {
+			Ok(Val::Num(a % b))
+		})?,
+		"mod" => parse_args!(context, "mod", args, 2, [
+			0, a: ty!((num | str));
+			1, b: ty!(any);
 		], {
 			match (a, b) {
 				(Val::Num(a), Val::Num(b)) => Ok(Val::Num(a % b)),
 				(Val::Str(str), vals) => std_format(str, vals),
-				(a, b) => throw!(BinaryOperatorDoesNotOperateOnValues(jrsonnet_parser::BinaryOpType::Mod, a.value_type()?, b.value_type()?))
+				(a, b) => throw!(BinaryOperatorDoesNotOperateOnValues(BinaryOpType::Mod, a.value_type(), b.value_type()))
 			}
 		})?,
-		"modulo" => parse_args!(context, "std.modulo", args, 2, [
-			0, a: [Val::Num]!!Val::Num, vec![ValType::Num];
-			1, b: [Val::Num]!!Val::Num, vec![ValType::Num];
-		], {
-			Ok(Val::Num(a % b))
-		})?,
-		"floor" => parse_args!(context, "std.floor", args, 1, [
-			0, x: [Val::Num]!!Val::Num, vec![ValType::Num];
+		"floor" => parse_args!(context, "floor", args, 1, [
+			0, x: ty!(num) => Val::Num;
 		], {
 			Ok(Val::Num(x.floor()))
 		})?,
-		"log" => parse_args!(context, "std.log", args, 2, [
-			0, n: [Val::Num]!!Val::Num, vec![ValType::Num];
+		"log" => parse_args!(context, "log", args, 1, [
+			0, n: ty!(num) => Val::Num;
 		], {
 			Ok(Val::Num(n.ln()))
 		})?,
-		"trace" => parse_args!(context, "std.trace", args, 2, [
-			0, str: [Val::Str]!!Val::Str, vec![ValType::Str];
-			1, rest, vec![];
+		"trace" => parse_args!(context, "trace", args, 2, [
+			0, str: ty!(str) => Val::Str;
+			1, rest: ty!(any);
 		], {
 			eprint!("TRACE:");
 			if let Some(loc) = loc {
@@ -203,94 +218,88 @@
 			eprintln!(" {}", str);
 			Ok(rest)
 		})?,
-		"pow" => parse_args!(context, "std.modulo", args, 2, [
-			0, x: [Val::Num]!!Val::Num, vec![ValType::Num];
-			1, n: [Val::Num]!!Val::Num, vec![ValType::Num];
+		"pow" => parse_args!(context, "pow", args, 2, [
+			0, x: ty!(num) => Val::Num;
+			1, n: ty!(num) => Val::Num;
 		], {
 			Ok(Val::Num(x.powf(n)))
 		})?,
-		"extVar" => parse_args!(context, "std.extVar", args, 1, [
-			0, x: [Val::Str]!!Val::Str, vec![ValType::Str];
+		"extVar" => parse_args!(context, "extVar", args, 1, [
+			0, x: ty!(str) => Val::Str;
 		], {
 			Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or(UndefinedExternalVariable(x))?)
 		})?,
-		"native" => parse_args!(context, "std.native", args, 1, [
-			0, x: [Val::Str]!!Val::Str, vec![ValType::Str];
+		"native" => parse_args!(context, "native", args, 1, [
+			0, x: ty!(str) => Val::Str;
 		], {
 			Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Rc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or(UndefinedExternalFunction(x))?)
 		})?,
-		"filter" => parse_args!(context, "std.filter", args, 2, [
-			0, func: [Val::Func]!!Val::Func, vec![ValType::Func];
-			1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
+		"filter" => parse_args!(context, "filter", args, 2, [
+			0, func: ty!(fn.any) => Val::Func;
+			1, arr: ty!([any]) => Val::Arr;
 		], {
-			Ok(Val::Arr(Rc::new(
-				arr.iter()
-					.cloned()
-					.filter(|e| {
-						func
-							.evaluate_values(context.clone(), &[e.clone()])
-							.unwrap()
-							.try_cast_bool("filter predicate")
-							.unwrap()
-					})
-					.collect(),
-			)))
+			let mut out = Vec::new();
+			for item in arr.iter() {
+				let item = item?;
+				if func
+							.evaluate_values(context.clone(), &[item.clone()])?
+							.try_cast_bool("filter predicate")? {
+								out.push(item);
+							}
+			}
+			Ok(Val::Arr(out.into()))
 		})?,
-		// faster
-		"foldl" => parse_args!(context, "std.foldl", args, 3, [
-			0, func: [Val::Func]!!Val::Func, vec![ValType::Func];
-			1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
-			2, init, vec![];
+		"foldl" => parse_args!(context, "foldl", args, 3, [
+			0, func: ty!(fn.any) => Val::Func;
+			1, arr: ty!([any]) => Val::Arr;
+			2, init: ty!(any);
 		], {
 			let mut acc = init;
-			for i in arr.iter().cloned() {
-				acc = func.evaluate_values(context.clone(), &[acc, i])?;
+			for i in arr.iter() {
+				acc = func.evaluate_values(context.clone(), &[acc, i?])?;
 			}
 			Ok(acc)
 		})?,
-		// faster
-		"foldr" => parse_args!(context, "std.foldr", args, 3, [
-			0, func: [Val::Func]!!Val::Func, vec![ValType::Func];
-			1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
-			2, init, vec![];
+		"foldr" => parse_args!(context, "foldr", args, 3, [
+			0, func: ty!(fn.any) => Val::Func;
+			1, arr: ty!([any]) => Val::Arr;
+			2, init: ty!(any);
 		], {
 			let mut acc = init;
-			for i in arr.iter().rev().cloned() {
-				acc = func.evaluate_values(context.clone(), &[acc, i])?;
+			for i in arr.iter().rev() {
+				acc = func.evaluate_values(context.clone(), &[acc, i?])?;
 			}
 			Ok(acc)
 		})?,
-		// faster
 		#[allow(non_snake_case)]
-		"sortImpl" => parse_args!(context, "std.sort", args, 2, [
-			0, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
-			1, keyF: [Val::Func]!!Val::Func, vec![ValType::Func];
+		"sortImpl" => parse_args!(context, "sort", args, 2, [
+			0, arr: ty!([any]) => Val::Arr;
+			1, keyF: ty!(fn.any) => Val::Func;
 		], {
 			if arr.len() <= 1 {
 				return Ok(Val::Arr(arr))
 			}
-			Ok(Val::Arr(sort::sort(context, arr, &keyF)?))
+			Ok(Val::Arr(ArrValue::Eager(sort::sort(context, arr.evaluated()?, &keyF)?)))
 		})?,
 		// faster
-		"format" => parse_args!(context, "std.format", args, 2, [
-			0, str: [Val::Str]!!Val::Str, vec![ValType::Str];
-			1, vals, vec![]
+		"format" => parse_args!(context, "format", args, 2, [
+			0, str: ty!(str) => Val::Str;
+			1, vals: ty!(any)
 		], {
 			std_format(str, vals)
 		})?,
-		// faster
-		"range" => parse_args!(context, "std.range", args, 2, [
-			0, from: [Val::Num]!!Val::Num, vec![ValType::Num];
-			1, to: [Val::Num]!!Val::Num, vec![ValType::Num];
+		"range" => parse_args!(context, "range", args, 2, [
+			0, from: ty!(num) => Val::Num;
+			1, to: ty!(num) => Val::Num;
 		], {
 			let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));
 			for i in from as usize..=to as usize {
 				out.push(Val::Num(i as f64));
 			}
-			Ok(Val::Arr(Rc::new(out)))
+			Ok(Val::Arr(out.into()))
 		})?,
-		"char" => parse_args!(context, "std.char", args, 1, [
-			0, n: [Val::Num]!!Val::Num, vec![ValType::Num];
+		"char" => parse_args!(context, "char", args, 1, [
+			0, n: ty!(num) => Val::Num;
 		], {
 			let mut out = String::new();
 			out.push(std::char::from_u32(n as u32).ok_or_else(||
@@ -298,19 +307,18 @@
 			)?);
 			Ok(Val::Str(out.into()))
 		})?,
-		"encodeUTF8" => parse_args!(context, "std.encodeUtf8", args, 1, [
-			0, str: [Val::Str]!!Val::Str, vec![ValType::Str];
+		"encodeUTF8" => parse_args!(context, "encodeUTF8", args, 1, [
+			0, str: ty!(str) => Val::Str;
 		], {
-			Ok(Val::Arr(Rc::new(str.bytes().map(|b| Val::Num(b as f64)).collect())))
+			Ok(Val::Arr((str.bytes().map(|b| Val::Num(b as f64)).collect::<Vec<Val>>()).into()))
 		})?,
-		"md5" => parse_args!(context, "std.md5", args, 1, [
-			0, str: [Val::Str]!!Val::Str, vec![ValType::Str];
+		"md5" => parse_args!(context, "md5", args, 1, [
+			0, str: ty!(str) => Val::Str;
 		], {
 			Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))
 		})?,
-		// faster
-		"base64" => parse_args!(context, "std.base64", args, 1, [
-			0, input: [Val::Str | Val::Arr], vec![ValType::Arr, ValType::Str];
+		"base64" => parse_args!(context, "base64", args, 1, [
+			0, input: ty!((str | [num]));
 		], {
 			Ok(Val::Str(match input {
 				Val::Str(s) => {
@@ -318,44 +326,51 @@
 				},
 				Val::Arr(a) => {
 					base64::encode(a.iter().map(|v| {
-						Ok(v.clone().try_cast_num("base64 array")? as u8)
+						Ok(v?.clone().unwrap_num()? as u8)
 					}).collect::<Result<Vec<_>>>()?).into()
 				},
 				_ => unreachable!()
 			}))
 		})?,
-		// faster
-		"join" => parse_args!(context, "std.join", args, 2, [
-			0, sep: [Val::Str|Val::Arr], vec![ValType::Str, ValType::Arr];
-			1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
+		"join" => parse_args!(context, "join", args, 2, [
+			0, sep: ty!((str | [any]));
+			1, arr: ty!([any]) => Val::Arr;
 		], {
 			Ok(match sep {
 				Val::Arr(joiner_items) => {
 					let mut out = Vec::new();
 
 					let mut first = true;
-					for item in arr.iter().cloned() {
-						if let Val::Arr(items) = item.unwrap_if_lazy()? {
+					for item in arr.iter() {
+						let item = item?.clone();
+						if let Val::Arr(items) = item {
 							if !first {
 								out.reserve(joiner_items.len());
-								out.extend(joiner_items.iter().cloned());
+								// TODO: extend
+								for item in joiner_items.iter() {
+									out.push(item?);
+								}
 							}
 							first = false;
 							out.reserve(items.len());
-							out.extend(items.iter().cloned());
+							// TODO: extend
+							for item in items.iter() {
+								out.push(item?);
+							}
 						} else {
 							throw!(RuntimeError("in std.join all items should be arrays".into()));
 						}
 					}
 
-					Val::Arr(Rc::new(out))
+					Val::Arr(out.into())
 				},
 				Val::Str(sep) => {
 					let mut out = String::new();
 
 					let mut first = true;
-					for item in arr.iter().cloned() {
-						if let Val::Str(item) = item.unwrap_if_lazy()? {
+					for item in arr.iter() {
+						let item = item?.clone();
+						if let Val::Str(item) = item {
 							if !first {
 								out += &sep;
 							}
@@ -371,32 +386,30 @@
 				_ => unreachable!()
 			})
 		})?,
-		// Faster
-		"escapeStringJson" => parse_args!(context, "std.escapeStringJson", args, 1, [
-			0, str_: [Val::Str]!!Val::Str, vec![ValType::Str];
+		// faster
+		"escapeStringJson" => parse_args!(context, "escapeStringJson", args, 1, [
+			0, str_: ty!(str) => Val::Str;
 		], {
 			Ok(Val::Str(escape_string_json(&str_).into()))
 		})?,
-		// Faster
-		"manifestJsonEx" => parse_args!(context, "std.manifestJsonEx", args, 2, [
-			0, value, vec![];
-			1, indent: [Val::Str]!!Val::Str, vec![ValType::Str];
+		// faster
+		"manifestJsonEx" => parse_args!(context, "manifestJsonEx", args, 2, [
+			0, value: ty!(any);
+			1, indent: ty!(str) => Val::Str;
 		], {
 			Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {
 				padding: &indent,
 				mtype: ManifestType::Std,
 			})?.into()))
 		})?,
-		// Faster
-		"reverse" => parse_args!(context, "std.reverse", args, 1, [
-			0, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
+		// faster
+		"reverse" => parse_args!(context, "reverse", args, 1, [
+			0, value: ty!([any]) => Val::Arr;
 		], {
-			let mut marr = arr;
-			Rc::make_mut(&mut marr).reverse();
-			Ok(Val::Arr(marr))
+			Ok(Val::Arr(value.reversed()))
 		})?,
-		"id" => parse_args!(context, "std.id", args, 1, [
-			0, v, vec![];
+		"id" => parse_args!(context, "id", args, 1, [
+			0, v: ty!(any);
 		], {
 			Ok(v)
 		})?,
modifiedcrates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -1,8 +1,9 @@
 use crate::{
 	builtin::{format::FormatError, sort::SortError},
-	ValType,
+	typed::TypeLocError,
 };
 use jrsonnet_parser::{BinaryOpType, ExprLocation, UnaryOpType};
+use jrsonnet_types::ValType;
 use std::{path::PathBuf, rc::Rc};
 use thiserror::Error;
 
@@ -117,6 +118,8 @@
 
 	#[error("format error: {0}")]
 	Format(#[from] FormatError),
+	#[error("type error: {0}")]
+	TypeError(TypeLocError),
 	#[error("sort error: {0}")]
 	Sort(#[from] SortError),
 }
@@ -144,6 +147,9 @@
 	pub const fn error(&self) -> &Error {
 		&(self.0).0
 	}
+	pub fn error_mut(&mut self) -> &mut Error {
+		&mut (self.0).0
+	}
 	pub const fn trace(&self) -> &StackTrace {
 		&(self.0).1
 	}
modifiedcrates/jrsonnet-evaluator/src/function.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function.rs
+++ b/crates/jrsonnet-evaluator/src/function.rs
@@ -143,9 +143,8 @@
 #[macro_export]
 macro_rules! parse_args {
 	($ctx: expr, $fn_name: expr, $args: expr, $total_args: expr, [
-		$($id: expr, $name: ident $(: [$($p: path)|+] $(!! $a: path)?)?, $nt: expr);+ $(;)?
+		$($id: expr, $name: ident: $ty: expr $(=>$match: path)?);+ $(;)?
 	], $handler:block) => {{
-		use crate::{throw, error::Error::*};
 		let args = $args;
 		if args.len() > $total_args {
 			throw!(TooManyArgsFunctionHas($total_args));
@@ -160,47 +159,19 @@
 					throw!(IntrinsicArgumentReorderingIsNotSupportedYet);
 				}
 			}
-			let $name = evaluate($ctx.clone(), &$name.1)?;
+			let $name = push(&None, || format!("evaluating argument"), || {
+				let value = evaluate($ctx.clone(), &$name.1)?;
+				$ty.check(&value)?;
+				Ok(value)
+			})?;
 			$(
-				match $name {
-					$($p(_))|+ => {},
-					_ => throw!(TypeMismatch(
-						concat!($fn_name, " ", stringify!($id), "nd (", stringify!($name), ") argument"),
-						$nt, $name.value_type()?
-					)),
+				let $name = if let $match(v) = $name {
+					v
+				} else {
+					unreachable!();
 				};
-				$(
-					let $name = match $name {
-						$a(v) => v,
-						_ =>throw!(TypeMismatch(concat!($fn_name, " ", stringify!($id), "nd (", stringify!($name), ") argument"), $nt, $name.value_type()?)),
-					};
-				)*
-			)*
+			)?
 		)+
 		($handler as crate::Result<_>)
 	}};
-}
-
-#[test]
-fn test() -> Result<()> {
-	use crate::val::ValType;
-	use jrsonnet_parser::*;
-	let state = crate::EvaluationState::default();
-	let evaluator = state.with_stdlib();
-	let ctx = evaluator.create_default_context()?;
-	evaluator.run_in_state(|| {
-		parse_args!(ctx, "test", ArgsDesc(vec![
-			Arg(None, el!(Expr::Num(2.0))),
-			Arg(Some("b".into()), el!(Expr::Num(1.0))),
-		]), 2, [
-			0, a: [Val::Num]!!Val::Num, vec![ValType::Num];
-			1, b: [Val::Num]!!Val::Num, vec![ValType::Num];
-		], {
-			assert!((a - 2.0).abs() <= f64::EPSILON);
-			assert!((b - 1.0).abs() <= f64::EPSILON);
-			Ok(())
-		})
-		.unwrap();
-		Ok(())
-	})
 }
modifiedcrates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/lib.rs
1#![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))]2#![allow(macro_expanded_macro_exports_accessed_by_absolute_paths)]3#![warn(clippy::all, clippy::nursery)]45mod builtin;6mod ctx;7mod dynamic;8pub mod error;9mod evaluate;10mod function;11mod import;12mod integrations;13mod map;14pub mod native;15mod obj;16pub mod trace;17mod val;1819pub use ctx::*;20pub use dynamic::*;21use error::{Error::*, LocError, Result, StackTraceElement};22pub use evaluate::*;23pub use function::parse_function_call;24pub use import::*;25use jrsonnet_parser::*;26use native::NativeCallback;27pub use obj::*;28use std::{29	cell::{Ref, RefCell, RefMut},30	collections::HashMap,31	fmt::Debug,32	path::PathBuf,33	rc::Rc,34};35use trace::{offset_to_location, CodeLocation, CompactFormat, TraceFormat};36pub use val::*;3738type BindableFn = dyn Fn(Option<ObjValue>, Option<ObjValue>) -> Result<LazyVal>;39#[derive(Clone)]40pub enum LazyBinding {41	Bindable(Rc<BindableFn>),42	Bound(LazyVal),43}4445impl Debug for LazyBinding {46	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {47		write!(f, "LazyBinding")48	}49}50impl LazyBinding {51	pub fn evaluate(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {52		match self {53			Self::Bindable(v) => v(this, super_obj),54			Self::Bound(v) => Ok(v.clone()),55		}56	}57}5859pub struct EvaluationSettings {60	/// Limits recursion by limiting the number of stack frames61	pub max_stack: usize,62	/// Limits amount of stack trace items preserved63	pub max_trace: usize,64	/// Used for s`td.extVar`65	pub ext_vars: HashMap<Rc<str>, Val>,66	/// Used for ext.native67	pub ext_natives: HashMap<Rc<str>, Rc<NativeCallback>>,68	/// TLA vars69	pub tla_vars: HashMap<Rc<str>, Val>,70	/// Global variables are inserted in default context71	pub globals: HashMap<Rc<str>, Val>,72	/// Used to resolve file locations/contents73	pub import_resolver: Box<dyn ImportResolver>,74	/// Used in manifestification functions75	pub manifest_format: ManifestFormat,76	/// Used for bindings77	pub trace_format: Box<dyn TraceFormat>,78}79impl Default for EvaluationSettings {80	fn default() -> Self {81		Self {82			max_stack: 200,83			max_trace: 20,84			globals: Default::default(),85			ext_vars: Default::default(),86			ext_natives: Default::default(),87			tla_vars: Default::default(),88			import_resolver: Box::new(DummyImportResolver),89			manifest_format: ManifestFormat::Json(4),90			trace_format: Box::new(CompactFormat {91				padding: 4,92				resolver: trace::PathResolver::Absolute,93			}),94		}95	}96}9798#[derive(Default)]99struct EvaluationData {100	/// Used for stack overflow detection, stacktrace is populated on unwind101	stack_depth: usize,102	/// Contains file source codes and evaluation results for imports and pretty-printed stacktraces103	files: HashMap<Rc<PathBuf>, FileData>,104	str_files: HashMap<Rc<PathBuf>, Rc<str>>,105}106107pub struct FileData {108	source_code: Rc<str>,109	parsed: LocExpr,110	evaluated: Option<Val>,111}112#[derive(Default)]113pub struct EvaluationStateInternals {114	/// Internal state115	data: RefCell<EvaluationData>,116	/// Settings, safe to change at runtime117	settings: RefCell<EvaluationSettings>,118}119120thread_local! {121	/// Contains the state for a currently executed file.122	/// Global state is fine here.123	pub(crate) static EVAL_STATE: RefCell<Option<EvaluationState>> = RefCell::new(None)124}125pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {126	EVAL_STATE.with(|s| f(s.borrow().as_ref().unwrap()))127}128pub(crate) fn push<T>(129	e: &Option<ExprLocation>,130	frame_desc: impl FnOnce() -> String,131	f: impl FnOnce() -> Result<T>,132) -> Result<T> {133	if let Some(v) = e {134		with_state(|s| s.push(v, frame_desc, f))135	} else {136		f()137	}138}139140/// Maintains stack trace and import resolution141#[derive(Default, Clone)]142pub struct EvaluationState(Rc<EvaluationStateInternals>);143144impl EvaluationState {145	/// Parses and adds file as loaded146	pub fn add_file(&self, path: Rc<PathBuf>, source_code: Rc<str>) -> Result<()> {147		self.add_parsed_file(148			path.clone(),149			source_code.clone(),150			parse(151				&source_code,152				&ParserSettings {153					file_name: path.clone(),154					loc_data: true,155				},156			)157			.map_err(|error| ImportSyntaxError {158				error: Box::new(error),159				path,160				source_code,161			})?,162		)?;163164		Ok(())165	}166167	/// Adds file by source code and parsed expr168	pub fn add_parsed_file(169		&self,170		name: Rc<PathBuf>,171		source_code: Rc<str>,172		parsed: LocExpr,173	) -> Result<()> {174		self.data_mut().files.insert(175			name,176			FileData {177				source_code,178				parsed,179				evaluated: None,180			},181		);182183		Ok(())184	}185	pub fn get_source(&self, name: &PathBuf) -> Option<Rc<str>> {186		let ro_map = &self.data().files;187		ro_map.get(name).map(|value| value.source_code.clone())188	}189	pub fn map_source_locations(&self, file: &PathBuf, locs: &[usize]) -> Vec<CodeLocation> {190		offset_to_location(&self.get_source(file).unwrap(), locs)191	}192193	pub(crate) fn import_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Val> {194		let file_path = self.resolve_file(from, path)?;195		{196			let data = self.data();197			let files = &data.files;198			if files.contains_key(&file_path) {199				drop(data);200				return self.evaluate_loaded_file_raw(&file_path);201			}202		}203		let contents = self.load_file_contents(&file_path)?;204		self.add_file(file_path.clone(), contents)?;205		self.evaluate_loaded_file_raw(&file_path)206	}207	pub(crate) fn import_file_str(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<str>> {208		let path = self.resolve_file(from, path)?;209		if !self.data().str_files.contains_key(&path) {210			let file_str = self.load_file_contents(&path)?;211			self.data_mut().str_files.insert(path.clone(), file_str);212		}213		Ok(self.data().str_files.get(&path).cloned().unwrap())214	}215216	fn evaluate_loaded_file_raw(&self, name: &PathBuf) -> Result<Val> {217		let expr: LocExpr = {218			let ro_map = &self.data().files;219			let value = ro_map220				.get(name)221				.unwrap_or_else(|| panic!("file not added: {:?}", name));222			if let Some(ref evaluated) = value.evaluated {223				return Ok(evaluated.clone());224			}225			value.parsed.clone()226		};227		let value = evaluate(self.create_default_context()?, &expr)?;228		{229			self.data_mut()230				.files231				.get_mut(name)232				.unwrap()233				.evaluated234				.replace(value.clone());235		}236		Ok(value)237	}238239	/// Adds standard library global variable (std) to this evaluator240	pub fn with_stdlib(&self) -> &Self {241		use jrsonnet_stdlib::STDLIB_STR;242		let std_path = Rc::new(PathBuf::from("std.jsonnet"));243		self.run_in_state(|| {244			self.add_parsed_file(245				std_path.clone(),246				STDLIB_STR.to_owned().into(),247				builtin::get_parsed_stdlib(),248			)249			.unwrap();250			let val = self.evaluate_loaded_file_raw(&std_path).unwrap();251			self.settings_mut().globals.insert("std".into(), val);252		});253		self254	}255256	/// Creates context with all passed global variables257	pub fn create_default_context(&self) -> Result<Context> {258		let globals = &self.settings().globals;259		let mut new_bindings: HashMap<Rc<str>, LazyBinding> = HashMap::new();260		for (name, value) in globals.iter() {261			new_bindings.insert(262				name.clone(),263				LazyBinding::Bound(resolved_lazy_val!(value.clone())),264			);265		}266		Context::new().extend_unbound(new_bindings, None, None, None)267	}268269	/// Executes code creating a new stack frame270	pub fn push<T>(271		&self,272		e: &ExprLocation,273		frame_desc: impl FnOnce() -> String,274		f: impl FnOnce() -> Result<T>,275	) -> Result<T> {276		{277			let mut data = self.data_mut();278			let stack_depth = &mut data.stack_depth;279			if *stack_depth > self.max_stack() {280				// Error creation uses data, so i drop guard here281				drop(data);282				throw!(StackOverflow);283			} else {284				*stack_depth += 1;285			}286		}287		let result = f();288		self.data_mut().stack_depth -= 1;289		if let Err(mut err) = result {290			err.trace_mut().0.push(StackTraceElement {291				location: e.clone(),292				desc: frame_desc(),293			});294			return Err(err);295		}296		result297	}298299	/// Runs passed function in state (required if function needs to modify stack trace)300	pub fn run_in_state<T>(&self, f: impl FnOnce() -> T) -> T {301		EVAL_STATE.with(|v| {302			let has_state = v.borrow().is_some();303			if !has_state {304				v.borrow_mut().replace(self.clone());305			}306			let result = f();307			if !has_state {308				v.borrow_mut().take();309			}310			result311		})312	}313314	pub fn stringify_err(&self, e: &LocError) -> String {315		let mut out = String::new();316		self.settings()317			.trace_format318			.write_trace(&mut out, self, e)319			.unwrap();320		out321	}322323	pub fn manifest(&self, val: Val) -> Result<Rc<str>> {324		self.run_in_state(|| val.manifest(&self.manifest_format()))325	}326	pub fn manifest_multi(&self, val: Val) -> Result<Vec<(Rc<str>, Rc<str>)>> {327		self.run_in_state(|| val.manifest_multi(&self.manifest_format()))328	}329	pub fn manifest_stream(&self, val: Val) -> Result<Vec<Rc<str>>> {330		self.run_in_state(|| val.manifest_stream(&self.manifest_format()))331	}332333	/// If passed value is function then call with set TLA334	pub fn with_tla(&self, val: Val) -> Result<Val> {335		self.run_in_state(|| {336			Ok(match val {337				Val::Func(func) => func.evaluate_map(338					self.create_default_context()?,339					&self.settings().tla_vars,340					true,341				)?,342				v => v,343			})344		})345	}346}347348/// Internals349impl EvaluationState {350	fn data(&self) -> Ref<EvaluationData> {351		self.0.data.borrow()352	}353	fn data_mut(&self) -> RefMut<EvaluationData> {354		self.0.data.borrow_mut()355	}356	pub fn settings(&self) -> Ref<EvaluationSettings> {357		self.0.settings.borrow()358	}359	pub fn settings_mut(&self) -> RefMut<EvaluationSettings> {360		self.0.settings.borrow_mut()361	}362}363364/// Raw methods evaluate passed values but don't perform TLA execution365impl EvaluationState {366	pub fn evaluate_file_raw(&self, name: &PathBuf) -> Result<Val> {367		self.run_in_state(|| self.import_file(&std::env::current_dir().expect("cwd"), name))368	}369	pub fn evaluate_file_raw_nocwd(&self, name: &PathBuf) -> Result<Val> {370		self.run_in_state(|| self.import_file(&PathBuf::from("."), name))371	}372	/// Parses and evaluates the given snippet373	pub fn evaluate_snippet_raw(&self, source: Rc<PathBuf>, code: Rc<str>) -> Result<Val> {374		let parsed = parse(375			&code,376			&ParserSettings {377				file_name: source.clone(),378				loc_data: true,379			},380		)381		.unwrap();382		self.add_parsed_file(source, code, parsed.clone())?;383		self.evaluate_expr_raw(parsed)384	}385	/// Evaluates the parsed expression386	pub fn evaluate_expr_raw(&self, code: LocExpr) -> Result<Val> {387		self.run_in_state(|| evaluate(self.create_default_context()?, &code))388	}389}390391/// Settings utilities392impl EvaluationState {393	pub fn add_ext_var(&self, name: Rc<str>, value: Val) {394		self.settings_mut().ext_vars.insert(name, value);395	}396	pub fn add_ext_str(&self, name: Rc<str>, value: Rc<str>) {397		self.add_ext_var(name, Val::Str(value));398	}399	pub fn add_ext_code(&self, name: Rc<str>, code: Rc<str>) -> Result<()> {400		let value =401			self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("ext_code {}", name))), code)?;402		self.add_ext_var(name, value);403		Ok(())404	}405406	pub fn add_tla(&self, name: Rc<str>, value: Val) {407		self.settings_mut().tla_vars.insert(name, value);408	}409	pub fn add_tla_str(&self, name: Rc<str>, value: Rc<str>) {410		self.add_tla(name, Val::Str(value));411	}412	pub fn add_tla_code(&self, name: Rc<str>, code: Rc<str>) -> Result<()> {413		let value =414			self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("tla_code {}", name))), code)?;415		self.add_tla(name, value);416		Ok(())417	}418419	pub fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {420		Ok(self.settings().import_resolver.resolve_file(from, path)?)421	}422	pub fn load_file_contents(&self, path: &PathBuf) -> Result<Rc<str>> {423		Ok(self.settings().import_resolver.load_file_contents(path)?)424	}425426	pub fn import_resolver(&self) -> Ref<dyn ImportResolver> {427		Ref::map(self.settings(), |s| &*s.import_resolver)428	}429	pub fn set_import_resolver(&self, resolver: Box<dyn ImportResolver>) {430		self.settings_mut().import_resolver = resolver;431	}432433	pub fn add_native(&self, name: Rc<str>, cb: Rc<NativeCallback>) {434		self.settings_mut().ext_natives.insert(name, cb);435	}436437	pub fn manifest_format(&self) -> ManifestFormat {438		self.settings().manifest_format.clone()439	}440	pub fn set_manifest_format(&self, format: ManifestFormat) {441		self.settings_mut().manifest_format = format;442	}443444	pub fn trace_format(&self) -> Ref<dyn TraceFormat> {445		Ref::map(self.settings(), |s| &*s.trace_format)446	}447	pub fn set_trace_format(&self, format: Box<dyn TraceFormat>) {448		self.settings_mut().trace_format = format;449	}450451	pub fn max_trace(&self) -> usize {452		self.settings().max_trace453	}454	pub fn set_max_trace(&self, trace: usize) {455		self.settings_mut().max_trace = trace;456	}457458	pub fn max_stack(&self) -> usize {459		self.settings().max_stack460	}461	pub fn set_max_stack(&self, trace: usize) {462		self.settings_mut().max_stack = trace;463	}464}465466#[cfg(test)]467pub mod tests {468	use super::Val;469	use crate::{error::Error::*, primitive_equals, EvaluationState};470	use jrsonnet_parser::*;471	use std::{path::PathBuf, rc::Rc};472473	#[test]474	#[should_panic]475	fn eval_state_stacktrace() {476		let state = EvaluationState::default();477		state.run_in_state(|| {478			state479				.push(480					&ExprLocation(Rc::new(PathBuf::from("test1.jsonnet")), 10, 20),481					|| "outer".to_owned(),482					|| {483						state.push(484							&ExprLocation(Rc::new(PathBuf::from("test2.jsonnet")), 30, 40),485							|| "inner".to_owned(),486							|| Err(RuntimeError("".into()).into()),487						)?;488						Ok(())489					},490				)491				.unwrap();492		});493	}494495	#[test]496	fn eval_state_standard() {497		let state = EvaluationState::default();498		state.with_stdlib();499		assert!(primitive_equals(500			&state501				.evaluate_snippet_raw(502					Rc::new(PathBuf::from("raw.jsonnet")),503					r#"std.assertEqual(std.base64("test"), "dGVzdA==")"#.into()504				)505				.unwrap(),506			&Val::Bool(true),507		)508		.unwrap());509	}510511	macro_rules! eval {512		($str: expr) => {513			EvaluationState::default()514				.with_stdlib()515				.evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())516				.unwrap()517		};518	}519	macro_rules! eval_json {520		($str: expr) => {{521			let evaluator = EvaluationState::default();522			evaluator.with_stdlib();523			evaluator.run_in_state(|| {524				evaluator525					.evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())526					.unwrap()527					.to_json(0)528					.unwrap()529					.replace("\n", "")530				})531			}};532	}533534	/// Asserts given code returns `true`535	macro_rules! assert_eval {536		($str: expr) => {537			assert!(primitive_equals(&eval!($str), &Val::Bool(true)).unwrap())538		};539	}540541	/// Asserts given code returns `false`542	macro_rules! assert_eval_neg {543		($str: expr) => {544			assert!(primitive_equals(&eval!($str), &Val::Bool(false)).unwrap())545		};546	}547	macro_rules! assert_json {548		($str: expr, $out: expr) => {549			assert_eq!(eval_json!($str), $out.replace("\t", ""))550		};551	}552553	/// Sanity checking, before trusting to another tests554	#[test]555	fn equality_operator() {556		assert_eval!("2 == 2");557		assert_eval_neg!("2 != 2");558		assert_eval!("2 != 3");559		assert_eval_neg!("2 == 3");560		assert_eval!("'Hello' == 'Hello'");561		assert_eval_neg!("'Hello' != 'Hello'");562		assert_eval!("'Hello' != 'World'");563		assert_eval_neg!("'Hello' == 'World'");564	}565566	#[test]567	fn math_evaluation() {568		assert_eval!("2 + 2 * 2 == 6");569		assert_eval!("3 + (2 + 2 * 2) == 9");570	}571572	#[test]573	fn string_concat() {574		assert_eval!("'Hello' + 'World' == 'HelloWorld'");575		assert_eval!("'Hello' * 3 == 'HelloHelloHello'");576		assert_eval!("'Hello' + 'World' * 3 == 'HelloWorldWorldWorld'");577	}578579	#[test]580	fn faster_join() {581		assert_eval!("std.join([0,0], [[1,2],[3,4],[5,6]]) == [1,2,0,0,3,4,0,0,5,6]");582		assert_eval!("std.join(',', ['1','2','3','4']) == '1,2,3,4'");583	}584585	#[test]586	fn function_contexts() {587		assert_eval!(588			r#"589				local k = {590					t(name = self.h): [self.h, name],591					h: 3,592				};593				local f = {594					t: k.t(),595					h: 4,596				};597				f.t[0] == f.t[1]598			"#599		);600	}601602	#[test]603	fn local() {604		assert_eval!("local a = 2; local b = 3; a + b == 5");605		assert_eval!("local a = 1, b = a + 1; a + b == 3");606		assert_eval!("local a = 1; local a = 2; a == 2");607	}608609	#[test]610	fn object_lazyness() {611		assert_json!("local a = {a:error 'test'}; {}", r#"{}"#);612	}613614	#[test]615	fn object_inheritance() {616		assert_json!("{a: self.b} + {b:3}", r#"{"a": 3,"b": 3}"#);617	}618619	#[test]620	fn object_assertion_success() {621		eval!("{assert \"a\" in self} + {a:2}");622	}623624	#[test]625	fn object_assertion_error() {626		eval!("{assert \"a\" in self}");627	}628629	#[test]630	fn lazy_args() {631		eval!("local test(a) = 2; test(error '3')");632	}633634	#[test]635	#[should_panic]636	fn tailstrict_args() {637		eval!("local test(a) = 2; test(error '3') tailstrict");638	}639640	#[test]641	#[should_panic]642	fn no_binding_error() {643		eval!("a");644	}645646	#[test]647	fn test_object() {648		assert_json!("{a:2}", r#"{"a": 2}"#);649		assert_json!("{a:2+2}", r#"{"a": 4}"#);650		assert_json!("{a:2}+{b:2}", r#"{"a": 2,"b": 2}"#);651		assert_json!("{b:3}+{b:2}", r#"{"b": 2}"#);652		assert_json!("{b:3}+{b+:2}", r#"{"b": 5}"#);653		assert_json!("local test='a'; {[test]:2}", r#"{"a": 2}"#);654		assert_json!(655			r#"656				{657					name: "Alice",658					welcome: "Hello " + self.name + "!",659				}660			"#,661			r#"{"name": "Alice","welcome": "Hello Alice!"}"#662		);663		assert_json!(664			r#"665				{666					name: "Alice",667					welcome: "Hello " + self.name + "!",668				} + {669					name: "Bob"670				}671			"#,672			r#"{"name": "Bob","welcome": "Hello Bob!"}"#673		);674	}675676	#[test]677	fn functions() {678		assert_json!(r#"local a = function(b, c = 2) b + c; a(2)"#, "4");679		assert_json!(680			r#"local a = function(b, c = "Dear") b + c + d, d = "World"; a("Hello")"#,681			r#""HelloDearWorld""#682		);683	}684685	#[test]686	fn local_methods() {687		assert_json!(r#"local a(b, c = 2) = b + c; a(2)"#, "4");688		assert_json!(689			r#"local a(b, c = "Dear") = b + c + d, d = "World"; a("Hello")"#,690			r#""HelloDearWorld""#691		);692	}693694	#[test]695	fn object_locals() {696		assert_json!(r#"{local a = 3, b: a}"#, r#"{"b": 3}"#);697		assert_json!(r#"{local a = 3, local c = a, b: c}"#, r#"{"b": 3}"#);698		assert_json!(699			r#"{local a = function (b) {[b]:4}, test: a("test")}"#,700			r#"{"test": {"test": 4}}"#701		);702	}703704	#[test]705	fn object_comp() {706		assert_json!(707			r#"{local t = "a", ["h"+i+"_"+z]: if "h"+(i-1)+"_"+z in self then t+1 else 0+t for i in [1,2,3] for z in [2,3,4] if z != i}"#,708			"{\"h1_2\": \"0a\",\"h1_3\": \"0a\",\"h1_4\": \"0a\",\"h2_3\": \"a1\",\"h2_4\": \"a1\",\"h3_2\": \"0a\",\"h3_4\": \"a1\"}"709		)710	}711712	#[test]713	fn direct_self() {714		println!(715			"{:#?}",716			eval!(717				r#"718					{719						local me = self,720						a: 3,721						b(): me.a,722					}723				"#724			)725		);726	}727728	#[test]729	fn indirect_self() {730		// `self` assigned to `me` was lost when being731		// referenced from field732		eval!(733			r#"{734				local me = self,735				a: 3,736				b: me.a,737			}.b"#738		);739	}740741	// We can't trust other tests (And official jsonnet testsuite), if assert is not working correctly742	#[test]743	fn std_assert_ok() {744		eval!("std.assertEqual(4.5 << 2, 16)");745	}746747	#[test]748	#[should_panic]749	fn std_assert_failure() {750		eval!("std.assertEqual(4.5 << 2, 15)");751	}752753	#[test]754	fn string_is_string() {755		assert!(primitive_equals(756			&eval!("local arr = 'hello'; (!std.isArray(arr)) && (!std.isString(arr))"),757			&Val::Bool(false),758		)759		.unwrap());760	}761762	#[test]763	fn base64_works() {764		assert_json!(r#"std.base64("test")"#, r#""dGVzdA==""#);765	}766767	#[test]768	fn utf8_chars() {769		assert_json!(770			r#"local c="😎";{c:std.codepoint(c),l:std.length(c)}"#,771			r#"{"c": 128526,"l": 1}"#772		)773	}774775	#[test]776	fn json() {777		assert_json!(778			r#"std.manifestJsonEx({a:3, b:4, c:6},"")"#,779			r#""{\n\"a\": 3,\n\"b\": 4,\n\"c\": 6\n}""#780		);781	}782783	#[test]784	fn test() {785		assert_json!(786			r#"[[a, b] for a in [1,2,3] for b in [4,5,6]]"#,787			"[[1,4],[1,5],[1,6],[2,4],[2,5],[2,6],[3,4],[3,5],[3,6]]"788		);789	}790791	#[test]792	fn sjsonnet() {793		eval!(794			r#"795			local x0 = {k: 1};796			local x1 = {k: x0.k + x0.k};797			local x2 = {k: x1.k + x1.k};798			local x3 = {k: x2.k + x2.k};799			local x4 = {k: x3.k + x3.k};800			local x5 = {k: x4.k + x4.k};801			local x6 = {k: x5.k + x5.k};802			local x7 = {k: x6.k + x6.k};803			local x8 = {k: x7.k + x7.k};804			local x9 = {k: x8.k + x8.k};805			local x10 = {k: x9.k + x9.k};806			local x11 = {k: x10.k + x10.k};807			local x12 = {k: x11.k + x11.k};808			local x13 = {k: x12.k + x12.k};809			local x14 = {k: x13.k + x13.k};810			local x15 = {k: x14.k + x14.k};811			local x16 = {k: x15.k + x15.k};812			local x17 = {k: x16.k + x16.k};813			local x18 = {k: x17.k + x17.k};814			local x19 = {k: x18.k + x18.k};815			local x20 = {k: x19.k + x19.k};816			local x21 = {k: x20.k + x20.k};817			x21.k818		"#819		);820	}821822	// This test is commented out by default, because of huge compilation slowdown823	// #[bench]824	// fn bench_codegen(b: &mut Bencher) {825	// 	b.iter(|| {826	// 		#[allow(clippy::all)]827	// 		let stdlib = {828	// 			use jrsonnet_parser::*;829	// 			include!(concat!(env!("OUT_DIR"), "/stdlib.rs"))830	// 		};831	// 		stdlib832	// 	})833	// }834835	/*836	#[bench]837	fn bench_serialize(b: &mut Bencher) {838		b.iter(|| {839			bincode::deserialize::<jrsonnet_parser::LocExpr>(include_bytes!(concat!(840				env!("OUT_DIR"),841				"/stdlib.bincode"842			)))843			.expect("deserialize stdlib")844		})845	}846847	#[bench]848	fn bench_parse(b: &mut Bencher) {849		b.iter(|| {850			jrsonnet_parser::parse(851				jrsonnet_stdlib::STDLIB_STR,852				&jrsonnet_parser::ParserSettings {853					loc_data: true,854					file_name: Rc::new(PathBuf::from("std.jsonnet")),855				},856			)857		})858	}859	*/860861	#[test]862	fn equality() {863		println!(864			"{:?}",865			jrsonnet_parser::parse(866				"{ x: 1, y: 2 } == { x: 1, y: 2 }",867				&ParserSettings::default()868			)869		);870		assert_eval!("{ x: 1, y: 2 } == { x: 1, y: 2 }")871	}872873	#[test]874	fn native_ext() -> crate::error::Result<()> {875		use super::native::NativeCallback;876		let evaluator = EvaluationState::default();877878		evaluator.with_stdlib();879		evaluator.settings_mut().ext_natives.insert(880			"native_add".into(),881			Rc::new(NativeCallback::new(882				ParamsDesc(Rc::new(vec![883					Param("a".into(), None),884					Param("b".into(), None),885				])),886				|args| match (&args[0], &args[1]) {887					(Val::Num(a), Val::Num(b)) => Ok(Val::Num(a + b)),888					(_, _) => todo!(),889				},890			)),891		);892		evaluator.evaluate_snippet_raw(893			Rc::new(PathBuf::from("test.jsonnet")),894			"std.assertEqual(std.native(\"native_add\")(1, 2), 3)".into(),895		)?;896		Ok(())897	}898899	#[test]900	fn constant_intrinsic() -> crate::error::Result<()> {901		assert_eval!(902			"local std2 = std; local std = std2 { primitiveEquals(a, b):: false }; 1 == 1"903		);904		Ok(())905	}906907	struct TestImportResolver(Rc<str>);908	impl crate::import::ImportResolver for TestImportResolver {909		fn resolve_file(&self, _: &PathBuf, _: &PathBuf) -> crate::error::Result<Rc<PathBuf>> {910			Ok(Rc::new(PathBuf::from("/test")))911		}912913		fn load_file_contents(&self, _: &PathBuf) -> crate::error::Result<Rc<str>> {914			Ok(self.0.clone())915		}916917		unsafe fn as_any(&self) -> &dyn std::any::Any {918			panic!()919		}920	}921922	#[test]923	fn issue_23() {924		let state = EvaluationState::default();925		state.set_import_resolver(Box::new(TestImportResolver(r#"import "/test""#.into())));926		let _ = state.evaluate_file_raw(&PathBuf::from("/test"));927	}928}
after · crates/jrsonnet-evaluator/src/lib.rs
1#![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))]2#![allow(macro_expanded_macro_exports_accessed_by_absolute_paths)]3#![warn(clippy::all, clippy::nursery)]45mod builtin;6mod ctx;7mod dynamic;8pub mod error;9mod evaluate;10mod function;11mod import;12mod integrations;13mod map;14pub mod native;15mod obj;16pub mod trace;17mod typed;18mod val;1920pub use ctx::*;21pub use dynamic::*;22use error::{Error::*, LocError, Result, StackTraceElement};23pub use evaluate::*;24pub use function::parse_function_call;25pub use import::*;26use jrsonnet_parser::*;27use native::NativeCallback;28pub use obj::*;29use std::{30	cell::{Ref, RefCell, RefMut},31	collections::HashMap,32	fmt::Debug,33	path::PathBuf,34	rc::Rc,35};36use trace::{offset_to_location, CodeLocation, CompactFormat, TraceFormat};37pub use val::*;3839type BindableFn = dyn Fn(Option<ObjValue>, Option<ObjValue>) -> Result<LazyVal>;40#[derive(Clone)]41pub enum LazyBinding {42	Bindable(Rc<BindableFn>),43	Bound(LazyVal),44}4546impl Debug for LazyBinding {47	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {48		write!(f, "LazyBinding")49	}50}51impl LazyBinding {52	pub fn evaluate(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {53		match self {54			Self::Bindable(v) => v(this, super_obj),55			Self::Bound(v) => Ok(v.clone()),56		}57	}58}5960pub struct EvaluationSettings {61	/// Limits recursion by limiting the number of stack frames62	pub max_stack: usize,63	/// Limits amount of stack trace items preserved64	pub max_trace: usize,65	/// Used for s`td.extVar`66	pub ext_vars: HashMap<Rc<str>, Val>,67	/// Used for ext.native68	pub ext_natives: HashMap<Rc<str>, Rc<NativeCallback>>,69	/// TLA vars70	pub tla_vars: HashMap<Rc<str>, Val>,71	/// Global variables are inserted in default context72	pub globals: HashMap<Rc<str>, Val>,73	/// Used to resolve file locations/contents74	pub import_resolver: Box<dyn ImportResolver>,75	/// Used in manifestification functions76	pub manifest_format: ManifestFormat,77	/// Used for bindings78	pub trace_format: Box<dyn TraceFormat>,79}80impl Default for EvaluationSettings {81	fn default() -> Self {82		Self {83			max_stack: 200,84			max_trace: 20,85			globals: Default::default(),86			ext_vars: Default::default(),87			ext_natives: Default::default(),88			tla_vars: Default::default(),89			import_resolver: Box::new(DummyImportResolver),90			manifest_format: ManifestFormat::Json(4),91			trace_format: Box::new(CompactFormat {92				padding: 4,93				resolver: trace::PathResolver::Absolute,94			}),95		}96	}97}9899#[derive(Default)]100struct EvaluationData {101	/// Used for stack overflow detection, stacktrace is populated on unwind102	stack_depth: usize,103	/// Contains file source codes and evaluation results for imports and pretty-printed stacktraces104	files: HashMap<Rc<PathBuf>, FileData>,105	str_files: HashMap<Rc<PathBuf>, Rc<str>>,106}107108pub struct FileData {109	source_code: Rc<str>,110	parsed: LocExpr,111	evaluated: Option<Val>,112}113#[derive(Default)]114pub struct EvaluationStateInternals {115	/// Internal state116	data: RefCell<EvaluationData>,117	/// Settings, safe to change at runtime118	settings: RefCell<EvaluationSettings>,119}120121thread_local! {122	/// Contains the state for a currently executed file.123	/// Global state is fine here.124	pub(crate) static EVAL_STATE: RefCell<Option<EvaluationState>> = RefCell::new(None)125}126pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {127	EVAL_STATE.with(|s| f(s.borrow().as_ref().unwrap()))128}129pub(crate) fn push<T>(130	e: &Option<ExprLocation>,131	frame_desc: impl FnOnce() -> String,132	f: impl FnOnce() -> Result<T>,133) -> Result<T> {134	if let Some(v) = e {135		with_state(|s| s.push(v, frame_desc, f))136	} else {137		f()138	}139}140141/// Maintains stack trace and import resolution142#[derive(Default, Clone)]143pub struct EvaluationState(Rc<EvaluationStateInternals>);144145impl EvaluationState {146	/// Parses and adds file as loaded147	pub fn add_file(&self, path: Rc<PathBuf>, source_code: Rc<str>) -> Result<()> {148		self.add_parsed_file(149			path.clone(),150			source_code.clone(),151			parse(152				&source_code,153				&ParserSettings {154					file_name: path.clone(),155					loc_data: true,156				},157			)158			.map_err(|error| ImportSyntaxError {159				error: Box::new(error),160				path,161				source_code,162			})?,163		)?;164165		Ok(())166	}167168	/// Adds file by source code and parsed expr169	pub fn add_parsed_file(170		&self,171		name: Rc<PathBuf>,172		source_code: Rc<str>,173		parsed: LocExpr,174	) -> Result<()> {175		self.data_mut().files.insert(176			name,177			FileData {178				source_code,179				parsed,180				evaluated: None,181			},182		);183184		Ok(())185	}186	pub fn get_source(&self, name: &PathBuf) -> Option<Rc<str>> {187		let ro_map = &self.data().files;188		ro_map.get(name).map(|value| value.source_code.clone())189	}190	pub fn map_source_locations(&self, file: &PathBuf, locs: &[usize]) -> Vec<CodeLocation> {191		offset_to_location(&self.get_source(file).unwrap(), locs)192	}193194	pub(crate) fn import_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Val> {195		let file_path = self.resolve_file(from, path)?;196		{197			let data = self.data();198			let files = &data.files;199			if files.contains_key(&file_path) {200				drop(data);201				return self.evaluate_loaded_file_raw(&file_path);202			}203		}204		let contents = self.load_file_contents(&file_path)?;205		self.add_file(file_path.clone(), contents)?;206		self.evaluate_loaded_file_raw(&file_path)207	}208	pub(crate) fn import_file_str(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<str>> {209		let path = self.resolve_file(from, path)?;210		if !self.data().str_files.contains_key(&path) {211			let file_str = self.load_file_contents(&path)?;212			self.data_mut().str_files.insert(path.clone(), file_str);213		}214		Ok(self.data().str_files.get(&path).cloned().unwrap())215	}216217	fn evaluate_loaded_file_raw(&self, name: &PathBuf) -> Result<Val> {218		let expr: LocExpr = {219			let ro_map = &self.data().files;220			let value = ro_map221				.get(name)222				.unwrap_or_else(|| panic!("file not added: {:?}", name));223			if let Some(ref evaluated) = value.evaluated {224				return Ok(evaluated.clone());225			}226			value.parsed.clone()227		};228		let value = evaluate(self.create_default_context()?, &expr)?;229		{230			self.data_mut()231				.files232				.get_mut(name)233				.unwrap()234				.evaluated235				.replace(value.clone());236		}237		Ok(value)238	}239240	/// Adds standard library global variable (std) to this evaluator241	pub fn with_stdlib(&self) -> &Self {242		use jrsonnet_stdlib::STDLIB_STR;243		let std_path = Rc::new(PathBuf::from("std.jsonnet"));244		self.run_in_state(|| {245			self.add_parsed_file(246				std_path.clone(),247				STDLIB_STR.to_owned().into(),248				builtin::get_parsed_stdlib(),249			)250			.unwrap();251			let val = self.evaluate_loaded_file_raw(&std_path).unwrap();252			self.settings_mut().globals.insert("std".into(), val);253		});254		self255	}256257	/// Creates context with all passed global variables258	pub fn create_default_context(&self) -> Result<Context> {259		let globals = &self.settings().globals;260		let mut new_bindings: HashMap<Rc<str>, LazyBinding> = HashMap::new();261		for (name, value) in globals.iter() {262			new_bindings.insert(263				name.clone(),264				LazyBinding::Bound(resolved_lazy_val!(value.clone())),265			);266		}267		Context::new().extend_unbound(new_bindings, None, None, None)268	}269270	/// Executes code creating a new stack frame271	pub fn push<T>(272		&self,273		e: &ExprLocation,274		frame_desc: impl FnOnce() -> String,275		f: impl FnOnce() -> Result<T>,276	) -> Result<T> {277		{278			let mut data = self.data_mut();279			let stack_depth = &mut data.stack_depth;280			if *stack_depth > self.max_stack() {281				// Error creation uses data, so i drop guard here282				drop(data);283				throw!(StackOverflow);284			} else {285				*stack_depth += 1;286			}287		}288		let result = f();289		self.data_mut().stack_depth -= 1;290		if let Err(mut err) = result {291			err.trace_mut().0.push(StackTraceElement {292				location: e.clone(),293				desc: frame_desc(),294			});295			return Err(err);296		}297		result298	}299300	/// Runs passed function in state (required if function needs to modify stack trace)301	pub fn run_in_state<T>(&self, f: impl FnOnce() -> T) -> T {302		EVAL_STATE.with(|v| {303			let has_state = v.borrow().is_some();304			if !has_state {305				v.borrow_mut().replace(self.clone());306			}307			let result = f();308			if !has_state {309				v.borrow_mut().take();310			}311			result312		})313	}314315	pub fn stringify_err(&self, e: &LocError) -> String {316		let mut out = String::new();317		self.settings()318			.trace_format319			.write_trace(&mut out, self, e)320			.unwrap();321		out322	}323324	pub fn manifest(&self, val: Val) -> Result<Rc<str>> {325		self.run_in_state(|| val.manifest(&self.manifest_format()))326	}327	pub fn manifest_multi(&self, val: Val) -> Result<Vec<(Rc<str>, Rc<str>)>> {328		self.run_in_state(|| val.manifest_multi(&self.manifest_format()))329	}330	pub fn manifest_stream(&self, val: Val) -> Result<Vec<Rc<str>>> {331		self.run_in_state(|| val.manifest_stream(&self.manifest_format()))332	}333334	/// If passed value is function then call with set TLA335	pub fn with_tla(&self, val: Val) -> Result<Val> {336		self.run_in_state(|| {337			Ok(match val {338				Val::Func(func) => func.evaluate_map(339					self.create_default_context()?,340					&self.settings().tla_vars,341					true,342				)?,343				v => v,344			})345		})346	}347}348349/// Internals350impl EvaluationState {351	fn data(&self) -> Ref<EvaluationData> {352		self.0.data.borrow()353	}354	fn data_mut(&self) -> RefMut<EvaluationData> {355		self.0.data.borrow_mut()356	}357	pub fn settings(&self) -> Ref<EvaluationSettings> {358		self.0.settings.borrow()359	}360	pub fn settings_mut(&self) -> RefMut<EvaluationSettings> {361		self.0.settings.borrow_mut()362	}363}364365/// Raw methods evaluate passed values but don't perform TLA execution366impl EvaluationState {367	pub fn evaluate_file_raw(&self, name: &PathBuf) -> Result<Val> {368		self.run_in_state(|| self.import_file(&std::env::current_dir().expect("cwd"), name))369	}370	pub fn evaluate_file_raw_nocwd(&self, name: &PathBuf) -> Result<Val> {371		self.run_in_state(|| self.import_file(&PathBuf::from("."), name))372	}373	/// Parses and evaluates the given snippet374	pub fn evaluate_snippet_raw(&self, source: Rc<PathBuf>, code: Rc<str>) -> Result<Val> {375		let parsed = parse(376			&code,377			&ParserSettings {378				file_name: source.clone(),379				loc_data: true,380			},381		)382		.unwrap();383		self.add_parsed_file(source, code, parsed.clone())?;384		self.evaluate_expr_raw(parsed)385	}386	/// Evaluates the parsed expression387	pub fn evaluate_expr_raw(&self, code: LocExpr) -> Result<Val> {388		self.run_in_state(|| evaluate(self.create_default_context()?, &code))389	}390}391392/// Settings utilities393impl EvaluationState {394	pub fn add_ext_var(&self, name: Rc<str>, value: Val) {395		self.settings_mut().ext_vars.insert(name, value);396	}397	pub fn add_ext_str(&self, name: Rc<str>, value: Rc<str>) {398		self.add_ext_var(name, Val::Str(value));399	}400	pub fn add_ext_code(&self, name: Rc<str>, code: Rc<str>) -> Result<()> {401		let value =402			self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("ext_code {}", name))), code)?;403		self.add_ext_var(name, value);404		Ok(())405	}406407	pub fn add_tla(&self, name: Rc<str>, value: Val) {408		self.settings_mut().tla_vars.insert(name, value);409	}410	pub fn add_tla_str(&self, name: Rc<str>, value: Rc<str>) {411		self.add_tla(name, Val::Str(value));412	}413	pub fn add_tla_code(&self, name: Rc<str>, code: Rc<str>) -> Result<()> {414		let value =415			self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("tla_code {}", name))), code)?;416		self.add_tla(name, value);417		Ok(())418	}419420	pub fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {421		Ok(self.settings().import_resolver.resolve_file(from, path)?)422	}423	pub fn load_file_contents(&self, path: &PathBuf) -> Result<Rc<str>> {424		Ok(self.settings().import_resolver.load_file_contents(path)?)425	}426427	pub fn import_resolver(&self) -> Ref<dyn ImportResolver> {428		Ref::map(self.settings(), |s| &*s.import_resolver)429	}430	pub fn set_import_resolver(&self, resolver: Box<dyn ImportResolver>) {431		self.settings_mut().import_resolver = resolver;432	}433434	pub fn add_native(&self, name: Rc<str>, cb: Rc<NativeCallback>) {435		self.settings_mut().ext_natives.insert(name, cb);436	}437438	pub fn manifest_format(&self) -> ManifestFormat {439		self.settings().manifest_format.clone()440	}441	pub fn set_manifest_format(&self, format: ManifestFormat) {442		self.settings_mut().manifest_format = format;443	}444445	pub fn trace_format(&self) -> Ref<dyn TraceFormat> {446		Ref::map(self.settings(), |s| &*s.trace_format)447	}448	pub fn set_trace_format(&self, format: Box<dyn TraceFormat>) {449		self.settings_mut().trace_format = format;450	}451452	pub fn max_trace(&self) -> usize {453		self.settings().max_trace454	}455	pub fn set_max_trace(&self, trace: usize) {456		self.settings_mut().max_trace = trace;457	}458459	pub fn max_stack(&self) -> usize {460		self.settings().max_stack461	}462	pub fn set_max_stack(&self, trace: usize) {463		self.settings_mut().max_stack = trace;464	}465}466467#[cfg(test)]468pub mod tests {469	use super::Val;470	use crate::{error::Error::*, primitive_equals, EvaluationState};471	use jrsonnet_parser::*;472	use std::{path::PathBuf, rc::Rc};473474	#[test]475	#[should_panic]476	fn eval_state_stacktrace() {477		let state = EvaluationState::default();478		state.run_in_state(|| {479			state480				.push(481					&ExprLocation(Rc::new(PathBuf::from("test1.jsonnet")), 10, 20),482					|| "outer".to_owned(),483					|| {484						state.push(485							&ExprLocation(Rc::new(PathBuf::from("test2.jsonnet")), 30, 40),486							|| "inner".to_owned(),487							|| Err(RuntimeError("".into()).into()),488						)?;489						Ok(())490					},491				)492				.unwrap();493		});494	}495496	#[test]497	fn eval_state_standard() {498		let state = EvaluationState::default();499		state.with_stdlib();500		assert!(primitive_equals(501			&state502				.evaluate_snippet_raw(503					Rc::new(PathBuf::from("raw.jsonnet")),504					r#"std.assertEqual(std.base64("test"), "dGVzdA==")"#.into()505				)506				.unwrap(),507			&Val::Bool(true),508		)509		.unwrap());510	}511512	macro_rules! eval {513		($str: expr) => {514			EvaluationState::default()515				.with_stdlib()516				.evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())517				.unwrap()518		};519	}520	macro_rules! eval_json {521		($str: expr) => {{522			let evaluator = EvaluationState::default();523			evaluator.with_stdlib();524			evaluator.run_in_state(|| {525				evaluator526					.evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())527					.unwrap()528					.to_json(0)529					.unwrap()530					.replace("\n", "")531				})532			}};533	}534535	/// Asserts given code returns `true`536	macro_rules! assert_eval {537		($str: expr) => {538			assert!(primitive_equals(&eval!($str), &Val::Bool(true)).unwrap())539		};540	}541542	/// Asserts given code returns `false`543	macro_rules! assert_eval_neg {544		($str: expr) => {545			assert!(primitive_equals(&eval!($str), &Val::Bool(false)).unwrap())546		};547	}548	macro_rules! assert_json {549		($str: expr, $out: expr) => {550			assert_eq!(eval_json!($str), $out.replace("\t", ""))551		};552	}553554	/// Sanity checking, before trusting to another tests555	#[test]556	fn equality_operator() {557		assert_eval!("2 == 2");558		assert_eval_neg!("2 != 2");559		assert_eval!("2 != 3");560		assert_eval_neg!("2 == 3");561		assert_eval!("'Hello' == 'Hello'");562		assert_eval_neg!("'Hello' != 'Hello'");563		assert_eval!("'Hello' != 'World'");564		assert_eval_neg!("'Hello' == 'World'");565	}566567	#[test]568	fn math_evaluation() {569		assert_eval!("2 + 2 * 2 == 6");570		assert_eval!("3 + (2 + 2 * 2) == 9");571	}572573	#[test]574	fn string_concat() {575		assert_eval!("'Hello' + 'World' == 'HelloWorld'");576		assert_eval!("'Hello' * 3 == 'HelloHelloHello'");577		assert_eval!("'Hello' + 'World' * 3 == 'HelloWorldWorldWorld'");578	}579580	#[test]581	fn faster_join() {582		assert_eval!("std.join([0,0], [[1,2],[3,4],[5,6]]) == [1,2,0,0,3,4,0,0,5,6]");583		assert_eval!("std.join(',', ['1','2','3','4']) == '1,2,3,4'");584	}585586	#[test]587	fn function_contexts() {588		assert_eval!(589			r#"590				local k = {591					t(name = self.h): [self.h, name],592					h: 3,593				};594				local f = {595					t: k.t(),596					h: 4,597				};598				f.t[0] == f.t[1]599			"#600		);601	}602603	#[test]604	fn local() {605		assert_eval!("local a = 2; local b = 3; a + b == 5");606		assert_eval!("local a = 1, b = a + 1; a + b == 3");607		assert_eval!("local a = 1; local a = 2; a == 2");608	}609610	#[test]611	fn object_lazyness() {612		assert_json!("local a = {a:error 'test'}; {}", r#"{}"#);613	}614615	#[test]616	fn object_inheritance() {617		assert_json!("{a: self.b} + {b:3}", r#"{"a": 3,"b": 3}"#);618	}619620	#[test]621	fn object_assertion_success() {622		eval!("{assert \"a\" in self} + {a:2}");623	}624625	#[test]626	fn object_assertion_error() {627		eval!("{assert \"a\" in self}");628	}629630	#[test]631	fn lazy_args() {632		eval!("local test(a) = 2; test(error '3')");633	}634635	#[test]636	#[should_panic]637	fn tailstrict_args() {638		eval!("local test(a) = 2; test(error '3') tailstrict");639	}640641	#[test]642	#[should_panic]643	fn no_binding_error() {644		eval!("a");645	}646647	#[test]648	fn test_object() {649		assert_json!("{a:2}", r#"{"a": 2}"#);650		assert_json!("{a:2+2}", r#"{"a": 4}"#);651		assert_json!("{a:2}+{b:2}", r#"{"a": 2,"b": 2}"#);652		assert_json!("{b:3}+{b:2}", r#"{"b": 2}"#);653		assert_json!("{b:3}+{b+:2}", r#"{"b": 5}"#);654		assert_json!("local test='a'; {[test]:2}", r#"{"a": 2}"#);655		assert_json!(656			r#"657				{658					name: "Alice",659					welcome: "Hello " + self.name + "!",660				}661			"#,662			r#"{"name": "Alice","welcome": "Hello Alice!"}"#663		);664		assert_json!(665			r#"666				{667					name: "Alice",668					welcome: "Hello " + self.name + "!",669				} + {670					name: "Bob"671				}672			"#,673			r#"{"name": "Bob","welcome": "Hello Bob!"}"#674		);675	}676677	#[test]678	fn functions() {679		assert_json!(r#"local a = function(b, c = 2) b + c; a(2)"#, "4");680		assert_json!(681			r#"local a = function(b, c = "Dear") b + c + d, d = "World"; a("Hello")"#,682			r#""HelloDearWorld""#683		);684	}685686	#[test]687	fn local_methods() {688		assert_json!(r#"local a(b, c = 2) = b + c; a(2)"#, "4");689		assert_json!(690			r#"local a(b, c = "Dear") = b + c + d, d = "World"; a("Hello")"#,691			r#""HelloDearWorld""#692		);693	}694695	#[test]696	fn object_locals() {697		assert_json!(r#"{local a = 3, b: a}"#, r#"{"b": 3}"#);698		assert_json!(r#"{local a = 3, local c = a, b: c}"#, r#"{"b": 3}"#);699		assert_json!(700			r#"{local a = function (b) {[b]:4}, test: a("test")}"#,701			r#"{"test": {"test": 4}}"#702		);703	}704705	#[test]706	fn object_comp() {707		assert_json!(708			r#"{local t = "a", ["h"+i+"_"+z]: if "h"+(i-1)+"_"+z in self then t+1 else 0+t for i in [1,2,3] for z in [2,3,4] if z != i}"#,709			"{\"h1_2\": \"0a\",\"h1_3\": \"0a\",\"h1_4\": \"0a\",\"h2_3\": \"a1\",\"h2_4\": \"a1\",\"h3_2\": \"0a\",\"h3_4\": \"a1\"}"710		)711	}712713	#[test]714	fn direct_self() {715		println!(716			"{:#?}",717			eval!(718				r#"719					{720						local me = self,721						a: 3,722						b(): me.a,723					}724				"#725			)726		);727	}728729	#[test]730	fn indirect_self() {731		// `self` assigned to `me` was lost when being732		// referenced from field733		eval!(734			r#"{735				local me = self,736				a: 3,737				b: me.a,738			}.b"#739		);740	}741742	// We can't trust other tests (And official jsonnet testsuite), if assert is not working correctly743	#[test]744	fn std_assert_ok() {745		eval!("std.assertEqual(4.5 << 2, 16)");746	}747748	#[test]749	#[should_panic]750	fn std_assert_failure() {751		eval!("std.assertEqual(4.5 << 2, 15)");752	}753754	#[test]755	fn string_is_string() {756		assert!(primitive_equals(757			&eval!("local arr = 'hello'; (!std.isArray(arr)) && (!std.isString(arr))"),758			&Val::Bool(false),759		)760		.unwrap());761	}762763	#[test]764	fn base64_works() {765		assert_json!(r#"std.base64("test")"#, r#""dGVzdA==""#);766	}767768	#[test]769	fn utf8_chars() {770		assert_json!(771			r#"local c="😎";{c:std.codepoint(c),l:std.length(c)}"#,772			r#"{"c": 128526,"l": 1}"#773		)774	}775776	#[test]777	fn json() {778		assert_json!(779			r#"std.manifestJsonEx({a:3, b:4, c:6},"")"#,780			r#""{\n\"a\": 3,\n\"b\": 4,\n\"c\": 6\n}""#781		);782	}783784	#[test]785	fn test() {786		assert_json!(787			r#"[[a, b] for a in [1,2,3] for b in [4,5,6]]"#,788			"[[1,4],[1,5],[1,6],[2,4],[2,5],[2,6],[3,4],[3,5],[3,6]]"789		);790	}791792	#[test]793	fn sjsonnet() {794		eval!(795			r#"796			local x0 = {k: 1};797			local x1 = {k: x0.k + x0.k};798			local x2 = {k: x1.k + x1.k};799			local x3 = {k: x2.k + x2.k};800			local x4 = {k: x3.k + x3.k};801			local x5 = {k: x4.k + x4.k};802			local x6 = {k: x5.k + x5.k};803			local x7 = {k: x6.k + x6.k};804			local x8 = {k: x7.k + x7.k};805			local x9 = {k: x8.k + x8.k};806			local x10 = {k: x9.k + x9.k};807			local x11 = {k: x10.k + x10.k};808			local x12 = {k: x11.k + x11.k};809			local x13 = {k: x12.k + x12.k};810			local x14 = {k: x13.k + x13.k};811			local x15 = {k: x14.k + x14.k};812			local x16 = {k: x15.k + x15.k};813			local x17 = {k: x16.k + x16.k};814			local x18 = {k: x17.k + x17.k};815			local x19 = {k: x18.k + x18.k};816			local x20 = {k: x19.k + x19.k};817			local x21 = {k: x20.k + x20.k};818			x21.k819		"#820		);821	}822823	// This test is commented out by default, because of huge compilation slowdown824	// #[bench]825	// fn bench_codegen(b: &mut Bencher) {826	// 	b.iter(|| {827	// 		#[allow(clippy::all)]828	// 		let stdlib = {829	// 			use jrsonnet_parser::*;830	// 			include!(concat!(env!("OUT_DIR"), "/stdlib.rs"))831	// 		};832	// 		stdlib833	// 	})834	// }835836	/*837	#[bench]838	fn bench_serialize(b: &mut Bencher) {839		b.iter(|| {840			bincode::deserialize::<jrsonnet_parser::LocExpr>(include_bytes!(concat!(841				env!("OUT_DIR"),842				"/stdlib.bincode"843			)))844			.expect("deserialize stdlib")845		})846	}847848	#[bench]849	fn bench_parse(b: &mut Bencher) {850		b.iter(|| {851			jrsonnet_parser::parse(852				jrsonnet_stdlib::STDLIB_STR,853				&jrsonnet_parser::ParserSettings {854					loc_data: true,855					file_name: Rc::new(PathBuf::from("std.jsonnet")),856				},857			)858		})859	}860	*/861862	#[test]863	fn equality() {864		println!(865			"{:?}",866			jrsonnet_parser::parse(867				"{ x: 1, y: 2 } == { x: 1, y: 2 }",868				&ParserSettings::default()869			)870		);871		assert_eval!("{ x: 1, y: 2 } == { x: 1, y: 2 }")872	}873874	#[test]875	fn native_ext() -> crate::error::Result<()> {876		use super::native::NativeCallback;877		let evaluator = EvaluationState::default();878879		evaluator.with_stdlib();880		evaluator.settings_mut().ext_natives.insert(881			"native_add".into(),882			Rc::new(NativeCallback::new(883				ParamsDesc(Rc::new(vec![884					Param("a".into(), None),885					Param("b".into(), None),886				])),887				|args| match (&args[0], &args[1]) {888					(Val::Num(a), Val::Num(b)) => Ok(Val::Num(a + b)),889					(_, _) => todo!(),890				},891			)),892		);893		evaluator.evaluate_snippet_raw(894			Rc::new(PathBuf::from("test.jsonnet")),895			"std.assertEqual(std.native(\"native_add\")(1, 2), 3)".into(),896		)?;897		Ok(())898	}899900	#[test]901	fn constant_intrinsic() -> crate::error::Result<()> {902		assert_eval!(903			"local std2 = std; local std = std2 { primitiveEquals(a, b):: false }; 1 == 1"904		);905		Ok(())906	}907908	struct TestImportResolver(Rc<str>);909	impl crate::import::ImportResolver for TestImportResolver {910		fn resolve_file(&self, _: &PathBuf, _: &PathBuf) -> crate::error::Result<Rc<PathBuf>> {911			Ok(Rc::new(PathBuf::from("/test")))912		}913914		fn load_file_contents(&self, _: &PathBuf) -> crate::error::Result<Rc<str>> {915			Ok(self.0.clone())916		}917918		unsafe fn as_any(&self) -> &dyn std::any::Any {919			panic!()920		}921	}922923	#[test]924	fn issue_23() {925		let state = EvaluationState::default();926		state.set_import_resolver(Box::new(TestImportResolver(r#"import "/test""#.into())));927		let _ = state.evaluate_file_raw(&PathBuf::from("/test"));928	}929}
modifiedcrates/jrsonnet-evaluator/src/trace/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/trace/mod.rs
+++ b/crates/jrsonnet-evaluator/src/trace/mod.rs
@@ -65,7 +65,7 @@
 			out,
 			"{}:{}-{}:{}",
 			start.line,
-			end.column - 1,
+			end.column.saturating_sub(1),
 			start.line,
 			end.column
 		)?;