difftreelog
fix clippy warnings
in: master
5 files changed
crates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -147,8 +147,8 @@
Ok(match (a, op, b) {
(a, BinaryOpType::Add, b) => evaluate_add_op(a, b)?,
- (a, BinaryOpType::Eq, b) => Val::Bool(equals(&a, &b)?),
- (a, BinaryOpType::Neq, b) => Val::Bool(!equals(&a, &b)?),
+ (a, BinaryOpType::Eq, b) => Val::Bool(equals(a, b)?),
+ (a, BinaryOpType::Neq, b) => Val::Bool(!equals(a, b)?),
(Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize).into()),
@@ -578,7 +578,7 @@
}
Intrinsic(name) => Val::Func(Rc::new(FuncVal::Intrinsic(name.clone()))),
AssertExpr(assert, returned) => {
- evaluate_assert(context.clone(), &assert)?;
+ evaluate_assert(context.clone(), assert)?;
evaluate(context, returned)?
}
ErrorStmt(e) => push(
crates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/integrations/serde.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/serde.rs
@@ -1,7 +1,6 @@
use crate::{
- Context,
error::{Error::*, LocError, Result},
- throw, LazyBinding, LazyVal, ObjMember, ObjValue, Val,
+ throw, Context, LazyBinding, LazyVal, ObjMember, ObjValue, Val,
};
use jrsonnet_parser::Visibility;
use rustc_hash::FxHasher;
@@ -77,7 +76,12 @@
},
);
}
- Self::Obj(ObjValue::new(Context::new(), None, Rc::new(entries), Rc::new(Vec::new())))
+ Self::Obj(ObjValue::new(
+ Context::new(),
+ None,
+ Rc::new(entries),
+ Rc::new(Vec::new()),
+ ))
}
}
}
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth1#![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))]2#![warn(clippy::all, clippy::nursery)]3#![allow(macro_expanded_macro_exports_accessed_by_absolute_paths, clippy::ptr_arg)]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;17pub mod 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 rustc_hash::FxHashMap;31use std::{32 cell::{Ref, RefCell, RefMut},33 collections::HashMap,34 fmt::Debug,35 hash::BuildHasherDefault,36 path::PathBuf,37 rc::Rc,38};39use trace::{offset_to_location, CodeLocation, CompactFormat, TraceFormat};40pub use val::*;4142type BindableFn = dyn Fn(Option<ObjValue>, Option<ObjValue>) -> Result<LazyVal>;43#[derive(Clone)]44pub enum LazyBinding {45 Bindable(Rc<BindableFn>),46 Bound(LazyVal),47}4849impl Debug for LazyBinding {50 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {51 write!(f, "LazyBinding")52 }53}54impl LazyBinding {55 pub fn evaluate(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {56 match self {57 Self::Bindable(v) => v(this, super_obj),58 Self::Bound(v) => Ok(v.clone()),59 }60 }61}6263pub struct EvaluationSettings {64 /// Limits recursion by limiting the number of stack frames65 pub max_stack: usize,66 /// Limits amount of stack trace items preserved67 pub max_trace: usize,68 /// Used for s`td.extVar`69 pub ext_vars: HashMap<IStr, Val>,70 /// Used for ext.native71 pub ext_natives: HashMap<IStr, Rc<NativeCallback>>,72 /// TLA vars73 pub tla_vars: HashMap<IStr, Val>,74 /// Global variables are inserted in default context75 pub globals: HashMap<IStr, Val>,76 /// Used to resolve file locations/contents77 pub import_resolver: Box<dyn ImportResolver>,78 /// Used in manifestification functions79 pub manifest_format: ManifestFormat,80 /// Used for bindings81 pub trace_format: Box<dyn TraceFormat>,82}83impl Default for EvaluationSettings {84 fn default() -> Self {85 Self {86 max_stack: 200,87 max_trace: 20,88 globals: Default::default(),89 ext_vars: Default::default(),90 ext_natives: Default::default(),91 tla_vars: Default::default(),92 import_resolver: Box::new(DummyImportResolver),93 manifest_format: ManifestFormat::Json(4),94 trace_format: Box::new(CompactFormat {95 padding: 4,96 resolver: trace::PathResolver::Absolute,97 }),98 }99 }100}101102#[derive(Default)]103struct EvaluationData {104 /// Used for stack overflow detection, stacktrace is populated on unwind105 stack_depth: usize,106 /// Contains file source codes and evaluation results for imports and pretty-printed stacktraces107 files: HashMap<Rc<PathBuf>, FileData>,108 str_files: HashMap<Rc<PathBuf>, IStr>,109}110111pub struct FileData {112 source_code: IStr,113 parsed: LocExpr,114 evaluated: Option<Val>,115}116#[derive(Default)]117pub struct EvaluationStateInternals {118 /// Internal state119 data: RefCell<EvaluationData>,120 /// Settings, safe to change at runtime121 settings: RefCell<EvaluationSettings>,122}123124thread_local! {125 /// Contains the state for a currently executed file.126 /// Global state is fine here.127 pub(crate) static EVAL_STATE: RefCell<Option<EvaluationState>> = RefCell::new(None)128}129pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {130 EVAL_STATE.with(|s| f(s.borrow().as_ref().unwrap()))131}132pub(crate) fn push<T>(133 e: Option<&ExprLocation>,134 frame_desc: impl FnOnce() -> String,135 f: impl FnOnce() -> Result<T>,136) -> Result<T> {137 with_state(|s| s.push(e, frame_desc, f))138}139140pub fn push_stack_frame<T>(141 e: Option<&ExprLocation>,142 frame_desc: impl FnOnce() -> String,143 f: impl FnOnce() -> Result<T>,144) -> Result<T> {145 push(e, frame_desc, f)146}147148/// Maintains stack trace and import resolution149#[derive(Default, Clone)]150pub struct EvaluationState(Rc<EvaluationStateInternals>);151152impl EvaluationState {153 /// Parses and adds file as loaded154 pub fn add_file(&self, path: Rc<PathBuf>, source_code: IStr) -> Result<()> {155 self.add_parsed_file(156 path.clone(),157 source_code.clone(),158 parse(159 &source_code,160 &ParserSettings {161 file_name: path.clone(),162 loc_data: true,163 },164 )165 .map_err(|error| ImportSyntaxError {166 error: Box::new(error),167 path,168 source_code,169 })?,170 )?;171172 Ok(())173 }174175 /// Adds file by source code and parsed expr176 pub fn add_parsed_file(177 &self,178 name: Rc<PathBuf>,179 source_code: IStr,180 parsed: LocExpr,181 ) -> Result<()> {182 self.data_mut().files.insert(183 name,184 FileData {185 source_code,186 parsed,187 evaluated: None,188 },189 );190191 Ok(())192 }193 pub fn get_source(&self, name: &PathBuf) -> Option<IStr> {194 let ro_map = &self.data().files;195 ro_map.get(name).map(|value| value.source_code.clone())196 }197 pub fn map_source_locations(&self, file: &PathBuf, locs: &[usize]) -> Vec<CodeLocation> {198 offset_to_location(&self.get_source(file).unwrap(), locs)199 }200201 pub(crate) fn import_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Val> {202 let file_path = self.resolve_file(from, path)?;203 {204 let data = self.data();205 let files = &data.files;206 if files.contains_key(&file_path) {207 drop(data);208 return self.evaluate_loaded_file_raw(&file_path);209 }210 }211 let contents = self.load_file_contents(&file_path)?;212 self.add_file(file_path.clone(), contents)?;213 self.evaluate_loaded_file_raw(&file_path)214 }215 pub(crate) fn import_file_str(&self, from: &PathBuf, path: &PathBuf) -> Result<IStr> {216 let path = self.resolve_file(from, path)?;217 if !self.data().str_files.contains_key(&path) {218 let file_str = self.load_file_contents(&path)?;219 self.data_mut().str_files.insert(path.clone(), file_str);220 }221 Ok(self.data().str_files.get(&path).cloned().unwrap())222 }223224 fn evaluate_loaded_file_raw(&self, name: &PathBuf) -> Result<Val> {225 let expr: LocExpr = {226 let ro_map = &self.data().files;227 let value = ro_map228 .get(name)229 .unwrap_or_else(|| panic!("file not added: {:?}", name));230 if let Some(ref evaluated) = value.evaluated {231 return Ok(evaluated.clone());232 }233 value.parsed.clone()234 };235 let value = evaluate(self.create_default_context(), &expr)?;236 {237 self.data_mut()238 .files239 .get_mut(name)240 .unwrap()241 .evaluated242 .replace(value.clone());243 }244 Ok(value)245 }246247 /// Adds standard library global variable (std) to this evaluator248 pub fn with_stdlib(&self) -> &Self {249 use jrsonnet_stdlib::STDLIB_STR;250 let std_path = Rc::new(PathBuf::from("std.jsonnet"));251 self.run_in_state(|| {252 self.add_parsed_file(253 std_path.clone(),254 STDLIB_STR.to_owned().into(),255 builtin::get_parsed_stdlib(),256 )257 .unwrap();258 let val = self.evaluate_loaded_file_raw(&std_path).unwrap();259 self.settings_mut().globals.insert("std".into(), val);260 });261 self262 }263264 /// Creates context with all passed global variables265 pub fn create_default_context(&self) -> Context {266 let globals = &self.settings().globals;267 let mut new_bindings: FxHashMap<IStr, LazyVal> =268 FxHashMap::with_capacity_and_hasher(globals.len(), BuildHasherDefault::default());269 for (name, value) in globals.iter() {270 new_bindings.insert(name.clone(), resolved_lazy_val!(value.clone()));271 }272 Context::new().extend_bound(new_bindings)273 }274275 /// Executes code creating a new stack frame276 pub fn push<T>(277 &self,278 e: Option<&ExprLocation>,279 frame_desc: impl FnOnce() -> String,280 f: impl FnOnce() -> Result<T>,281 ) -> Result<T> {282 {283 let mut data = self.data_mut();284 let stack_depth = &mut data.stack_depth;285 if *stack_depth > self.max_stack() {286 // Error creation uses data, so i drop guard here287 drop(data);288 throw!(StackOverflow);289 } else {290 *stack_depth += 1;291 }292 }293 let result = f();294 self.data_mut().stack_depth -= 1;295 if let Err(mut err) = result {296 err.trace_mut().0.push(StackTraceElement {297 location: e.cloned(),298 desc: frame_desc(),299 });300 return Err(err);301 }302 result303 }304305 /// Runs passed function in state (required if function needs to modify stack trace)306 pub fn run_in_state<T>(&self, f: impl FnOnce() -> T) -> T {307 EVAL_STATE.with(|v| {308 let has_state = v.borrow().is_some();309 if !has_state {310 v.borrow_mut().replace(self.clone());311 }312 let result = f();313 if !has_state {314 v.borrow_mut().take();315 }316 result317 })318 }319320 pub fn stringify_err(&self, e: &LocError) -> String {321 let mut out = String::new();322 self.settings()323 .trace_format324 .write_trace(&mut out, self, e)325 .unwrap();326 out327 }328329 pub fn manifest(&self, val: Val) -> Result<IStr> {330 self.run_in_state(|| val.manifest(&self.manifest_format()))331 }332 pub fn manifest_multi(&self, val: Val) -> Result<Vec<(IStr, IStr)>> {333 self.run_in_state(|| val.manifest_multi(&self.manifest_format()))334 }335 pub fn manifest_stream(&self, val: Val) -> Result<Vec<IStr>> {336 self.run_in_state(|| val.manifest_stream(&self.manifest_format()))337 }338339 /// If passed value is function then call with set TLA340 pub fn with_tla(&self, val: Val) -> Result<Val> {341 self.run_in_state(|| {342 Ok(match val {343 Val::Func(func) => push(344 None,345 || "during TLA call".to_owned(),346 || {347 func.evaluate_map(348 self.create_default_context(),349 &self.settings().tla_vars,350 true,351 )352 },353 )?,354 v => v,355 })356 })357 }358}359360/// Internals361impl EvaluationState {362 fn data(&self) -> Ref<EvaluationData> {363 self.0.data.borrow()364 }365 fn data_mut(&self) -> RefMut<EvaluationData> {366 self.0.data.borrow_mut()367 }368 pub fn settings(&self) -> Ref<EvaluationSettings> {369 self.0.settings.borrow()370 }371 pub fn settings_mut(&self) -> RefMut<EvaluationSettings> {372 self.0.settings.borrow_mut()373 }374}375376/// Raw methods evaluate passed values but don't perform TLA execution377impl EvaluationState {378 pub fn evaluate_file_raw(&self, name: &PathBuf) -> Result<Val> {379 self.run_in_state(|| self.import_file(&std::env::current_dir().expect("cwd"), name))380 }381 pub fn evaluate_file_raw_nocwd(&self, name: &PathBuf) -> Result<Val> {382 self.run_in_state(|| self.import_file(&PathBuf::from("."), name))383 }384 /// Parses and evaluates the given snippet385 pub fn evaluate_snippet_raw(&self, source: Rc<PathBuf>, code: IStr) -> Result<Val> {386 let parsed = parse(387 &code,388 &ParserSettings {389 file_name: source.clone(),390 loc_data: true,391 },392 )393 .map_err(|e| ImportSyntaxError {394 path: source.clone(),395 source_code: code.clone(),396 error: Box::new(e),397 })?;398 self.add_parsed_file(source, code, parsed.clone())?;399 self.evaluate_expr_raw(parsed)400 }401 /// Evaluates the parsed expression402 pub fn evaluate_expr_raw(&self, code: LocExpr) -> Result<Val> {403 self.run_in_state(|| evaluate(self.create_default_context(), &code))404 }405}406407/// Settings utilities408impl EvaluationState {409 pub fn add_ext_var(&self, name: IStr, value: Val) {410 self.settings_mut().ext_vars.insert(name, value);411 }412 pub fn add_ext_str(&self, name: IStr, value: IStr) {413 self.add_ext_var(name, Val::Str(value));414 }415 pub fn add_ext_code(&self, name: IStr, code: IStr) -> Result<()> {416 let value =417 self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("ext_code {}", name))), code)?;418 self.add_ext_var(name, value);419 Ok(())420 }421422 pub fn add_tla(&self, name: IStr, value: Val) {423 self.settings_mut().tla_vars.insert(name, value);424 }425 pub fn add_tla_str(&self, name: IStr, value: IStr) {426 self.add_tla(name, Val::Str(value));427 }428 pub fn add_tla_code(&self, name: IStr, code: IStr) -> Result<()> {429 let value =430 self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("tla_code {}", name))), code)?;431 self.add_tla(name, value);432 Ok(())433 }434435 pub fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {436 self.settings().import_resolver.resolve_file(from, path)437 }438 pub fn load_file_contents(&self, path: &PathBuf) -> Result<IStr> {439 self.settings().import_resolver.load_file_contents(path)440 }441442 pub fn import_resolver(&self) -> Ref<dyn ImportResolver> {443 Ref::map(self.settings(), |s| &*s.import_resolver)444 }445 pub fn set_import_resolver(&self, resolver: Box<dyn ImportResolver>) {446 self.settings_mut().import_resolver = resolver;447 }448449 pub fn add_native(&self, name: IStr, cb: Rc<NativeCallback>) {450 self.settings_mut().ext_natives.insert(name, cb);451 }452453 pub fn manifest_format(&self) -> ManifestFormat {454 self.settings().manifest_format.clone()455 }456 pub fn set_manifest_format(&self, format: ManifestFormat) {457 self.settings_mut().manifest_format = format;458 }459460 pub fn trace_format(&self) -> Ref<dyn TraceFormat> {461 Ref::map(self.settings(), |s| &*s.trace_format)462 }463 pub fn set_trace_format(&self, format: Box<dyn TraceFormat>) {464 self.settings_mut().trace_format = format;465 }466467 pub fn max_trace(&self) -> usize {468 self.settings().max_trace469 }470 pub fn set_max_trace(&self, trace: usize) {471 self.settings_mut().max_trace = trace;472 }473474 pub fn max_stack(&self) -> usize {475 self.settings().max_stack476 }477 pub fn set_max_stack(&self, trace: usize) {478 self.settings_mut().max_stack = trace;479 }480}481482#[cfg(test)]483pub mod tests {484 use super::Val;485 use crate::{error::Error::*, primitive_equals, EvaluationState};486 use jrsonnet_interner::IStr;487 use jrsonnet_parser::*;488 use std::{path::PathBuf, rc::Rc};489490 #[test]491 #[should_panic]492 fn eval_state_stacktrace() {493 let state = EvaluationState::default();494 state.run_in_state(|| {495 state496 .push(497 Some(&ExprLocation(498 Rc::new(PathBuf::from("test1.jsonnet")),499 10,500 20,501 )),502 || "outer".to_owned(),503 || {504 state.push(505 Some(&ExprLocation(506 Rc::new(PathBuf::from("test2.jsonnet")),507 30,508 40,509 )),510 || "inner".to_owned(),511 || Err(RuntimeError("".into()).into()),512 )?;513 Ok(())514 },515 )516 .unwrap();517 });518 }519520 #[test]521 fn eval_state_standard() {522 let state = EvaluationState::default();523 state.with_stdlib();524 assert!(primitive_equals(525 &state526 .evaluate_snippet_raw(527 Rc::new(PathBuf::from("raw.jsonnet")),528 r#"std.assertEqual(std.base64("test"), "dGVzdA==")"#.into()529 )530 .unwrap(),531 &Val::Bool(true),532 )533 .unwrap());534 }535536 macro_rules! eval {537 ($str: expr) => {538 EvaluationState::default()539 .with_stdlib()540 .evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())541 .unwrap()542 };543 }544 macro_rules! eval_json {545 ($str: expr) => {{546 let evaluator = EvaluationState::default();547 evaluator.with_stdlib();548 evaluator.run_in_state(|| {549 evaluator550 .evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())551 .unwrap()552 .to_json(0)553 .unwrap()554 .replace("\n", "")555 })556 }};557 }558559 /// Asserts given code returns `true`560 macro_rules! assert_eval {561 ($str: expr) => {562 assert!(primitive_equals(&eval!($str), &Val::Bool(true)).unwrap())563 };564 }565566 /// Asserts given code returns `false`567 macro_rules! assert_eval_neg {568 ($str: expr) => {569 assert!(primitive_equals(&eval!($str), &Val::Bool(false)).unwrap())570 };571 }572 macro_rules! assert_json {573 ($str: expr, $out: expr) => {574 assert_eq!(eval_json!($str), $out.replace("\t", ""))575 };576 }577578 /// Sanity checking, before trusting to another tests579 #[test]580 fn equality_operator() {581 assert_eval!("2 == 2");582 assert_eval_neg!("2 != 2");583 assert_eval!("2 != 3");584 assert_eval_neg!("2 == 3");585 assert_eval!("'Hello' == 'Hello'");586 assert_eval_neg!("'Hello' != 'Hello'");587 assert_eval!("'Hello' != 'World'");588 assert_eval_neg!("'Hello' == 'World'");589 }590591 #[test]592 fn math_evaluation() {593 assert_eval!("2 + 2 * 2 == 6");594 assert_eval!("3 + (2 + 2 * 2) == 9");595 }596597 #[test]598 fn string_concat() {599 assert_eval!("'Hello' + 'World' == 'HelloWorld'");600 assert_eval!("'Hello' * 3 == 'HelloHelloHello'");601 assert_eval!("'Hello' + 'World' * 3 == 'HelloWorldWorldWorld'");602 }603604 #[test]605 fn faster_join() {606 assert_eval!("std.join([0,0], [[1,2],[3,4],[5,6]]) == [1,2,0,0,3,4,0,0,5,6]");607 assert_eval!("std.join(',', ['1','2','3','4']) == '1,2,3,4'");608 }609610 #[test]611 fn function_contexts() {612 assert_eval!(613 r#"614 local k = {615 t(name = self.h): [self.h, name],616 h: 3,617 };618 local f = {619 t: k.t(),620 h: 4,621 };622 f.t[0] == f.t[1]623 "#624 );625 }626627 #[test]628 fn local() {629 assert_eval!("local a = 2; local b = 3; a + b == 5");630 assert_eval!("local a = 1, b = a + 1; a + b == 3");631 assert_eval!("local a = 1; local a = 2; a == 2");632 }633634 #[test]635 fn object_lazyness() {636 assert_json!("local a = {a:error 'test'}; {}", r#"{}"#);637 }638639 #[test]640 fn object_inheritance() {641 assert_json!("{a: self.b} + {b:3}", r#"{"a": 3,"b": 3}"#);642 }643644 #[test]645 fn object_assertion_success() {646 eval!("{assert \"a\" in self} + {a:2}");647 }648649 #[test]650 fn object_assertion_error() {651 eval!("{assert \"a\" in self}");652 }653654 #[test]655 fn lazy_args() {656 eval!("local test(a) = 2; test(error '3')");657 }658659 #[test]660 #[should_panic]661 fn tailstrict_args() {662 eval!("local test(a) = 2; test(error '3') tailstrict");663 }664665 #[test]666 #[should_panic]667 fn no_binding_error() {668 eval!("a");669 }670671 #[test]672 fn test_object() {673 assert_json!("{a:2}", r#"{"a": 2}"#);674 assert_json!("{a:2+2}", r#"{"a": 4}"#);675 assert_json!("{a:2}+{b:2}", r#"{"a": 2,"b": 2}"#);676 assert_json!("{b:3}+{b:2}", r#"{"b": 2}"#);677 assert_json!("{b:3}+{b+:2}", r#"{"b": 5}"#);678 assert_json!("local test='a'; {[test]:2}", r#"{"a": 2}"#);679 assert_json!(680 r#"681 {682 name: "Alice",683 welcome: "Hello " + self.name + "!",684 }685 "#,686 r#"{"name": "Alice","welcome": "Hello Alice!"}"#687 );688 assert_json!(689 r#"690 {691 name: "Alice",692 welcome: "Hello " + self.name + "!",693 } + {694 name: "Bob"695 }696 "#,697 r#"{"name": "Bob","welcome": "Hello Bob!"}"#698 );699 }700701 #[test]702 fn functions() {703 assert_json!(r#"local a = function(b, c = 2) b + c; a(2)"#, "4");704 assert_json!(705 r#"local a = function(b, c = "Dear") b + c + d, d = "World"; a("Hello")"#,706 r#""HelloDearWorld""#707 );708 }709710 #[test]711 fn local_methods() {712 assert_json!(r#"local a(b, c = 2) = b + c; a(2)"#, "4");713 assert_json!(714 r#"local a(b, c = "Dear") = b + c + d, d = "World"; a("Hello")"#,715 r#""HelloDearWorld""#716 );717 }718719 #[test]720 fn object_locals() {721 assert_json!(r#"{local a = 3, b: a}"#, r#"{"b": 3}"#);722 assert_json!(r#"{local a = 3, local c = a, b: c}"#, r#"{"b": 3}"#);723 assert_json!(724 r#"{local a = function (b) {[b]:4}, test: a("test")}"#,725 r#"{"test": {"test": 4}}"#726 );727 }728729 #[test]730 fn object_comp() {731 assert_json!(732 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}"#,733 "{\"h1_2\": \"0a\",\"h1_3\": \"0a\",\"h1_4\": \"0a\",\"h2_3\": \"a1\",\"h2_4\": \"a1\",\"h3_2\": \"0a\",\"h3_4\": \"a1\"}"734 )735 }736737 #[test]738 fn direct_self() {739 println!(740 "{:#?}",741 eval!(742 r#"743 {744 local me = self,745 a: 3,746 b(): me.a,747 }748 "#749 )750 );751 }752753 #[test]754 fn indirect_self() {755 // `self` assigned to `me` was lost when being756 // referenced from field757 eval!(758 r#"{759 local me = self,760 a: 3,761 b: me.a,762 }.b"#763 );764 }765766 // We can't trust other tests (And official jsonnet testsuite), if assert is not working correctly767 #[test]768 fn std_assert_ok() {769 eval!("std.assertEqual(4.5 << 2, 16)");770 }771772 #[test]773 #[should_panic]774 fn std_assert_failure() {775 eval!("std.assertEqual(4.5 << 2, 15)");776 }777778 #[test]779 fn string_is_string() {780 assert!(primitive_equals(781 &eval!("local arr = 'hello'; (!std.isArray(arr)) && (!std.isString(arr))"),782 &Val::Bool(false),783 )784 .unwrap());785 }786787 #[test]788 fn base64_works() {789 assert_json!(r#"std.base64("test")"#, r#""dGVzdA==""#);790 }791792 #[test]793 fn utf8_chars() {794 assert_json!(795 r#"local c="😎";{c:std.codepoint(c),l:std.length(c)}"#,796 r#"{"c": 128526,"l": 1}"#797 )798 }799800 #[test]801 fn json() {802 assert_json!(803 r#"std.manifestJsonEx({a:3, b:4, c:6},"")"#,804 r#""{\n\"a\": 3,\n\"b\": 4,\n\"c\": 6\n}""#805 );806 }807808 #[test]809 fn test() {810 assert_json!(811 r#"[[a, b] for a in [1,2,3] for b in [4,5,6]]"#,812 "[[1,4],[1,5],[1,6],[2,4],[2,5],[2,6],[3,4],[3,5],[3,6]]"813 );814 }815816 #[test]817 fn sjsonnet() {818 eval!(819 r#"820 local x0 = {k: 1};821 local x1 = {k: x0.k + x0.k};822 local x2 = {k: x1.k + x1.k};823 local x3 = {k: x2.k + x2.k};824 local x4 = {k: x3.k + x3.k};825 local x5 = {k: x4.k + x4.k};826 local x6 = {k: x5.k + x5.k};827 local x7 = {k: x6.k + x6.k};828 local x8 = {k: x7.k + x7.k};829 local x9 = {k: x8.k + x8.k};830 local x10 = {k: x9.k + x9.k};831 local x11 = {k: x10.k + x10.k};832 local x12 = {k: x11.k + x11.k};833 local x13 = {k: x12.k + x12.k};834 local x14 = {k: x13.k + x13.k};835 local x15 = {k: x14.k + x14.k};836 local x16 = {k: x15.k + x15.k};837 local x17 = {k: x16.k + x16.k};838 local x18 = {k: x17.k + x17.k};839 local x19 = {k: x18.k + x18.k};840 local x20 = {k: x19.k + x19.k};841 local x21 = {k: x20.k + x20.k};842 x21.k843 "#844 );845 }846847 // This test is commented out by default, because of huge compilation slowdown848 // #[bench]849 // fn bench_codegen(b: &mut Bencher) {850 // b.iter(|| {851 // #[allow(clippy::all)]852 // let stdlib = {853 // use jrsonnet_parser::*;854 // include!(concat!(env!("OUT_DIR"), "/stdlib.rs"))855 // };856 // stdlib857 // })858 // }859860 /*861 #[bench]862 fn bench_serialize(b: &mut Bencher) {863 b.iter(|| {864 bincode::deserialize::<jrsonnet_parser::LocExpr>(include_bytes!(concat!(865 env!("OUT_DIR"),866 "/stdlib.bincode"867 )))868 .expect("deserialize stdlib")869 })870 }871872 #[bench]873 fn bench_parse(b: &mut Bencher) {874 b.iter(|| {875 jrsonnet_parser::parse(876 jrsonnet_stdlib::STDLIB_STR,877 &jrsonnet_parser::ParserSettings {878 loc_data: true,879 file_name: Rc::new(PathBuf::from("std.jsonnet")),880 },881 )882 })883 }884 */885886 #[test]887 fn equality() {888 println!(889 "{:?}",890 jrsonnet_parser::parse(891 "{ x: 1, y: 2 } == { x: 1, y: 2 }",892 &ParserSettings::default()893 )894 );895 assert_eval!("{ x: 1, y: 2 } == { x: 1, y: 2 }")896 }897898 #[test]899 fn native_ext() -> crate::error::Result<()> {900 use super::native::NativeCallback;901 let evaluator = EvaluationState::default();902903 evaluator.with_stdlib();904 evaluator.settings_mut().ext_natives.insert(905 "native_add".into(),906 Rc::new(NativeCallback::new(907 ParamsDesc(Rc::new(vec![908 Param("a".into(), None),909 Param("b".into(), None),910 ])),911 |caller, args| {912 assert_eq!(913 caller.unwrap(),914 Rc::new(PathBuf::from("native_caller.jsonnet"))915 );916 match (&args[0], &args[1]) {917 (Val::Num(a), Val::Num(b)) => Ok(Val::Num(a + b)),918 (_, _) => unreachable!(),919 }920 },921 )),922 );923 evaluator.evaluate_snippet_raw(924 Rc::new(PathBuf::from("native_caller.jsonnet")),925 "std.assertEqual(std.native(\"native_add\")(1, 2), 3)".into(),926 )?;927 Ok(())928 }929930 #[test]931 fn constant_intrinsic() -> crate::error::Result<()> {932 assert_eval!(933 "local std2 = std; local std = std2 { primitiveEquals(a, b):: false }; 1 == 1"934 );935 Ok(())936 }937938 #[test]939 fn standalone_super() -> crate::error::Result<()> {940 assert_eval!(941 r#"942 local obj = {943 a: 1,944 b: 2,945 c: 3,946 };947 local test = obj + {948 fields: std.objectFields(super),949 d: 5,950 };951 test.fields == ['a', 'b', 'c']952 "#953 );954 Ok(())955 }956957 #[test]958 fn comp_self() -> crate::error::Result<()> {959 assert_eval!(960 r#"961 std.objectFields({962 a:{963 [name]: name for name in std.objectFields(self)964 },965 b: 2,966 c: 3,967 }.a) == ['a', 'b', 'c']968 "#969 );970971 Ok(())972 }973974 struct TestImportResolver(IStr);975 impl crate::import::ImportResolver for TestImportResolver {976 fn resolve_file(&self, _: &PathBuf, _: &PathBuf) -> crate::error::Result<Rc<PathBuf>> {977 Ok(Rc::new(PathBuf::from("/test")))978 }979980 fn load_file_contents(&self, _: &PathBuf) -> crate::error::Result<IStr> {981 Ok(self.0.clone())982 }983984 unsafe fn as_any(&self) -> &dyn std::any::Any {985 panic!()986 }987 }988989 #[test]990 fn issue_23() {991 let state = EvaluationState::default();992 state.set_import_resolver(Box::new(TestImportResolver(r#"import "/test""#.into())));993 let _ = state.evaluate_file_raw(&PathBuf::from("/test"));994 }995996 #[test]997 fn issue_40() {998 let state = EvaluationState::default();999 state.with_stdlib();10001001 let error = state.evaluate_snippet_raw(1002 Rc::new(PathBuf::from("issue40.jsonnet")),1003 r#"1004 local conf = {1005 n: ""1006 };1007 1008 local result = conf + {1009 assert std.isNumber(self.n): "is number"1010 };10111012 std.manifestJsonEx(result, "")1013 "#.into(),1014 ).unwrap_err();1015 assert_eq!(error.error().to_string(), "assert failed: is number");1016 }1017}crates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -1,6 +1,6 @@
-use crate::{Context, evaluate_add_op, evaluate_assert, LazyBinding, Result, Val};
+use crate::{evaluate_add_op, evaluate_assert, Context, LazyBinding, Result, Val};
use jrsonnet_interner::IStr;
-use jrsonnet_parser::{ExprLocation, LocExpr, Visibility, AssertStmt};
+use jrsonnet_parser::{AssertStmt, ExprLocation, Visibility};
use rustc_hash::{FxHashMap, FxHashSet};
use std::hash::{Hash, Hasher};
use std::{cell::RefCell, fmt::Debug, hash::BuildHasherDefault, rc::Rc};
@@ -54,7 +54,12 @@
}
impl ObjValue {
- pub fn new(context: Context, super_obj: Option<Self>, this_entries: Rc<FxHashMap<IStr, ObjMember>>, assertions: Rc<Vec<AssertStmt>>) -> Self {
+ pub fn new(
+ context: Context,
+ super_obj: Option<Self>,
+ this_entries: Rc<FxHashMap<IStr, ObjMember>>,
+ assertions: Rc<Vec<AssertStmt>>,
+ ) -> Self {
Self(Rc::new(ObjValueInternals {
context,
super_obj,
@@ -66,12 +71,27 @@
}))
}
pub fn new_empty() -> Self {
- Self::new(Context::new(), None, Rc::new(FxHashMap::default()), Rc::new(Vec::new()))
+ Self::new(
+ Context::new(),
+ None,
+ Rc::new(FxHashMap::default()),
+ Rc::new(Vec::new()),
+ )
}
pub fn extend_from(&self, super_obj: Self) -> Self {
match &self.0.super_obj {
- None => Self::new(self.0.context.clone(), Some(super_obj), self.0.this_entries.clone(), self.0.assertions.clone()),
- Some(v) => Self::new(self.0.context.clone(), Some(v.extend_from(super_obj)), self.0.this_entries.clone(), self.0.assertions.clone()),
+ None => Self::new(
+ self.0.context.clone(),
+ Some(super_obj),
+ self.0.this_entries.clone(),
+ self.0.assertions.clone(),
+ ),
+ Some(v) => Self::new(
+ self.0.context.clone(),
+ Some(v.extend_from(super_obj)),
+ self.0.this_entries.clone(),
+ self.0.assertions.clone(),
+ ),
}
}
pub fn with_this(&self, this_obj: Self) -> Self {
@@ -176,17 +196,22 @@
}
pub fn get(&self, key: IStr) -> Result<Option<Val>> {
- self.run_assertions(self.0.this_obj.as_ref().unwrap_or(self))?;
+ self.run_assertions()?;
self.get_raw(key, self.0.this_obj.as_ref())
}
pub fn extend_with_field(self, key: IStr, value: ObjMember) -> Self {
let mut new = FxHashMap::with_capacity_and_hasher(1, BuildHasherDefault::default());
new.insert(key, value);
- Self::new(Context::new(), Some(self), Rc::new(new), Rc::new(Vec::new()))
+ Self::new(
+ Context::new(),
+ Some(self),
+ Rc::new(new),
+ Rc::new(Vec::new()),
+ )
}
- pub fn get_raw(&self, key: IStr, real_this: Option<&Self>) -> Result<Option<Val>> {
+ fn get_raw(&self, key: IStr, real_this: Option<&Self>) -> Result<Option<Val>> {
let real_this = real_this.unwrap_or(self);
let cache_key = (key.clone(), real_this.clone());
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -124,7 +124,7 @@
for p in handler.params.0.iter() {
out_args.push(args.binding(p.0.clone())?.evaluate()?);
}
- Ok(handler.call(loc.clone().map(|l| l.0.clone()), &out_args)?)
+ Ok(handler.call(loc.map(|l| l.0.clone()), &out_args)?)
}
}
}