difftreelog
refactor Option<&ExprLocation> -> &Option<_>
in: master
6 files changed
crates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -22,7 +22,7 @@
fn std_format(str: IStr, vals: Val) -> Result<Val> {
push(
- &Some(ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)),
+ Some(&ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)),
|| format!("std.format of {}", str),
|| {
Ok(match vals {
@@ -34,7 +34,7 @@
)
}
-type Builtin = fn(context: Context, loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val>;
+type Builtin = fn(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val>;
type BuiltinsType = HashMap<Box<str>, Builtin>;
@@ -78,7 +78,7 @@
};
}
-fn builtin_length(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_length(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "length", args, 1, [
0, x: ty!((string | object | array));
], {
@@ -96,7 +96,7 @@
})
}
-fn builtin_type(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_type(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "type", args, 1, [
0, x: ty!(any);
], {
@@ -106,7 +106,7 @@
fn builtin_make_array(
context: Context,
- _loc: &Option<ExprLocation>,
+ _loc: Option<&ExprLocation>,
args: &ArgsDesc,
) -> Result<Val> {
parse_args!(context, "makeArray", args, 2, [
@@ -126,7 +126,7 @@
fn builtin_codepoint(
context: Context,
- _loc: &Option<ExprLocation>,
+ _loc: Option<&ExprLocation>,
args: &ArgsDesc,
) -> Result<Val> {
parse_args!(context, "codepoint", args, 1, [
@@ -138,7 +138,7 @@
fn builtin_object_fields_ex(
context: Context,
- _loc: &Option<ExprLocation>,
+ _loc: Option<&ExprLocation>,
args: &ArgsDesc,
) -> Result<Val> {
parse_args!(context, "objectFieldsEx", args, 2, [
@@ -157,7 +157,7 @@
fn builtin_object_has_ex(
context: Context,
- _loc: &Option<ExprLocation>,
+ _loc: Option<&ExprLocation>,
args: &ArgsDesc,
) -> Result<Val> {
parse_args!(context, "objectHasEx", args, 3, [
@@ -175,7 +175,7 @@
}
// faster
-fn builtin_slice(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_slice(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "slice", args, 4, [
0, indexable: ty!((string | array));
1, index: ty!((number | null));
@@ -216,7 +216,7 @@
// faster
fn builtin_primitive_equals(
context: Context,
- _loc: &Option<ExprLocation>,
+ _loc: Option<&ExprLocation>,
args: &ArgsDesc,
) -> Result<Val> {
parse_args!(context, "primitiveEquals", args, 2, [
@@ -228,7 +228,7 @@
}
// faster
-fn builtin_equals(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_equals(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "equals", args, 2, [
0, a: ty!(any);
1, b: ty!(any);
@@ -237,7 +237,7 @@
})
}
-fn builtin_modulo(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_modulo(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "modulo", args, 2, [
0, a: ty!(number) => Val::Num;
1, b: ty!(number) => Val::Num;
@@ -246,7 +246,7 @@
})
}
-fn builtin_mod(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_mod(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "mod", args, 2, [
0, a: ty!((number | string));
1, b: ty!(any);
@@ -259,7 +259,7 @@
})
}
-fn builtin_floor(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_floor(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "floor", args, 1, [
0, x: ty!(number) => Val::Num;
], {
@@ -267,7 +267,7 @@
})
}
-fn builtin_log(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_log(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "log", args, 1, [
0, n: ty!(number) => Val::Num;
], {
@@ -275,7 +275,7 @@
})
}
-fn builtin_pow(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_pow(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "pow", args, 2, [
0, x: ty!(number) => Val::Num;
1, n: ty!(number) => Val::Num;
@@ -284,7 +284,7 @@
})
}
-fn builtin_ext_var(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_ext_var(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "extVar", args, 1, [
0, x: ty!(string) => Val::Str;
], {
@@ -292,7 +292,7 @@
})
}
-fn builtin_native(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_native(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "native", args, 1, [
0, x: ty!(string) => Val::Str;
], {
@@ -300,7 +300,7 @@
})
}
-fn builtin_filter(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_filter(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "filter", args, 2, [
0, func: ty!(function) => Val::Func;
1, arr: ty!(array) => Val::Arr;
@@ -318,7 +318,7 @@
})
}
-fn builtin_foldl(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_foldl(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "foldl", args, 3, [
0, func: ty!(function) => Val::Func;
1, arr: ty!(array) => Val::Arr;
@@ -332,7 +332,7 @@
})
}
-fn builtin_foldr(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_foldr(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "foldr", args, 3, [
0, func: ty!(function) => Val::Func;
1, arr: ty!(array) => Val::Arr;
@@ -349,7 +349,7 @@
#[allow(non_snake_case)]
fn builtin_sort_impl(
context: Context,
- _loc: &Option<ExprLocation>,
+ _loc: Option<&ExprLocation>,
args: &ArgsDesc,
) -> Result<Val> {
parse_args!(context, "sort", args, 2, [
@@ -364,7 +364,7 @@
}
// faster
-fn builtin_format(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_format(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "format", args, 2, [
0, str: ty!(string) => Val::Str;
1, vals: ty!(any)
@@ -373,7 +373,7 @@
})
}
-fn builtin_range(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_range(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "range", args, 2, [
0, from: ty!(number) => Val::Num;
1, to: ty!(number) => Val::Num;
@@ -386,7 +386,7 @@
})
}
-fn builtin_char(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_char(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "char", args, 1, [
0, n: ty!(number) => Val::Num;
], {
@@ -400,7 +400,7 @@
fn builtin_encode_utf8(
context: Context,
- _loc: &Option<ExprLocation>,
+ _loc: Option<&ExprLocation>,
args: &ArgsDesc,
) -> Result<Val> {
parse_args!(context, "encodeUTF8", args, 1, [
@@ -410,7 +410,7 @@
})
}
-fn builtin_md5(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_md5(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "md5", args, 1, [
0, str: ty!(string) => Val::Str;
], {
@@ -418,7 +418,7 @@
})
}
-fn builtin_trace(context: Context, loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_trace(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "trace", args, 2, [
0, str: ty!(string) => Val::Str;
1, rest: ty!(any);
@@ -435,7 +435,7 @@
})
}
-fn builtin_base64(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_base64(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "base64", args, 1, [
0, input: ty!((string | (Array<number>)));
], {
@@ -453,7 +453,7 @@
})
}
-fn builtin_join(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_join(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "join", args, 2, [
0, sep: ty!((string | array));
1, arr: ty!(array) => Val::Arr;
@@ -513,7 +513,7 @@
// faster
fn builtin_escape_string_json(
context: Context,
- _loc: &Option<ExprLocation>,
+ _loc: Option<&ExprLocation>,
args: &ArgsDesc,
) -> Result<Val> {
parse_args!(context, "escapeStringJson", args, 1, [
@@ -526,7 +526,7 @@
// faster
fn builtin_manifest_json_ex(
context: Context,
- _loc: &Option<ExprLocation>,
+ _loc: Option<&ExprLocation>,
args: &ArgsDesc,
) -> Result<Val> {
parse_args!(context, "manifestJsonEx", args, 2, [
@@ -541,7 +541,7 @@
}
// faster
-fn builtin_reverse(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_reverse(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "reverse", args, 1, [
0, value: ty!(array) => Val::Arr;
], {
@@ -549,7 +549,7 @@
})
}
-fn builtin_id(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_id(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "id", args, 1, [
0, v: ty!(any);
], {
@@ -560,7 +560,7 @@
// faster
fn builtin_str_replace(
context: Context,
- _loc: &Option<ExprLocation>,
+ _loc: Option<&ExprLocation>,
args: &ArgsDesc,
) -> Result<Val> {
parse_args!(context, "strReplace", args, 3, [
@@ -583,10 +583,9 @@
})
}
-#[allow(clippy::cognitive_complexity)]
pub fn call_builtin(
context: Context,
- loc: &Option<ExprLocation>,
+ loc: Option<&ExprLocation>,
name: &str,
args: &ArgsDesc,
) -> Result<Val> {
crates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -385,7 +385,7 @@
context: Context,
value: &LocExpr,
args: &ArgsDesc,
- loc: &Option<ExprLocation>,
+ loc: Option<&ExprLocation>,
tailstrict: bool,
) -> Result<Val> {
let value = evaluate(context.clone(), value)?;
@@ -430,7 +430,7 @@
BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, v1, *o, v2)?,
UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,
Var(name) => push(
- loc,
+ loc.as_ref(),
|| format!("variable <{}>", name),
|| Ok(context.binding(name.clone())?.evaluate()?),
)?,
@@ -448,7 +448,7 @@
(Val::Obj(v), Val::Str(s)) => {
let sn = s.clone();
push(
- loc,
+ loc.as_ref(),
|| format!("field <{}> access", sn),
|| {
if let Some(v) = v.get(s.clone())? {
@@ -540,14 +540,14 @@
&evaluate(context.clone(), s)?,
&Val::Obj(evaluate_object(context, t)?),
)?,
- Apply(value, args, tailstrict) => evaluate_apply(context, value, args, loc, *tailstrict)?,
+ Apply(value, args, tailstrict) => evaluate_apply(context, value, args, loc.as_ref(), *tailstrict)?,
Function(params, body) => {
evaluate_method(context, "anonymous".into(), params.clone(), body.clone())
}
Intrinsic(name) => Val::Func(Rc::new(FuncVal::Intrinsic(name.clone()))),
AssertExpr(AssertStmt(value, msg), returned) => {
let assertion_result = push(
- &value.1,
+ value.1.as_ref(),
|| "assertion condition".to_owned(),
|| {
evaluate(context.clone(), value)?
@@ -558,7 +558,7 @@
evaluate(context, returned)?
} else {
push(
- &value.1,
+ value.1.as_ref(),
|| "assertion failure".to_owned(),
|| {
if let Some(msg) = msg {
@@ -571,7 +571,7 @@
}
}
ErrorStmt(e) => push(
- loc,
+ loc.as_ref(),
|| "error statement".to_owned(),
|| {
throw!(RuntimeError(
@@ -585,7 +585,7 @@
cond_else,
} => {
if push(
- loc,
+ loc.as_ref(),
|| "if condition".to_owned(),
|| evaluate(context.clone(), &cond.0)?.try_cast_bool("in if condition"),
)? {
@@ -605,7 +605,7 @@
let import_location = Rc::make_mut(&mut tmp);
import_location.pop();
push(
- loc,
+ loc.as_ref(),
|| format!("import {:?}", path),
|| with_state(|s| s.import_file(import_location, path)),
)?
crates/jrsonnet-evaluator/src/function.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/function.rs
+++ b/crates/jrsonnet-evaluator/src/function.rs
@@ -160,7 +160,7 @@
throw!(IntrinsicArgumentReorderingIsNotSupportedYet);
}
}
- let $name = push(&None, || format!("evaluating argument"), || {
+ let $name = push(None, || format!("evaluating argument"), || {
let value = evaluate($ctx.clone(), &$name.1)?;
$ty.check(&value)?;
Ok(value)
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth1#![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_interner::IStr;27use jrsonnet_parser::*;28use native::NativeCallback;29pub use obj::*;30use std::{31 cell::{Ref, RefCell, RefMut},32 collections::HashMap,33 fmt::Debug,34 path::PathBuf,35 rc::Rc,36};37use trace::{offset_to_location, CodeLocation, CompactFormat, TraceFormat};38pub use val::*;3940type BindableFn = dyn Fn(Option<ObjValue>, Option<ObjValue>) -> Result<LazyVal>;41#[derive(Clone)]42pub enum LazyBinding {43 Bindable(Rc<BindableFn>),44 Bound(LazyVal),45}4647impl Debug for LazyBinding {48 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {49 write!(f, "LazyBinding")50 }51}52impl LazyBinding {53 pub fn evaluate(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {54 match self {55 Self::Bindable(v) => v(this, super_obj),56 Self::Bound(v) => Ok(v.clone()),57 }58 }59}6061pub struct EvaluationSettings {62 /// Limits recursion by limiting the number of stack frames63 pub max_stack: usize,64 /// Limits amount of stack trace items preserved65 pub max_trace: usize,66 /// Used for s`td.extVar`67 pub ext_vars: HashMap<IStr, Val>,68 /// Used for ext.native69 pub ext_natives: HashMap<IStr, Rc<NativeCallback>>,70 /// TLA vars71 pub tla_vars: HashMap<IStr, Val>,72 /// Global variables are inserted in default context73 pub globals: HashMap<IStr, Val>,74 /// Used to resolve file locations/contents75 pub import_resolver: Box<dyn ImportResolver>,76 /// Used in manifestification functions77 pub manifest_format: ManifestFormat,78 /// Used for bindings79 pub trace_format: Box<dyn TraceFormat>,80}81impl Default for EvaluationSettings {82 fn default() -> Self {83 Self {84 max_stack: 200,85 max_trace: 20,86 globals: Default::default(),87 ext_vars: Default::default(),88 ext_natives: Default::default(),89 tla_vars: Default::default(),90 import_resolver: Box::new(DummyImportResolver),91 manifest_format: ManifestFormat::Json(4),92 trace_format: Box::new(CompactFormat {93 padding: 4,94 resolver: trace::PathResolver::Absolute,95 }),96 }97 }98}99100#[derive(Default)]101struct EvaluationData {102 /// Used for stack overflow detection, stacktrace is populated on unwind103 stack_depth: usize,104 /// Contains file source codes and evaluation results for imports and pretty-printed stacktraces105 files: HashMap<Rc<PathBuf>, FileData>,106 str_files: HashMap<Rc<PathBuf>, IStr>,107}108109pub struct FileData {110 source_code: IStr,111 parsed: LocExpr,112 evaluated: Option<Val>,113}114#[derive(Default)]115pub struct EvaluationStateInternals {116 /// Internal state117 data: RefCell<EvaluationData>,118 /// Settings, safe to change at runtime119 settings: RefCell<EvaluationSettings>,120}121122thread_local! {123 /// Contains the state for a currently executed file.124 /// Global state is fine here.125 pub(crate) static EVAL_STATE: RefCell<Option<EvaluationState>> = RefCell::new(None)126}127pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {128 EVAL_STATE.with(|s| f(s.borrow().as_ref().unwrap()))129}130pub(crate) fn push<T>(131 e: &Option<ExprLocation>,132 frame_desc: impl FnOnce() -> String,133 f: impl FnOnce() -> Result<T>,134) -> Result<T> {135 if let Some(v) = e {136 with_state(|s| s.push(v, frame_desc, f))137 } else {138 f()139 }140}141142/// Maintains stack trace and import resolution143#[derive(Default, Clone)]144pub struct EvaluationState(Rc<EvaluationStateInternals>);145146impl EvaluationState {147 /// Parses and adds file as loaded148 pub fn add_file(&self, path: Rc<PathBuf>, source_code: IStr) -> Result<()> {149 self.add_parsed_file(150 path.clone(),151 source_code.clone(),152 parse(153 &source_code,154 &ParserSettings {155 file_name: path.clone(),156 loc_data: true,157 },158 )159 .map_err(|error| ImportSyntaxError {160 error: Box::new(error),161 path,162 source_code,163 })?,164 )?;165166 Ok(())167 }168169 /// Adds file by source code and parsed expr170 pub fn add_parsed_file(171 &self,172 name: Rc<PathBuf>,173 source_code: IStr,174 parsed: LocExpr,175 ) -> Result<()> {176 self.data_mut().files.insert(177 name,178 FileData {179 source_code,180 parsed,181 evaluated: None,182 },183 );184185 Ok(())186 }187 pub fn get_source(&self, name: &PathBuf) -> Option<IStr> {188 let ro_map = &self.data().files;189 ro_map.get(name).map(|value| value.source_code.clone())190 }191 pub fn map_source_locations(&self, file: &PathBuf, locs: &[usize]) -> Vec<CodeLocation> {192 offset_to_location(&self.get_source(file).unwrap(), locs)193 }194195 pub(crate) fn import_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Val> {196 let file_path = self.resolve_file(from, path)?;197 {198 let data = self.data();199 let files = &data.files;200 if files.contains_key(&file_path) {201 drop(data);202 return self.evaluate_loaded_file_raw(&file_path);203 }204 }205 let contents = self.load_file_contents(&file_path)?;206 self.add_file(file_path.clone(), contents)?;207 self.evaluate_loaded_file_raw(&file_path)208 }209 pub(crate) fn import_file_str(&self, from: &PathBuf, path: &PathBuf) -> Result<IStr> {210 let path = self.resolve_file(from, path)?;211 if !self.data().str_files.contains_key(&path) {212 let file_str = self.load_file_contents(&path)?;213 self.data_mut().str_files.insert(path.clone(), file_str);214 }215 Ok(self.data().str_files.get(&path).cloned().unwrap())216 }217218 fn evaluate_loaded_file_raw(&self, name: &PathBuf) -> Result<Val> {219 let expr: LocExpr = {220 let ro_map = &self.data().files;221 let value = ro_map222 .get(name)223 .unwrap_or_else(|| panic!("file not added: {:?}", name));224 if let Some(ref evaluated) = value.evaluated {225 return Ok(evaluated.clone());226 }227 value.parsed.clone()228 };229 let value = evaluate(self.create_default_context()?, &expr)?;230 {231 self.data_mut()232 .files233 .get_mut(name)234 .unwrap()235 .evaluated236 .replace(value.clone());237 }238 Ok(value)239 }240241 /// Adds standard library global variable (std) to this evaluator242 pub fn with_stdlib(&self) -> &Self {243 use jrsonnet_stdlib::STDLIB_STR;244 let std_path = Rc::new(PathBuf::from("std.jsonnet"));245 self.run_in_state(|| {246 self.add_parsed_file(247 std_path.clone(),248 STDLIB_STR.to_owned().into(),249 builtin::get_parsed_stdlib(),250 )251 .unwrap();252 let val = self.evaluate_loaded_file_raw(&std_path).unwrap();253 self.settings_mut().globals.insert("std".into(), val);254 });255 self256 }257258 /// Creates context with all passed global variables259 pub fn create_default_context(&self) -> Result<Context> {260 let globals = &self.settings().globals;261 let mut new_bindings: HashMap<IStr, LazyBinding> = HashMap::new();262 for (name, value) in globals.iter() {263 new_bindings.insert(264 name.clone(),265 LazyBinding::Bound(resolved_lazy_val!(value.clone())),266 );267 }268 Context::new().extend_unbound(new_bindings, None, None, None)269 }270271 /// Executes code creating a new stack frame272 pub fn push<T>(273 &self,274 e: &ExprLocation,275 frame_desc: impl FnOnce() -> String,276 f: impl FnOnce() -> Result<T>,277 ) -> Result<T> {278 {279 let mut data = self.data_mut();280 let stack_depth = &mut data.stack_depth;281 if *stack_depth > self.max_stack() {282 // Error creation uses data, so i drop guard here283 drop(data);284 throw!(StackOverflow);285 } else {286 *stack_depth += 1;287 }288 }289 let result = f();290 self.data_mut().stack_depth -= 1;291 if let Err(mut err) = result {292 err.trace_mut().0.push(StackTraceElement {293 location: e.clone(),294 desc: frame_desc(),295 });296 return Err(err);297 }298 result299 }300301 /// Runs passed function in state (required if function needs to modify stack trace)302 pub fn run_in_state<T>(&self, f: impl FnOnce() -> T) -> T {303 EVAL_STATE.with(|v| {304 let has_state = v.borrow().is_some();305 if !has_state {306 v.borrow_mut().replace(self.clone());307 }308 let result = f();309 if !has_state {310 v.borrow_mut().take();311 }312 result313 })314 }315316 pub fn stringify_err(&self, e: &LocError) -> String {317 let mut out = String::new();318 self.settings()319 .trace_format320 .write_trace(&mut out, self, e)321 .unwrap();322 out323 }324325 pub fn manifest(&self, val: Val) -> Result<IStr> {326 self.run_in_state(|| val.manifest(&self.manifest_format()))327 }328 pub fn manifest_multi(&self, val: Val) -> Result<Vec<(IStr, IStr)>> {329 self.run_in_state(|| val.manifest_multi(&self.manifest_format()))330 }331 pub fn manifest_stream(&self, val: Val) -> Result<Vec<IStr>> {332 self.run_in_state(|| val.manifest_stream(&self.manifest_format()))333 }334335 /// If passed value is function then call with set TLA336 pub fn with_tla(&self, val: Val) -> Result<Val> {337 self.run_in_state(|| {338 Ok(match val {339 Val::Func(func) => func.evaluate_map(340 self.create_default_context()?,341 &self.settings().tla_vars,342 true,343 )?,344 v => v,345 })346 })347 }348}349350/// Internals351impl EvaluationState {352 fn data(&self) -> Ref<EvaluationData> {353 self.0.data.borrow()354 }355 fn data_mut(&self) -> RefMut<EvaluationData> {356 self.0.data.borrow_mut()357 }358 pub fn settings(&self) -> Ref<EvaluationSettings> {359 self.0.settings.borrow()360 }361 pub fn settings_mut(&self) -> RefMut<EvaluationSettings> {362 self.0.settings.borrow_mut()363 }364}365366/// Raw methods evaluate passed values but don't perform TLA execution367impl EvaluationState {368 pub fn evaluate_file_raw(&self, name: &PathBuf) -> Result<Val> {369 self.run_in_state(|| self.import_file(&std::env::current_dir().expect("cwd"), name))370 }371 pub fn evaluate_file_raw_nocwd(&self, name: &PathBuf) -> Result<Val> {372 self.run_in_state(|| self.import_file(&PathBuf::from("."), name))373 }374 /// Parses and evaluates the given snippet375 pub fn evaluate_snippet_raw(&self, source: Rc<PathBuf>, code: IStr) -> Result<Val> {376 let parsed = parse(377 &code,378 &ParserSettings {379 file_name: source.clone(),380 loc_data: true,381 },382 )383 .unwrap();384 self.add_parsed_file(source, code, parsed.clone())?;385 self.evaluate_expr_raw(parsed)386 }387 /// Evaluates the parsed expression388 pub fn evaluate_expr_raw(&self, code: LocExpr) -> Result<Val> {389 self.run_in_state(|| evaluate(self.create_default_context()?, &code))390 }391}392393/// Settings utilities394impl EvaluationState {395 pub fn add_ext_var(&self, name: IStr, value: Val) {396 self.settings_mut().ext_vars.insert(name, value);397 }398 pub fn add_ext_str(&self, name: IStr, value: IStr) {399 self.add_ext_var(name, Val::Str(value));400 }401 pub fn add_ext_code(&self, name: IStr, code: IStr) -> Result<()> {402 let value =403 self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("ext_code {}", name))), code)?;404 self.add_ext_var(name, value);405 Ok(())406 }407408 pub fn add_tla(&self, name: IStr, value: Val) {409 self.settings_mut().tla_vars.insert(name, value);410 }411 pub fn add_tla_str(&self, name: IStr, value: IStr) {412 self.add_tla(name, Val::Str(value));413 }414 pub fn add_tla_code(&self, name: IStr, code: IStr) -> Result<()> {415 let value =416 self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("tla_code {}", name))), code)?;417 self.add_tla(name, value);418 Ok(())419 }420421 pub fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {422 Ok(self.settings().import_resolver.resolve_file(from, path)?)423 }424 pub fn load_file_contents(&self, path: &PathBuf) -> Result<IStr> {425 Ok(self.settings().import_resolver.load_file_contents(path)?)426 }427428 pub fn import_resolver(&self) -> Ref<dyn ImportResolver> {429 Ref::map(self.settings(), |s| &*s.import_resolver)430 }431 pub fn set_import_resolver(&self, resolver: Box<dyn ImportResolver>) {432 self.settings_mut().import_resolver = resolver;433 }434435 pub fn add_native(&self, name: IStr, cb: Rc<NativeCallback>) {436 self.settings_mut().ext_natives.insert(name, cb);437 }438439 pub fn manifest_format(&self) -> ManifestFormat {440 self.settings().manifest_format.clone()441 }442 pub fn set_manifest_format(&self, format: ManifestFormat) {443 self.settings_mut().manifest_format = format;444 }445446 pub fn trace_format(&self) -> Ref<dyn TraceFormat> {447 Ref::map(self.settings(), |s| &*s.trace_format)448 }449 pub fn set_trace_format(&self, format: Box<dyn TraceFormat>) {450 self.settings_mut().trace_format = format;451 }452453 pub fn max_trace(&self) -> usize {454 self.settings().max_trace455 }456 pub fn set_max_trace(&self, trace: usize) {457 self.settings_mut().max_trace = trace;458 }459460 pub fn max_stack(&self) -> usize {461 self.settings().max_stack462 }463 pub fn set_max_stack(&self, trace: usize) {464 self.settings_mut().max_stack = trace;465 }466}467468#[cfg(test)]469pub mod tests {470 use super::Val;471 use crate::{error::Error::*, primitive_equals, EvaluationState};472 use jrsonnet_interner::IStr;473 use jrsonnet_parser::*;474 use std::{path::PathBuf, rc::Rc};475476 #[test]477 #[should_panic]478 fn eval_state_stacktrace() {479 let state = EvaluationState::default();480 state.run_in_state(|| {481 state482 .push(483 &ExprLocation(Rc::new(PathBuf::from("test1.jsonnet")), 10, 20),484 || "outer".to_owned(),485 || {486 state.push(487 &ExprLocation(Rc::new(PathBuf::from("test2.jsonnet")), 30, 40),488 || "inner".to_owned(),489 || Err(RuntimeError("".into()).into()),490 )?;491 Ok(())492 },493 )494 .unwrap();495 });496 }497498 #[test]499 fn eval_state_standard() {500 let state = EvaluationState::default();501 state.with_stdlib();502 assert!(primitive_equals(503 &state504 .evaluate_snippet_raw(505 Rc::new(PathBuf::from("raw.jsonnet")),506 r#"std.assertEqual(std.base64("test"), "dGVzdA==")"#.into()507 )508 .unwrap(),509 &Val::Bool(true),510 )511 .unwrap());512 }513514 macro_rules! eval {515 ($str: expr) => {516 EvaluationState::default()517 .with_stdlib()518 .evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())519 .unwrap()520 };521 }522 macro_rules! eval_json {523 ($str: expr) => {{524 let evaluator = EvaluationState::default();525 evaluator.with_stdlib();526 evaluator.run_in_state(|| {527 evaluator528 .evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())529 .unwrap()530 .to_json(0)531 .unwrap()532 .replace("\n", "")533 })534 }};535 }536537 /// Asserts given code returns `true`538 macro_rules! assert_eval {539 ($str: expr) => {540 assert!(primitive_equals(&eval!($str), &Val::Bool(true)).unwrap())541 };542 }543544 /// Asserts given code returns `false`545 macro_rules! assert_eval_neg {546 ($str: expr) => {547 assert!(primitive_equals(&eval!($str), &Val::Bool(false)).unwrap())548 };549 }550 macro_rules! assert_json {551 ($str: expr, $out: expr) => {552 assert_eq!(eval_json!($str), $out.replace("\t", ""))553 };554 }555556 /// Sanity checking, before trusting to another tests557 #[test]558 fn equality_operator() {559 assert_eval!("2 == 2");560 assert_eval_neg!("2 != 2");561 assert_eval!("2 != 3");562 assert_eval_neg!("2 == 3");563 assert_eval!("'Hello' == 'Hello'");564 assert_eval_neg!("'Hello' != 'Hello'");565 assert_eval!("'Hello' != 'World'");566 assert_eval_neg!("'Hello' == 'World'");567 }568569 #[test]570 fn math_evaluation() {571 assert_eval!("2 + 2 * 2 == 6");572 assert_eval!("3 + (2 + 2 * 2) == 9");573 }574575 #[test]576 fn string_concat() {577 assert_eval!("'Hello' + 'World' == 'HelloWorld'");578 assert_eval!("'Hello' * 3 == 'HelloHelloHello'");579 assert_eval!("'Hello' + 'World' * 3 == 'HelloWorldWorldWorld'");580 }581582 #[test]583 fn faster_join() {584 assert_eval!("std.join([0,0], [[1,2],[3,4],[5,6]]) == [1,2,0,0,3,4,0,0,5,6]");585 assert_eval!("std.join(',', ['1','2','3','4']) == '1,2,3,4'");586 }587588 #[test]589 fn function_contexts() {590 assert_eval!(591 r#"592 local k = {593 t(name = self.h): [self.h, name],594 h: 3,595 };596 local f = {597 t: k.t(),598 h: 4,599 };600 f.t[0] == f.t[1]601 "#602 );603 }604605 #[test]606 fn local() {607 assert_eval!("local a = 2; local b = 3; a + b == 5");608 assert_eval!("local a = 1, b = a + 1; a + b == 3");609 assert_eval!("local a = 1; local a = 2; a == 2");610 }611612 #[test]613 fn object_lazyness() {614 assert_json!("local a = {a:error 'test'}; {}", r#"{}"#);615 }616617 #[test]618 fn object_inheritance() {619 assert_json!("{a: self.b} + {b:3}", r#"{"a": 3,"b": 3}"#);620 }621622 #[test]623 fn object_assertion_success() {624 eval!("{assert \"a\" in self} + {a:2}");625 }626627 #[test]628 fn object_assertion_error() {629 eval!("{assert \"a\" in self}");630 }631632 #[test]633 fn lazy_args() {634 eval!("local test(a) = 2; test(error '3')");635 }636637 #[test]638 #[should_panic]639 fn tailstrict_args() {640 eval!("local test(a) = 2; test(error '3') tailstrict");641 }642643 #[test]644 #[should_panic]645 fn no_binding_error() {646 eval!("a");647 }648649 #[test]650 fn test_object() {651 assert_json!("{a:2}", r#"{"a": 2}"#);652 assert_json!("{a:2+2}", r#"{"a": 4}"#);653 assert_json!("{a:2}+{b:2}", r#"{"a": 2,"b": 2}"#);654 assert_json!("{b:3}+{b:2}", r#"{"b": 2}"#);655 assert_json!("{b:3}+{b+:2}", r#"{"b": 5}"#);656 assert_json!("local test='a'; {[test]:2}", r#"{"a": 2}"#);657 assert_json!(658 r#"659 {660 name: "Alice",661 welcome: "Hello " + self.name + "!",662 }663 "#,664 r#"{"name": "Alice","welcome": "Hello Alice!"}"#665 );666 assert_json!(667 r#"668 {669 name: "Alice",670 welcome: "Hello " + self.name + "!",671 } + {672 name: "Bob"673 }674 "#,675 r#"{"name": "Bob","welcome": "Hello Bob!"}"#676 );677 }678679 #[test]680 fn functions() {681 assert_json!(r#"local a = function(b, c = 2) b + c; a(2)"#, "4");682 assert_json!(683 r#"local a = function(b, c = "Dear") b + c + d, d = "World"; a("Hello")"#,684 r#""HelloDearWorld""#685 );686 }687688 #[test]689 fn local_methods() {690 assert_json!(r#"local a(b, c = 2) = b + c; a(2)"#, "4");691 assert_json!(692 r#"local a(b, c = "Dear") = b + c + d, d = "World"; a("Hello")"#,693 r#""HelloDearWorld""#694 );695 }696697 #[test]698 fn object_locals() {699 assert_json!(r#"{local a = 3, b: a}"#, r#"{"b": 3}"#);700 assert_json!(r#"{local a = 3, local c = a, b: c}"#, r#"{"b": 3}"#);701 assert_json!(702 r#"{local a = function (b) {[b]:4}, test: a("test")}"#,703 r#"{"test": {"test": 4}}"#704 );705 }706707 #[test]708 fn object_comp() {709 assert_json!(710 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}"#,711 "{\"h1_2\": \"0a\",\"h1_3\": \"0a\",\"h1_4\": \"0a\",\"h2_3\": \"a1\",\"h2_4\": \"a1\",\"h3_2\": \"0a\",\"h3_4\": \"a1\"}"712 )713 }714715 #[test]716 fn direct_self() {717 println!(718 "{:#?}",719 eval!(720 r#"721 {722 local me = self,723 a: 3,724 b(): me.a,725 }726 "#727 )728 );729 }730731 #[test]732 fn indirect_self() {733 // `self` assigned to `me` was lost when being734 // referenced from field735 eval!(736 r#"{737 local me = self,738 a: 3,739 b: me.a,740 }.b"#741 );742 }743744 // We can't trust other tests (And official jsonnet testsuite), if assert is not working correctly745 #[test]746 fn std_assert_ok() {747 eval!("std.assertEqual(4.5 << 2, 16)");748 }749750 #[test]751 #[should_panic]752 fn std_assert_failure() {753 eval!("std.assertEqual(4.5 << 2, 15)");754 }755756 #[test]757 fn string_is_string() {758 assert!(primitive_equals(759 &eval!("local arr = 'hello'; (!std.isArray(arr)) && (!std.isString(arr))"),760 &Val::Bool(false),761 )762 .unwrap());763 }764765 #[test]766 fn base64_works() {767 assert_json!(r#"std.base64("test")"#, r#""dGVzdA==""#);768 }769770 #[test]771 fn utf8_chars() {772 assert_json!(773 r#"local c="😎";{c:std.codepoint(c),l:std.length(c)}"#,774 r#"{"c": 128526,"l": 1}"#775 )776 }777778 #[test]779 fn json() {780 assert_json!(781 r#"std.manifestJsonEx({a:3, b:4, c:6},"")"#,782 r#""{\n\"a\": 3,\n\"b\": 4,\n\"c\": 6\n}""#783 );784 }785786 #[test]787 fn test() {788 assert_json!(789 r#"[[a, b] for a in [1,2,3] for b in [4,5,6]]"#,790 "[[1,4],[1,5],[1,6],[2,4],[2,5],[2,6],[3,4],[3,5],[3,6]]"791 );792 }793794 #[test]795 fn sjsonnet() {796 eval!(797 r#"798 local x0 = {k: 1};799 local x1 = {k: x0.k + x0.k};800 local x2 = {k: x1.k + x1.k};801 local x3 = {k: x2.k + x2.k};802 local x4 = {k: x3.k + x3.k};803 local x5 = {k: x4.k + x4.k};804 local x6 = {k: x5.k + x5.k};805 local x7 = {k: x6.k + x6.k};806 local x8 = {k: x7.k + x7.k};807 local x9 = {k: x8.k + x8.k};808 local x10 = {k: x9.k + x9.k};809 local x11 = {k: x10.k + x10.k};810 local x12 = {k: x11.k + x11.k};811 local x13 = {k: x12.k + x12.k};812 local x14 = {k: x13.k + x13.k};813 local x15 = {k: x14.k + x14.k};814 local x16 = {k: x15.k + x15.k};815 local x17 = {k: x16.k + x16.k};816 local x18 = {k: x17.k + x17.k};817 local x19 = {k: x18.k + x18.k};818 local x20 = {k: x19.k + x19.k};819 local x21 = {k: x20.k + x20.k};820 x21.k821 "#822 );823 }824825 // This test is commented out by default, because of huge compilation slowdown826 // #[bench]827 // fn bench_codegen(b: &mut Bencher) {828 // b.iter(|| {829 // #[allow(clippy::all)]830 // let stdlib = {831 // use jrsonnet_parser::*;832 // include!(concat!(env!("OUT_DIR"), "/stdlib.rs"))833 // };834 // stdlib835 // })836 // }837838 /*839 #[bench]840 fn bench_serialize(b: &mut Bencher) {841 b.iter(|| {842 bincode::deserialize::<jrsonnet_parser::LocExpr>(include_bytes!(concat!(843 env!("OUT_DIR"),844 "/stdlib.bincode"845 )))846 .expect("deserialize stdlib")847 })848 }849850 #[bench]851 fn bench_parse(b: &mut Bencher) {852 b.iter(|| {853 jrsonnet_parser::parse(854 jrsonnet_stdlib::STDLIB_STR,855 &jrsonnet_parser::ParserSettings {856 loc_data: true,857 file_name: Rc::new(PathBuf::from("std.jsonnet")),858 },859 )860 })861 }862 */863864 #[test]865 fn equality() {866 println!(867 "{:?}",868 jrsonnet_parser::parse(869 "{ x: 1, y: 2 } == { x: 1, y: 2 }",870 &ParserSettings::default()871 )872 );873 assert_eval!("{ x: 1, y: 2 } == { x: 1, y: 2 }")874 }875876 #[test]877 fn native_ext() -> crate::error::Result<()> {878 use super::native::NativeCallback;879 let evaluator = EvaluationState::default();880881 evaluator.with_stdlib();882 evaluator.settings_mut().ext_natives.insert(883 "native_add".into(),884 Rc::new(NativeCallback::new(885 ParamsDesc(Rc::new(vec![886 Param("a".into(), None),887 Param("b".into(), None),888 ])),889 |args| match (&args[0], &args[1]) {890 (Val::Num(a), Val::Num(b)) => Ok(Val::Num(a + b)),891 (_, _) => todo!(),892 },893 )),894 );895 evaluator.evaluate_snippet_raw(896 Rc::new(PathBuf::from("test.jsonnet")),897 "std.assertEqual(std.native(\"native_add\")(1, 2), 3)".into(),898 )?;899 Ok(())900 }901902 #[test]903 fn constant_intrinsic() -> crate::error::Result<()> {904 assert_eval!(905 "local std2 = std; local std = std2 { primitiveEquals(a, b):: false }; 1 == 1"906 );907 Ok(())908 }909910 struct TestImportResolver(IStr);911 impl crate::import::ImportResolver for TestImportResolver {912 fn resolve_file(&self, _: &PathBuf, _: &PathBuf) -> crate::error::Result<Rc<PathBuf>> {913 Ok(Rc::new(PathBuf::from("/test")))914 }915916 fn load_file_contents(&self, _: &PathBuf) -> crate::error::Result<IStr> {917 Ok(self.0.clone())918 }919920 unsafe fn as_any(&self) -> &dyn std::any::Any {921 panic!()922 }923 }924925 #[test]926 fn issue_23() {927 let state = EvaluationState::default();928 state.set_import_resolver(Box::new(TestImportResolver(r#"import "/test""#.into())));929 let _ = state.evaluate_file_raw(&PathBuf::from("/test"));930 }931}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_interner::IStr;27use jrsonnet_parser::*;28use native::NativeCallback;29pub use obj::*;30use std::{31 cell::{Ref, RefCell, RefMut},32 collections::HashMap,33 fmt::Debug,34 path::PathBuf,35 rc::Rc,36};37use trace::{offset_to_location, CodeLocation, CompactFormat, TraceFormat};38pub use val::*;3940type BindableFn = dyn Fn(Option<ObjValue>, Option<ObjValue>) -> Result<LazyVal>;41#[derive(Clone)]42pub enum LazyBinding {43 Bindable(Rc<BindableFn>),44 Bound(LazyVal),45}4647impl Debug for LazyBinding {48 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {49 write!(f, "LazyBinding")50 }51}52impl LazyBinding {53 pub fn evaluate(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {54 match self {55 Self::Bindable(v) => v(this, super_obj),56 Self::Bound(v) => Ok(v.clone()),57 }58 }59}6061pub struct EvaluationSettings {62 /// Limits recursion by limiting the number of stack frames63 pub max_stack: usize,64 /// Limits amount of stack trace items preserved65 pub max_trace: usize,66 /// Used for s`td.extVar`67 pub ext_vars: HashMap<IStr, Val>,68 /// Used for ext.native69 pub ext_natives: HashMap<IStr, Rc<NativeCallback>>,70 /// TLA vars71 pub tla_vars: HashMap<IStr, Val>,72 /// Global variables are inserted in default context73 pub globals: HashMap<IStr, Val>,74 /// Used to resolve file locations/contents75 pub import_resolver: Box<dyn ImportResolver>,76 /// Used in manifestification functions77 pub manifest_format: ManifestFormat,78 /// Used for bindings79 pub trace_format: Box<dyn TraceFormat>,80}81impl Default for EvaluationSettings {82 fn default() -> Self {83 Self {84 max_stack: 200,85 max_trace: 20,86 globals: Default::default(),87 ext_vars: Default::default(),88 ext_natives: Default::default(),89 tla_vars: Default::default(),90 import_resolver: Box::new(DummyImportResolver),91 manifest_format: ManifestFormat::Json(4),92 trace_format: Box::new(CompactFormat {93 padding: 4,94 resolver: trace::PathResolver::Absolute,95 }),96 }97 }98}99100#[derive(Default)]101struct EvaluationData {102 /// Used for stack overflow detection, stacktrace is populated on unwind103 stack_depth: usize,104 /// Contains file source codes and evaluation results for imports and pretty-printed stacktraces105 files: HashMap<Rc<PathBuf>, FileData>,106 str_files: HashMap<Rc<PathBuf>, IStr>,107}108109pub struct FileData {110 source_code: IStr,111 parsed: LocExpr,112 evaluated: Option<Val>,113}114#[derive(Default)]115pub struct EvaluationStateInternals {116 /// Internal state117 data: RefCell<EvaluationData>,118 /// Settings, safe to change at runtime119 settings: RefCell<EvaluationSettings>,120}121122thread_local! {123 /// Contains the state for a currently executed file.124 /// Global state is fine here.125 pub(crate) static EVAL_STATE: RefCell<Option<EvaluationState>> = RefCell::new(None)126}127pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {128 EVAL_STATE.with(|s| f(s.borrow().as_ref().unwrap()))129}130pub(crate) fn push<T>(131 e: Option<&ExprLocation>,132 frame_desc: impl FnOnce() -> String,133 f: impl FnOnce() -> Result<T>,134) -> Result<T> {135 if let Some(v) = e {136 with_state(|s| s.push(v, frame_desc, f))137 } else {138 f()139 }140}141142/// Maintains stack trace and import resolution143#[derive(Default, Clone)]144pub struct EvaluationState(Rc<EvaluationStateInternals>);145146impl EvaluationState {147 /// Parses and adds file as loaded148 pub fn add_file(&self, path: Rc<PathBuf>, source_code: IStr) -> Result<()> {149 self.add_parsed_file(150 path.clone(),151 source_code.clone(),152 parse(153 &source_code,154 &ParserSettings {155 file_name: path.clone(),156 loc_data: true,157 },158 )159 .map_err(|error| ImportSyntaxError {160 error: Box::new(error),161 path,162 source_code,163 })?,164 )?;165166 Ok(())167 }168169 /// Adds file by source code and parsed expr170 pub fn add_parsed_file(171 &self,172 name: Rc<PathBuf>,173 source_code: IStr,174 parsed: LocExpr,175 ) -> Result<()> {176 self.data_mut().files.insert(177 name,178 FileData {179 source_code,180 parsed,181 evaluated: None,182 },183 );184185 Ok(())186 }187 pub fn get_source(&self, name: &PathBuf) -> Option<IStr> {188 let ro_map = &self.data().files;189 ro_map.get(name).map(|value| value.source_code.clone())190 }191 pub fn map_source_locations(&self, file: &PathBuf, locs: &[usize]) -> Vec<CodeLocation> {192 offset_to_location(&self.get_source(file).unwrap(), locs)193 }194195 pub(crate) fn import_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Val> {196 let file_path = self.resolve_file(from, path)?;197 {198 let data = self.data();199 let files = &data.files;200 if files.contains_key(&file_path) {201 drop(data);202 return self.evaluate_loaded_file_raw(&file_path);203 }204 }205 let contents = self.load_file_contents(&file_path)?;206 self.add_file(file_path.clone(), contents)?;207 self.evaluate_loaded_file_raw(&file_path)208 }209 pub(crate) fn import_file_str(&self, from: &PathBuf, path: &PathBuf) -> Result<IStr> {210 let path = self.resolve_file(from, path)?;211 if !self.data().str_files.contains_key(&path) {212 let file_str = self.load_file_contents(&path)?;213 self.data_mut().str_files.insert(path.clone(), file_str);214 }215 Ok(self.data().str_files.get(&path).cloned().unwrap())216 }217218 fn evaluate_loaded_file_raw(&self, name: &PathBuf) -> Result<Val> {219 let expr: LocExpr = {220 let ro_map = &self.data().files;221 let value = ro_map222 .get(name)223 .unwrap_or_else(|| panic!("file not added: {:?}", name));224 if let Some(ref evaluated) = value.evaluated {225 return Ok(evaluated.clone());226 }227 value.parsed.clone()228 };229 let value = evaluate(self.create_default_context()?, &expr)?;230 {231 self.data_mut()232 .files233 .get_mut(name)234 .unwrap()235 .evaluated236 .replace(value.clone());237 }238 Ok(value)239 }240241 /// Adds standard library global variable (std) to this evaluator242 pub fn with_stdlib(&self) -> &Self {243 use jrsonnet_stdlib::STDLIB_STR;244 let std_path = Rc::new(PathBuf::from("std.jsonnet"));245 self.run_in_state(|| {246 self.add_parsed_file(247 std_path.clone(),248 STDLIB_STR.to_owned().into(),249 builtin::get_parsed_stdlib(),250 )251 .unwrap();252 let val = self.evaluate_loaded_file_raw(&std_path).unwrap();253 self.settings_mut().globals.insert("std".into(), val);254 });255 self256 }257258 /// Creates context with all passed global variables259 pub fn create_default_context(&self) -> Result<Context> {260 let globals = &self.settings().globals;261 let mut new_bindings: HashMap<IStr, LazyBinding> = HashMap::new();262 for (name, value) in globals.iter() {263 new_bindings.insert(264 name.clone(),265 LazyBinding::Bound(resolved_lazy_val!(value.clone())),266 );267 }268 Context::new().extend_unbound(new_bindings, None, None, None)269 }270271 /// Executes code creating a new stack frame272 pub fn push<T>(273 &self,274 e: &ExprLocation,275 frame_desc: impl FnOnce() -> String,276 f: impl FnOnce() -> Result<T>,277 ) -> Result<T> {278 {279 let mut data = self.data_mut();280 let stack_depth = &mut data.stack_depth;281 if *stack_depth > self.max_stack() {282 // Error creation uses data, so i drop guard here283 drop(data);284 throw!(StackOverflow);285 } else {286 *stack_depth += 1;287 }288 }289 let result = f();290 self.data_mut().stack_depth -= 1;291 if let Err(mut err) = result {292 err.trace_mut().0.push(StackTraceElement {293 location: e.clone(),294 desc: frame_desc(),295 });296 return Err(err);297 }298 result299 }300301 /// Runs passed function in state (required if function needs to modify stack trace)302 pub fn run_in_state<T>(&self, f: impl FnOnce() -> T) -> T {303 EVAL_STATE.with(|v| {304 let has_state = v.borrow().is_some();305 if !has_state {306 v.borrow_mut().replace(self.clone());307 }308 let result = f();309 if !has_state {310 v.borrow_mut().take();311 }312 result313 })314 }315316 pub fn stringify_err(&self, e: &LocError) -> String {317 let mut out = String::new();318 self.settings()319 .trace_format320 .write_trace(&mut out, self, e)321 .unwrap();322 out323 }324325 pub fn manifest(&self, val: Val) -> Result<IStr> {326 self.run_in_state(|| val.manifest(&self.manifest_format()))327 }328 pub fn manifest_multi(&self, val: Val) -> Result<Vec<(IStr, IStr)>> {329 self.run_in_state(|| val.manifest_multi(&self.manifest_format()))330 }331 pub fn manifest_stream(&self, val: Val) -> Result<Vec<IStr>> {332 self.run_in_state(|| val.manifest_stream(&self.manifest_format()))333 }334335 /// If passed value is function then call with set TLA336 pub fn with_tla(&self, val: Val) -> Result<Val> {337 self.run_in_state(|| {338 Ok(match val {339 Val::Func(func) => func.evaluate_map(340 self.create_default_context()?,341 &self.settings().tla_vars,342 true,343 )?,344 v => v,345 })346 })347 }348}349350/// Internals351impl EvaluationState {352 fn data(&self) -> Ref<EvaluationData> {353 self.0.data.borrow()354 }355 fn data_mut(&self) -> RefMut<EvaluationData> {356 self.0.data.borrow_mut()357 }358 pub fn settings(&self) -> Ref<EvaluationSettings> {359 self.0.settings.borrow()360 }361 pub fn settings_mut(&self) -> RefMut<EvaluationSettings> {362 self.0.settings.borrow_mut()363 }364}365366/// Raw methods evaluate passed values but don't perform TLA execution367impl EvaluationState {368 pub fn evaluate_file_raw(&self, name: &PathBuf) -> Result<Val> {369 self.run_in_state(|| self.import_file(&std::env::current_dir().expect("cwd"), name))370 }371 pub fn evaluate_file_raw_nocwd(&self, name: &PathBuf) -> Result<Val> {372 self.run_in_state(|| self.import_file(&PathBuf::from("."), name))373 }374 /// Parses and evaluates the given snippet375 pub fn evaluate_snippet_raw(&self, source: Rc<PathBuf>, code: IStr) -> Result<Val> {376 let parsed = parse(377 &code,378 &ParserSettings {379 file_name: source.clone(),380 loc_data: true,381 },382 )383 .unwrap();384 self.add_parsed_file(source, code, parsed.clone())?;385 self.evaluate_expr_raw(parsed)386 }387 /// Evaluates the parsed expression388 pub fn evaluate_expr_raw(&self, code: LocExpr) -> Result<Val> {389 self.run_in_state(|| evaluate(self.create_default_context()?, &code))390 }391}392393/// Settings utilities394impl EvaluationState {395 pub fn add_ext_var(&self, name: IStr, value: Val) {396 self.settings_mut().ext_vars.insert(name, value);397 }398 pub fn add_ext_str(&self, name: IStr, value: IStr) {399 self.add_ext_var(name, Val::Str(value));400 }401 pub fn add_ext_code(&self, name: IStr, code: IStr) -> Result<()> {402 let value =403 self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("ext_code {}", name))), code)?;404 self.add_ext_var(name, value);405 Ok(())406 }407408 pub fn add_tla(&self, name: IStr, value: Val) {409 self.settings_mut().tla_vars.insert(name, value);410 }411 pub fn add_tla_str(&self, name: IStr, value: IStr) {412 self.add_tla(name, Val::Str(value));413 }414 pub fn add_tla_code(&self, name: IStr, code: IStr) -> Result<()> {415 let value =416 self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("tla_code {}", name))), code)?;417 self.add_tla(name, value);418 Ok(())419 }420421 pub fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {422 Ok(self.settings().import_resolver.resolve_file(from, path)?)423 }424 pub fn load_file_contents(&self, path: &PathBuf) -> Result<IStr> {425 Ok(self.settings().import_resolver.load_file_contents(path)?)426 }427428 pub fn import_resolver(&self) -> Ref<dyn ImportResolver> {429 Ref::map(self.settings(), |s| &*s.import_resolver)430 }431 pub fn set_import_resolver(&self, resolver: Box<dyn ImportResolver>) {432 self.settings_mut().import_resolver = resolver;433 }434435 pub fn add_native(&self, name: IStr, cb: Rc<NativeCallback>) {436 self.settings_mut().ext_natives.insert(name, cb);437 }438439 pub fn manifest_format(&self) -> ManifestFormat {440 self.settings().manifest_format.clone()441 }442 pub fn set_manifest_format(&self, format: ManifestFormat) {443 self.settings_mut().manifest_format = format;444 }445446 pub fn trace_format(&self) -> Ref<dyn TraceFormat> {447 Ref::map(self.settings(), |s| &*s.trace_format)448 }449 pub fn set_trace_format(&self, format: Box<dyn TraceFormat>) {450 self.settings_mut().trace_format = format;451 }452453 pub fn max_trace(&self) -> usize {454 self.settings().max_trace455 }456 pub fn set_max_trace(&self, trace: usize) {457 self.settings_mut().max_trace = trace;458 }459460 pub fn max_stack(&self) -> usize {461 self.settings().max_stack462 }463 pub fn set_max_stack(&self, trace: usize) {464 self.settings_mut().max_stack = trace;465 }466}467468#[cfg(test)]469pub mod tests {470 use super::Val;471 use crate::{error::Error::*, primitive_equals, EvaluationState};472 use jrsonnet_interner::IStr;473 use jrsonnet_parser::*;474 use std::{path::PathBuf, rc::Rc};475476 #[test]477 #[should_panic]478 fn eval_state_stacktrace() {479 let state = EvaluationState::default();480 state.run_in_state(|| {481 state482 .push(483 &ExprLocation(Rc::new(PathBuf::from("test1.jsonnet")), 10, 20),484 || "outer".to_owned(),485 || {486 state.push(487 &ExprLocation(Rc::new(PathBuf::from("test2.jsonnet")), 30, 40),488 || "inner".to_owned(),489 || Err(RuntimeError("".into()).into()),490 )?;491 Ok(())492 },493 )494 .unwrap();495 });496 }497498 #[test]499 fn eval_state_standard() {500 let state = EvaluationState::default();501 state.with_stdlib();502 assert!(primitive_equals(503 &state504 .evaluate_snippet_raw(505 Rc::new(PathBuf::from("raw.jsonnet")),506 r#"std.assertEqual(std.base64("test"), "dGVzdA==")"#.into()507 )508 .unwrap(),509 &Val::Bool(true),510 )511 .unwrap());512 }513514 macro_rules! eval {515 ($str: expr) => {516 EvaluationState::default()517 .with_stdlib()518 .evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())519 .unwrap()520 };521 }522 macro_rules! eval_json {523 ($str: expr) => {{524 let evaluator = EvaluationState::default();525 evaluator.with_stdlib();526 evaluator.run_in_state(|| {527 evaluator528 .evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())529 .unwrap()530 .to_json(0)531 .unwrap()532 .replace("\n", "")533 })534 }};535 }536537 /// Asserts given code returns `true`538 macro_rules! assert_eval {539 ($str: expr) => {540 assert!(primitive_equals(&eval!($str), &Val::Bool(true)).unwrap())541 };542 }543544 /// Asserts given code returns `false`545 macro_rules! assert_eval_neg {546 ($str: expr) => {547 assert!(primitive_equals(&eval!($str), &Val::Bool(false)).unwrap())548 };549 }550 macro_rules! assert_json {551 ($str: expr, $out: expr) => {552 assert_eq!(eval_json!($str), $out.replace("\t", ""))553 };554 }555556 /// Sanity checking, before trusting to another tests557 #[test]558 fn equality_operator() {559 assert_eval!("2 == 2");560 assert_eval_neg!("2 != 2");561 assert_eval!("2 != 3");562 assert_eval_neg!("2 == 3");563 assert_eval!("'Hello' == 'Hello'");564 assert_eval_neg!("'Hello' != 'Hello'");565 assert_eval!("'Hello' != 'World'");566 assert_eval_neg!("'Hello' == 'World'");567 }568569 #[test]570 fn math_evaluation() {571 assert_eval!("2 + 2 * 2 == 6");572 assert_eval!("3 + (2 + 2 * 2) == 9");573 }574575 #[test]576 fn string_concat() {577 assert_eval!("'Hello' + 'World' == 'HelloWorld'");578 assert_eval!("'Hello' * 3 == 'HelloHelloHello'");579 assert_eval!("'Hello' + 'World' * 3 == 'HelloWorldWorldWorld'");580 }581582 #[test]583 fn faster_join() {584 assert_eval!("std.join([0,0], [[1,2],[3,4],[5,6]]) == [1,2,0,0,3,4,0,0,5,6]");585 assert_eval!("std.join(',', ['1','2','3','4']) == '1,2,3,4'");586 }587588 #[test]589 fn function_contexts() {590 assert_eval!(591 r#"592 local k = {593 t(name = self.h): [self.h, name],594 h: 3,595 };596 local f = {597 t: k.t(),598 h: 4,599 };600 f.t[0] == f.t[1]601 "#602 );603 }604605 #[test]606 fn local() {607 assert_eval!("local a = 2; local b = 3; a + b == 5");608 assert_eval!("local a = 1, b = a + 1; a + b == 3");609 assert_eval!("local a = 1; local a = 2; a == 2");610 }611612 #[test]613 fn object_lazyness() {614 assert_json!("local a = {a:error 'test'}; {}", r#"{}"#);615 }616617 #[test]618 fn object_inheritance() {619 assert_json!("{a: self.b} + {b:3}", r#"{"a": 3,"b": 3}"#);620 }621622 #[test]623 fn object_assertion_success() {624 eval!("{assert \"a\" in self} + {a:2}");625 }626627 #[test]628 fn object_assertion_error() {629 eval!("{assert \"a\" in self}");630 }631632 #[test]633 fn lazy_args() {634 eval!("local test(a) = 2; test(error '3')");635 }636637 #[test]638 #[should_panic]639 fn tailstrict_args() {640 eval!("local test(a) = 2; test(error '3') tailstrict");641 }642643 #[test]644 #[should_panic]645 fn no_binding_error() {646 eval!("a");647 }648649 #[test]650 fn test_object() {651 assert_json!("{a:2}", r#"{"a": 2}"#);652 assert_json!("{a:2+2}", r#"{"a": 4}"#);653 assert_json!("{a:2}+{b:2}", r#"{"a": 2,"b": 2}"#);654 assert_json!("{b:3}+{b:2}", r#"{"b": 2}"#);655 assert_json!("{b:3}+{b+:2}", r#"{"b": 5}"#);656 assert_json!("local test='a'; {[test]:2}", r#"{"a": 2}"#);657 assert_json!(658 r#"659 {660 name: "Alice",661 welcome: "Hello " + self.name + "!",662 }663 "#,664 r#"{"name": "Alice","welcome": "Hello Alice!"}"#665 );666 assert_json!(667 r#"668 {669 name: "Alice",670 welcome: "Hello " + self.name + "!",671 } + {672 name: "Bob"673 }674 "#,675 r#"{"name": "Bob","welcome": "Hello Bob!"}"#676 );677 }678679 #[test]680 fn functions() {681 assert_json!(r#"local a = function(b, c = 2) b + c; a(2)"#, "4");682 assert_json!(683 r#"local a = function(b, c = "Dear") b + c + d, d = "World"; a("Hello")"#,684 r#""HelloDearWorld""#685 );686 }687688 #[test]689 fn local_methods() {690 assert_json!(r#"local a(b, c = 2) = b + c; a(2)"#, "4");691 assert_json!(692 r#"local a(b, c = "Dear") = b + c + d, d = "World"; a("Hello")"#,693 r#""HelloDearWorld""#694 );695 }696697 #[test]698 fn object_locals() {699 assert_json!(r#"{local a = 3, b: a}"#, r#"{"b": 3}"#);700 assert_json!(r#"{local a = 3, local c = a, b: c}"#, r#"{"b": 3}"#);701 assert_json!(702 r#"{local a = function (b) {[b]:4}, test: a("test")}"#,703 r#"{"test": {"test": 4}}"#704 );705 }706707 #[test]708 fn object_comp() {709 assert_json!(710 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}"#,711 "{\"h1_2\": \"0a\",\"h1_3\": \"0a\",\"h1_4\": \"0a\",\"h2_3\": \"a1\",\"h2_4\": \"a1\",\"h3_2\": \"0a\",\"h3_4\": \"a1\"}"712 )713 }714715 #[test]716 fn direct_self() {717 println!(718 "{:#?}",719 eval!(720 r#"721 {722 local me = self,723 a: 3,724 b(): me.a,725 }726 "#727 )728 );729 }730731 #[test]732 fn indirect_self() {733 // `self` assigned to `me` was lost when being734 // referenced from field735 eval!(736 r#"{737 local me = self,738 a: 3,739 b: me.a,740 }.b"#741 );742 }743744 // We can't trust other tests (And official jsonnet testsuite), if assert is not working correctly745 #[test]746 fn std_assert_ok() {747 eval!("std.assertEqual(4.5 << 2, 16)");748 }749750 #[test]751 #[should_panic]752 fn std_assert_failure() {753 eval!("std.assertEqual(4.5 << 2, 15)");754 }755756 #[test]757 fn string_is_string() {758 assert!(primitive_equals(759 &eval!("local arr = 'hello'; (!std.isArray(arr)) && (!std.isString(arr))"),760 &Val::Bool(false),761 )762 .unwrap());763 }764765 #[test]766 fn base64_works() {767 assert_json!(r#"std.base64("test")"#, r#""dGVzdA==""#);768 }769770 #[test]771 fn utf8_chars() {772 assert_json!(773 r#"local c="😎";{c:std.codepoint(c),l:std.length(c)}"#,774 r#"{"c": 128526,"l": 1}"#775 )776 }777778 #[test]779 fn json() {780 assert_json!(781 r#"std.manifestJsonEx({a:3, b:4, c:6},"")"#,782 r#""{\n\"a\": 3,\n\"b\": 4,\n\"c\": 6\n}""#783 );784 }785786 #[test]787 fn test() {788 assert_json!(789 r#"[[a, b] for a in [1,2,3] for b in [4,5,6]]"#,790 "[[1,4],[1,5],[1,6],[2,4],[2,5],[2,6],[3,4],[3,5],[3,6]]"791 );792 }793794 #[test]795 fn sjsonnet() {796 eval!(797 r#"798 local x0 = {k: 1};799 local x1 = {k: x0.k + x0.k};800 local x2 = {k: x1.k + x1.k};801 local x3 = {k: x2.k + x2.k};802 local x4 = {k: x3.k + x3.k};803 local x5 = {k: x4.k + x4.k};804 local x6 = {k: x5.k + x5.k};805 local x7 = {k: x6.k + x6.k};806 local x8 = {k: x7.k + x7.k};807 local x9 = {k: x8.k + x8.k};808 local x10 = {k: x9.k + x9.k};809 local x11 = {k: x10.k + x10.k};810 local x12 = {k: x11.k + x11.k};811 local x13 = {k: x12.k + x12.k};812 local x14 = {k: x13.k + x13.k};813 local x15 = {k: x14.k + x14.k};814 local x16 = {k: x15.k + x15.k};815 local x17 = {k: x16.k + x16.k};816 local x18 = {k: x17.k + x17.k};817 local x19 = {k: x18.k + x18.k};818 local x20 = {k: x19.k + x19.k};819 local x21 = {k: x20.k + x20.k};820 x21.k821 "#822 );823 }824825 // This test is commented out by default, because of huge compilation slowdown826 // #[bench]827 // fn bench_codegen(b: &mut Bencher) {828 // b.iter(|| {829 // #[allow(clippy::all)]830 // let stdlib = {831 // use jrsonnet_parser::*;832 // include!(concat!(env!("OUT_DIR"), "/stdlib.rs"))833 // };834 // stdlib835 // })836 // }837838 /*839 #[bench]840 fn bench_serialize(b: &mut Bencher) {841 b.iter(|| {842 bincode::deserialize::<jrsonnet_parser::LocExpr>(include_bytes!(concat!(843 env!("OUT_DIR"),844 "/stdlib.bincode"845 )))846 .expect("deserialize stdlib")847 })848 }849850 #[bench]851 fn bench_parse(b: &mut Bencher) {852 b.iter(|| {853 jrsonnet_parser::parse(854 jrsonnet_stdlib::STDLIB_STR,855 &jrsonnet_parser::ParserSettings {856 loc_data: true,857 file_name: Rc::new(PathBuf::from("std.jsonnet")),858 },859 )860 })861 }862 */863864 #[test]865 fn equality() {866 println!(867 "{:?}",868 jrsonnet_parser::parse(869 "{ x: 1, y: 2 } == { x: 1, y: 2 }",870 &ParserSettings::default()871 )872 );873 assert_eval!("{ x: 1, y: 2 } == { x: 1, y: 2 }")874 }875876 #[test]877 fn native_ext() -> crate::error::Result<()> {878 use super::native::NativeCallback;879 let evaluator = EvaluationState::default();880881 evaluator.with_stdlib();882 evaluator.settings_mut().ext_natives.insert(883 "native_add".into(),884 Rc::new(NativeCallback::new(885 ParamsDesc(Rc::new(vec![886 Param("a".into(), None),887 Param("b".into(), None),888 ])),889 |args| match (&args[0], &args[1]) {890 (Val::Num(a), Val::Num(b)) => Ok(Val::Num(a + b)),891 (_, _) => todo!(),892 },893 )),894 );895 evaluator.evaluate_snippet_raw(896 Rc::new(PathBuf::from("test.jsonnet")),897 "std.assertEqual(std.native(\"native_add\")(1, 2), 3)".into(),898 )?;899 Ok(())900 }901902 #[test]903 fn constant_intrinsic() -> crate::error::Result<()> {904 assert_eval!(905 "local std2 = std; local std = std2 { primitiveEquals(a, b):: false }; 1 == 1"906 );907 Ok(())908 }909910 struct TestImportResolver(IStr);911 impl crate::import::ImportResolver for TestImportResolver {912 fn resolve_file(&self, _: &PathBuf, _: &PathBuf) -> crate::error::Result<Rc<PathBuf>> {913 Ok(Rc::new(PathBuf::from("/test")))914 }915916 fn load_file_contents(&self, _: &PathBuf) -> crate::error::Result<IStr> {917 Ok(self.0.clone())918 }919920 unsafe fn as_any(&self) -> &dyn std::any::Any {921 panic!()922 }923 }924925 #[test]926 fn issue_23() {927 let state = EvaluationState::default();928 state.set_import_resolver(Box::new(TestImportResolver(r#"import "/test""#.into())));929 let _ = state.evaluate_file_raw(&PathBuf::from("/test"));930 }931}crates/jrsonnet-evaluator/src/typed.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/typed.rs
+++ b/crates/jrsonnet-evaluator/src/typed.rs
@@ -78,7 +78,7 @@
}
fn push_type(
- location: &Option<ExprLocation>,
+ location: Option<&ExprLocation>,
error_reason: impl Fn() -> String,
path: impl Fn() -> ValuePathItem,
item: impl Fn() -> Result<()>,
@@ -162,7 +162,7 @@
Val::Arr(a) => {
for (i, item) in a.iter().enumerate() {
push_type(
- &None,
+ None,
|| format!("array index {}", i),
|| ValuePathItem::Index(i as u64),
|| Ok(elem_type.check(&item.clone()?)?),
@@ -176,7 +176,7 @@
Val::Arr(a) => {
for (i, item) in a.iter().enumerate() {
push_type(
- &None,
+ None,
|| format!("array index {}", i),
|| ValuePathItem::Index(i as u64),
|| Ok(elem_type.check(&item.clone()?)?),
@@ -191,7 +191,7 @@
for (k, v) in elems.iter() {
if let Some(got_v) = obj.get((*k).into())? {
push_type(
- &None,
+ None,
|| format!("property {}", k),
|| ValuePathItem::Field((*k).into()),
|| v.check(&got_v),
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -102,7 +102,7 @@
pub fn evaluate(
&self,
call_ctx: Context,
- loc: &Option<ExprLocation>,
+ loc: Option<&ExprLocation>,
args: &ArgsDesc,
tailstrict: bool,
) -> Result<Val> {