difftreelog
Merge branch 'master' into gc-v2
in: master
17 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -242,7 +242,6 @@
dependencies = [
"gc",
"jrsonnet-evaluator",
- "jrsonnet-interner",
"jrsonnet-parser",
]
bindings/jsonnet/Cargo.tomldiffbeforeafterboth--- a/bindings/jsonnet/Cargo.toml
+++ b/bindings/jsonnet/Cargo.toml
@@ -8,7 +8,6 @@
publish = false
[dependencies]
-jrsonnet-interner = { path = "../../crates/jrsonnet-interner", version = "0.3.8" }
jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.3.8" }
jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.3.8" }
gc = { version = "0.4.1", features = ["derive"] }
bindings/jsonnet/src/import.rsdiffbeforeafterboth--- a/bindings/jsonnet/src/import.rs
+++ b/bindings/jsonnet/src/import.rs
@@ -2,9 +2,8 @@
use jrsonnet_evaluator::{
error::{Error::*, Result},
- throw, EvaluationState, ImportResolver,
+ throw, EvaluationState, IStr, ImportResolver,
};
-use jrsonnet_interner::IStr;
use std::{
any::Any,
cell::RefCell,
@@ -13,7 +12,7 @@
fs::File,
io::Read,
os::raw::{c_char, c_int},
- path::PathBuf,
+ path::{Path, PathBuf},
ptr::null_mut,
rc::Rc,
};
@@ -34,7 +33,7 @@
out: RefCell<HashMap<PathBuf, IStr>>,
}
impl ImportResolver for CallbackImportResolver {
- fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {
+ fn resolve_file(&self, from: &Path, path: &Path) -> Result<Rc<Path>> {
let base = CString::new(from.to_str().unwrap()).unwrap().into_raw();
let rel = CString::new(path.to_str().unwrap()).unwrap().into_raw();
let found_here: *mut c_char = null_mut();
@@ -74,9 +73,9 @@
unsafe { CString::from_raw(result_ptr) };
}
- Ok(Rc::new(found_here_buf))
+ Ok(found_here_buf.into())
}
- fn load_file_contents(&self, resolved: &PathBuf) -> Result<IStr> {
+ fn load_file_contents(&self, resolved: &Path) -> Result<IStr> {
Ok(self.out.borrow().get(resolved).unwrap().clone())
}
unsafe fn as_any(&self) -> &dyn Any {
@@ -109,27 +108,27 @@
}
}
impl ImportResolver for NativeImportResolver {
- fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {
- let mut new_path = from.clone();
+ fn resolve_file(&self, from: &Path, path: &Path) -> Result<Rc<Path>> {
+ let mut new_path = from.to_owned();
new_path.push(path);
if new_path.exists() {
- Ok(Rc::new(new_path))
+ Ok(new_path.into())
} else {
for library_path in self.library_paths.borrow().iter() {
let mut cloned = library_path.clone();
cloned.push(path);
if cloned.exists() {
- return Ok(Rc::new(cloned));
+ return Ok(cloned.into());
}
}
- throw!(ImportFileNotFound(from.clone(), path.clone()))
+ throw!(ImportFileNotFound(from.to_owned(), path.to_owned()))
}
}
- fn load_file_contents(&self, id: &PathBuf) -> Result<IStr> {
- let mut file = File::open(id).map_err(|_e| ResolvedFileNotFound(id.clone()))?;
+ fn load_file_contents(&self, id: &Path) -> Result<IStr> {
+ let mut file = File::open(id).map_err(|_e| ResolvedFileNotFound(id.to_owned()))?;
let mut out = String::new();
file.read_to_string(&mut out)
- .map_err(|_e| ImportBadFileUtf8(id.clone()))?;
+ .map_err(|_e| ImportBadFileUtf8(id.to_owned()))?;
Ok(out.into())
}
unsafe fn as_any(&self) -> &dyn Any {
bindings/jsonnet/src/lib.rsdiffbeforeafterboth--- a/bindings/jsonnet/src/lib.rs
+++ b/bindings/jsonnet/src/lib.rs
@@ -9,14 +9,12 @@
pub mod vars_tlas;
use import::NativeImportResolver;
-use jrsonnet_evaluator::{EvaluationState, ManifestFormat, Val};
-use jrsonnet_interner::IStr;
+use jrsonnet_evaluator::{EvaluationState, IStr, ManifestFormat, Val};
use std::{
alloc::Layout,
ffi::{CStr, CString},
os::raw::{c_char, c_double, c_int, c_uint},
path::PathBuf,
- rc::Rc,
};
/// WASM stub
@@ -145,7 +143,7 @@
let snippet = CStr::from_ptr(snippet);
match vm
.evaluate_snippet_raw(
- Rc::new(PathBuf::from(filename.to_str().unwrap())),
+ PathBuf::from(filename.to_str().unwrap()).into(),
snippet.to_str().unwrap().into(),
)
.and_then(|v| vm.with_tla(v))
@@ -221,7 +219,7 @@
let snippet = CStr::from_ptr(snippet);
match vm
.evaluate_snippet_raw(
- Rc::new(PathBuf::from(filename.to_str().unwrap())),
+ PathBuf::from(filename.to_str().unwrap()).into(),
snippet.to_str().unwrap().into(),
)
.and_then(|v| vm.with_tla(v))
@@ -295,7 +293,7 @@
let snippet = CStr::from_ptr(snippet);
match vm
.evaluate_snippet_raw(
- Rc::new(PathBuf::from(filename.to_str().unwrap())),
+ PathBuf::from(filename.to_str().unwrap()).into(),
snippet.to_str().unwrap().into(),
)
.and_then(|v| vm.with_tla(v))
bindings/jsonnet/src/native.rsdiffbeforeafterboth--- a/bindings/jsonnet/src/native.rs
+++ b/bindings/jsonnet/src/native.rs
@@ -8,7 +8,7 @@
use std::{
ffi::{c_void, CStr},
os::raw::{c_char, c_int},
- path::PathBuf,
+ path::Path,
rc::Rc,
};
@@ -27,7 +27,7 @@
unsafe_empty_trace!();
}
impl NativeCallbackHandler for JsonnetNativeCallbackHandler {
- fn call(&self, _from: Option<Rc<PathBuf>>, args: &[Val]) -> Result<Val, LocError> {
+ fn call(&self, _from: Option<Rc<Path>>, args: &[Val]) -> Result<Val, LocError> {
let mut n_args = Vec::new();
for a in args {
n_args.push(Some(Box::new(a.clone())));
cmds/jrsonnet/src/main.rsdiffbeforeafterboth--- a/cmds/jrsonnet/src/main.rs
+++ b/cmds/jrsonnet/src/main.rs
@@ -6,7 +6,6 @@
io::Read,
io::Write,
path::PathBuf,
- rc::Rc,
str::FromStr,
};
@@ -134,14 +133,14 @@
let val = if opts.input.exec {
state.set_manifest_format(ManifestFormat::ToString);
state.evaluate_snippet_raw(
- Rc::new(PathBuf::from("args")),
+ PathBuf::from("args").into(),
(&opts.input.input as &str).into(),
)?
} else if opts.input.input == "-" {
let mut input = Vec::new();
std::io::stdin().read_to_end(&mut input)?;
let input_str = std::str::from_utf8(&input)?.into();
- state.evaluate_snippet_raw(Rc::new(PathBuf::from("<stdin>")), input_str)?
+ state.evaluate_snippet_raw(PathBuf::from("<stdin>").into(), input_str)?
} else {
state.evaluate_file_raw(&PathBuf::from(opts.input.input))?
};
crates/jrsonnet-evaluator/build.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/build.rs
+++ b/crates/jrsonnet-evaluator/build.rs
@@ -15,7 +15,7 @@
let parsed = parse(
STDLIB_STR,
&ParserSettings {
- file_name: Rc::new(PathBuf::from("std.jsonnet")),
+ file_name: PathBuf::from("std.jsonnet").into(),
loc_data: true,
},
)
crates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -177,7 +177,7 @@
0, s: ty!(string) => Val::Str;
], {
let state = EvaluationState::default();
- let path = Rc::new(PathBuf::from("std.parseJson"));
+ let path = PathBuf::from("std.parseJson").into();
state.evaluate_snippet_raw(path ,s)
})
}
crates/jrsonnet-evaluator/src/builtin/stdlib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/stdlib.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/stdlib.rs
@@ -1,5 +1,5 @@
use jrsonnet_parser::{LocExpr, ParserSettings};
-use std::{path::PathBuf, rc::Rc};
+use std::path::PathBuf;
thread_local! {
/// To avoid parsing again when issued from the same thread
@@ -25,7 +25,7 @@
jrsonnet_stdlib::STDLIB_STR,
&ParserSettings {
loc_data: true,
- file_name: Rc::new(PathBuf::from("std.jsonnet")),
+ file_name: PathBuf::from("std.jsonnet").into(),
},
)
.unwrap()
crates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -6,7 +6,10 @@
use jrsonnet_interner::IStr;
use jrsonnet_parser::{BinaryOpType, ExprLocation, UnaryOpType};
use jrsonnet_types::ValType;
-use std::{path::PathBuf, rc::Rc};
+use std::{
+ path::{Path, PathBuf},
+ rc::Rc,
+};
use thiserror::Error;
#[derive(Error, Debug, Clone, Trace, Finalize)]
@@ -87,7 +90,7 @@
.source_code.chars().nth(error.location.offset).map(|c| c.to_string()).unwrap_or_else(|| "EOF".into())
)]
ImportSyntaxError {
- path: Rc<PathBuf>,
+ path: Rc<Path>,
source_code: IStr,
#[unsafe_ignore_trace]
error: Box<jrsonnet_parser::ParseError>,
crates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -12,7 +12,7 @@
};
use jrsonnet_types::ValType;
use rustc_hash::{FxHashMap, FxHasher};
-use std::{collections::HashMap, hash::BuildHasherDefault, rc::Rc};
+use std::{collections::HashMap, hash::BuildHasherDefault};
pub fn evaluate_binding_in_future(
b: &BindSpec,
@@ -843,26 +843,26 @@
}
}
Import(path) => {
- let mut tmp = loc
+ let tmp = loc
.clone()
.expect("imports cannot be used without loc_data")
.0;
- let import_location = Rc::make_mut(&mut tmp);
+ let mut import_location = tmp.to_path_buf();
import_location.pop();
push(
loc.as_ref(),
|| format!("import {:?}", path),
- || with_state(|s| s.import_file(import_location, path)),
+ || with_state(|s| s.import_file(&import_location, path)),
)?
}
ImportStr(path) => {
- let mut tmp = loc
+ let tmp = loc
.clone()
.expect("imports cannot be used without loc_data")
.0;
- let import_location = Rc::make_mut(&mut tmp);
+ let mut import_location = tmp.to_path_buf();
import_location.pop();
- Val::Str(with_state(|s| s.import_file_str(import_location, path))?)
+ Val::Str(with_state(|s| s.import_file_str(&import_location, path))?)
}
})
}
crates/jrsonnet-evaluator/src/import.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/import.rs
+++ b/crates/jrsonnet-evaluator/src/import.rs
@@ -6,17 +6,23 @@
use jrsonnet_interner::IStr;
use std::fs;
use std::io::Read;
-use std::{any::Any, cell::RefCell, collections::HashMap, path::PathBuf, rc::Rc};
+use std::{
+ any::Any,
+ cell::RefCell,
+ collections::HashMap,
+ path::{Path, PathBuf},
+ rc::Rc,
+};
/// Implements file resolution logic for `import` and `importStr`
pub trait ImportResolver {
/// Resolves real file path, e.g. `(/home/user/manifests, b.libjsonnet)` can correspond
/// both to `/home/user/manifests/b.libjsonnet` and to `/home/user/${vendor}/b.libjsonnet`
/// where `${vendor}` is a library path.
- fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>>;
+ fn resolve_file(&self, from: &Path, path: &Path) -> Result<Rc<Path>>;
/// Reads file from filesystem, should be used only with path received from `resolve_file`
- fn load_file_contents(&self, resolved: &PathBuf) -> Result<IStr>;
+ fn load_file_contents(&self, resolved: &Path) -> Result<IStr>;
/// # Safety
///
@@ -29,11 +35,11 @@
/// Dummy resolver, can't resolve/load any file
pub struct DummyImportResolver;
impl ImportResolver for DummyImportResolver {
- fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {
- throw!(ImportNotSupported(from.clone(), path.clone()))
+ fn resolve_file(&self, from: &Path, path: &Path) -> Result<Rc<Path>> {
+ throw!(ImportNotSupported(from.into(), path.into()))
}
- fn load_file_contents(&self, _resolved: &PathBuf) -> Result<IStr> {
+ fn load_file_contents(&self, _resolved: &Path) -> Result<IStr> {
// Can be only caused by library direct consumer, not by supplied jsonnet
panic!("dummy resolver can't load any file")
}
@@ -57,27 +63,27 @@
pub library_paths: Vec<PathBuf>,
}
impl ImportResolver for FileImportResolver {
- fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {
- let mut new_path = from.clone();
- new_path.push(path);
- if new_path.exists() {
- Ok(Rc::new(new_path))
+ fn resolve_file(&self, from: &Path, path: &Path) -> Result<Rc<Path>> {
+ let mut direct = from.to_path_buf();
+ direct.push(path);
+ if direct.exists() {
+ Ok(direct.into())
} else {
for library_path in self.library_paths.iter() {
let mut cloned = library_path.clone();
cloned.push(path);
if cloned.exists() {
- return Ok(Rc::new(cloned));
+ return Ok(cloned.into());
}
}
- throw!(ImportFileNotFound(from.clone(), path.clone()))
+ throw!(ImportFileNotFound(from.to_owned(), path.to_owned()))
}
}
- fn load_file_contents(&self, id: &PathBuf) -> Result<IStr> {
- let mut file = File::open(id).map_err(|_e| ResolvedFileNotFound(id.clone()))?;
+ fn load_file_contents(&self, id: &Path) -> Result<IStr> {
+ let mut file = File::open(id).map_err(|_e| ResolvedFileNotFound(id.to_owned()))?;
let mut out = String::new();
file.read_to_string(&mut out)
- .map_err(|_e| ImportBadFileUtf8(id.clone()))?;
+ .map_err(|_e| ImportBadFileUtf8(id.to_owned()))?;
Ok(out.into())
}
unsafe fn as_any(&self) -> &dyn Any {
@@ -89,23 +95,23 @@
/// Caches results of the underlying resolver
pub struct CachingImportResolver {
- resolution_cache: RefCell<HashMap<ResolutionData, Result<Rc<PathBuf>>>>,
+ resolution_cache: RefCell<HashMap<ResolutionData, Result<Rc<Path>>>>,
loading_cache: RefCell<HashMap<PathBuf, Result<IStr>>>,
inner: Box<dyn ImportResolver>,
}
impl ImportResolver for CachingImportResolver {
- fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {
+ fn resolve_file(&self, from: &Path, path: &Path) -> Result<Rc<Path>> {
self.resolution_cache
.borrow_mut()
- .entry((from.clone(), path.clone()))
+ .entry((from.to_owned(), path.to_owned()))
.or_insert_with(|| self.inner.resolve_file(from, path))
.clone()
}
- fn load_file_contents(&self, resolved: &PathBuf) -> Result<IStr> {
+ fn load_file_contents(&self, resolved: &Path) -> Result<IStr> {
self.loading_cache
.borrow_mut()
- .entry(resolved.clone())
+ .entry(resolved.to_owned())
.or_insert_with(|| self.inner.load_file_contents(resolved))
.clone()
}
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth1#![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))]2#![warn(clippy::all, clippy::nursery)]3#![allow(4 macro_expanded_macro_exports_accessed_by_absolute_paths,5 clippy::ptr_arg6)]78mod builtin;9mod ctx;10mod dynamic;11pub mod error;12mod evaluate;13mod function;14mod import;15mod integrations;16mod map;17pub mod native;18mod obj;19pub mod trace;20pub mod typed;21mod val;2223pub use ctx::*;24pub use dynamic::*;25use error::{Error::*, LocError, Result, StackTraceElement};26pub use evaluate::*;27pub use function::parse_function_call;28use gc::{Finalize, Gc, Trace};29pub use import::*;30use jrsonnet_interner::IStr;31use jrsonnet_parser::*;32use native::NativeCallback;33pub use obj::*;34use rustc_hash::FxHashMap;35use std::{36 cell::{Ref, RefCell, RefMut},37 collections::HashMap,38 fmt::Debug,39 hash::BuildHasherDefault,40 path::PathBuf,41 rc::Rc,42};43use trace::{offset_to_location, CodeLocation, CompactFormat, TraceFormat};44pub use val::*;4546pub trait Bindable: Trace {47 fn bind(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal>;48}49#[derive(Trace, Finalize, Clone)]50pub enum LazyBinding {51 Bindable(Gc<Box<dyn Bindable>>),52 Bound(LazyVal),53}5455impl Debug for LazyBinding {56 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {57 write!(f, "LazyBinding")58 }59}60impl LazyBinding {61 pub fn evaluate(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {62 match self {63 Self::Bindable(v) => v.bind(this, super_obj),64 Self::Bound(v) => Ok(v.clone()),65 }66 }67}6869pub struct EvaluationSettings {70 /// Limits recursion by limiting the number of stack frames71 pub max_stack: usize,72 /// Limits amount of stack trace items preserved73 pub max_trace: usize,74 /// Used for s`td.extVar`75 pub ext_vars: HashMap<IStr, Val>,76 /// Used for ext.native77 pub ext_natives: HashMap<IStr, Gc<NativeCallback>>,78 /// TLA vars79 pub tla_vars: HashMap<IStr, Val>,80 /// Global variables are inserted in default context81 pub globals: HashMap<IStr, Val>,82 /// Used to resolve file locations/contents83 pub import_resolver: Box<dyn ImportResolver>,84 /// Used in manifestification functions85 pub manifest_format: ManifestFormat,86 /// Used for bindings87 pub trace_format: Box<dyn TraceFormat>,88}89impl Default for EvaluationSettings {90 fn default() -> Self {91 Self {92 max_stack: 200,93 max_trace: 20,94 globals: Default::default(),95 ext_vars: Default::default(),96 ext_natives: Default::default(),97 tla_vars: Default::default(),98 import_resolver: Box::new(DummyImportResolver),99 manifest_format: ManifestFormat::Json(4),100 trace_format: Box::new(CompactFormat {101 padding: 4,102 resolver: trace::PathResolver::Absolute,103 }),104 }105 }106}107108#[derive(Default)]109struct EvaluationData {110 /// Used for stack overflow detection, stacktrace is populated on unwind111 stack_depth: usize,112 /// Contains file source codes and evaluation results for imports and pretty-printed stacktraces113 files: HashMap<Rc<PathBuf>, FileData>,114 str_files: HashMap<Rc<PathBuf>, IStr>,115}116117pub struct FileData {118 source_code: IStr,119 parsed: LocExpr,120 evaluated: Option<Val>,121}122#[derive(Default)]123pub struct EvaluationStateInternals {124 /// Internal state125 data: RefCell<EvaluationData>,126 /// Settings, safe to change at runtime127 settings: RefCell<EvaluationSettings>,128}129130thread_local! {131 /// Contains the state for a currently executed file.132 /// Global state is fine here.133 pub(crate) static EVAL_STATE: RefCell<Option<EvaluationState>> = RefCell::new(None)134}135pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {136 EVAL_STATE.with(|s| f(s.borrow().as_ref().unwrap()))137}138pub(crate) fn push<T>(139 e: Option<&ExprLocation>,140 frame_desc: impl FnOnce() -> String,141 f: impl FnOnce() -> Result<T>,142) -> Result<T> {143 with_state(|s| s.push(e, frame_desc, f))144}145146pub fn push_stack_frame<T>(147 e: Option<&ExprLocation>,148 frame_desc: impl FnOnce() -> String,149 f: impl FnOnce() -> Result<T>,150) -> Result<T> {151 push(e, frame_desc, f)152}153154/// Maintains stack trace and import resolution155#[derive(Default, Clone)]156pub struct EvaluationState(Rc<EvaluationStateInternals>);157158impl EvaluationState {159 /// Parses and adds file as loaded160 pub fn add_file(&self, path: Rc<PathBuf>, source_code: IStr) -> Result<()> {161 self.add_parsed_file(162 path.clone(),163 source_code.clone(),164 parse(165 &source_code,166 &ParserSettings {167 file_name: path.clone(),168 loc_data: true,169 },170 )171 .map_err(|error| ImportSyntaxError {172 error: Box::new(error),173 path,174 source_code,175 })?,176 )?;177178 Ok(())179 }180181 /// Adds file by source code and parsed expr182 pub fn add_parsed_file(183 &self,184 name: Rc<PathBuf>,185 source_code: IStr,186 parsed: LocExpr,187 ) -> Result<()> {188 self.data_mut().files.insert(189 name,190 FileData {191 source_code,192 parsed,193 evaluated: None,194 },195 );196197 Ok(())198 }199 pub fn get_source(&self, name: &PathBuf) -> Option<IStr> {200 let ro_map = &self.data().files;201 ro_map.get(name).map(|value| value.source_code.clone())202 }203 pub fn map_source_locations(&self, file: &PathBuf, locs: &[usize]) -> Vec<CodeLocation> {204 offset_to_location(&self.get_source(file).unwrap(), locs)205 }206207 pub(crate) fn import_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Val> {208 let file_path = self.resolve_file(from, path)?;209 {210 let data = self.data();211 let files = &data.files;212 if files.contains_key(&file_path) {213 drop(data);214 return self.evaluate_loaded_file_raw(&file_path);215 }216 }217 let contents = self.load_file_contents(&file_path)?;218 self.add_file(file_path.clone(), contents)?;219 self.evaluate_loaded_file_raw(&file_path)220 }221 pub(crate) fn import_file_str(&self, from: &PathBuf, path: &PathBuf) -> Result<IStr> {222 let path = self.resolve_file(from, path)?;223 if !self.data().str_files.contains_key(&path) {224 let file_str = self.load_file_contents(&path)?;225 self.data_mut().str_files.insert(path.clone(), file_str);226 }227 Ok(self.data().str_files.get(&path).cloned().unwrap())228 }229230 fn evaluate_loaded_file_raw(&self, name: &PathBuf) -> Result<Val> {231 let expr: LocExpr = {232 let ro_map = &self.data().files;233 let value = ro_map234 .get(name)235 .unwrap_or_else(|| panic!("file not added: {:?}", name));236 if let Some(ref evaluated) = value.evaluated {237 return Ok(evaluated.clone());238 }239 value.parsed.clone()240 };241 let value = evaluate(self.create_default_context(), &expr)?;242 {243 self.data_mut()244 .files245 .get_mut(name)246 .unwrap()247 .evaluated248 .replace(value.clone());249 }250 Ok(value)251 }252253 /// Adds standard library global variable (std) to this evaluator254 pub fn with_stdlib(&self) -> &Self {255 use jrsonnet_stdlib::STDLIB_STR;256 let std_path = Rc::new(PathBuf::from("std.jsonnet"));257 self.run_in_state(|| {258 self.add_parsed_file(259 std_path.clone(),260 STDLIB_STR.to_owned().into(),261 builtin::get_parsed_stdlib(),262 )263 .unwrap();264 let val = self.evaluate_loaded_file_raw(&std_path).unwrap();265 self.settings_mut().globals.insert("std".into(), val);266 });267 self268 }269270 /// Creates context with all passed global variables271 pub fn create_default_context(&self) -> Context {272 let globals = &self.settings().globals;273 let mut new_bindings: FxHashMap<IStr, LazyVal> =274 FxHashMap::with_capacity_and_hasher(globals.len(), BuildHasherDefault::default());275 for (name, value) in globals.iter() {276 new_bindings.insert(name.clone(), LazyVal::new_resolved(value.clone()));277 }278 Context::new().extend_bound(new_bindings)279 }280281 /// Executes code creating a new stack frame282 pub fn push<T>(283 &self,284 e: Option<&ExprLocation>,285 frame_desc: impl FnOnce() -> String,286 f: impl FnOnce() -> Result<T>,287 ) -> Result<T> {288 {289 let mut data = self.data_mut();290 let stack_depth = &mut data.stack_depth;291 if *stack_depth > self.max_stack() {292 // Error creation uses data, so i drop guard here293 drop(data);294 throw!(StackOverflow);295 } else {296 *stack_depth += 1;297 }298 }299 let result = f();300 self.data_mut().stack_depth -= 1;301 if let Err(mut err) = result {302 err.trace_mut().0.push(StackTraceElement {303 location: e.cloned(),304 desc: frame_desc(),305 });306 return Err(err);307 }308 result309 }310311 /// Runs passed function in state (required if function needs to modify stack trace)312 pub fn run_in_state<T>(&self, f: impl FnOnce() -> T) -> T {313 EVAL_STATE.with(|v| {314 let has_state = v.borrow().is_some();315 if !has_state {316 v.borrow_mut().replace(self.clone());317 }318 let result = f();319 if !has_state {320 v.borrow_mut().take();321 }322 result323 })324 }325326 pub fn stringify_err(&self, e: &LocError) -> String {327 let mut out = String::new();328 self.settings()329 .trace_format330 .write_trace(&mut out, self, e)331 .unwrap();332 out333 }334335 pub fn manifest(&self, val: Val) -> Result<IStr> {336 self.run_in_state(|| val.manifest(&self.manifest_format()))337 }338 pub fn manifest_multi(&self, val: Val) -> Result<Vec<(IStr, IStr)>> {339 self.run_in_state(|| val.manifest_multi(&self.manifest_format()))340 }341 pub fn manifest_stream(&self, val: Val) -> Result<Vec<IStr>> {342 self.run_in_state(|| val.manifest_stream(&self.manifest_format()))343 }344345 /// If passed value is function then call with set TLA346 pub fn with_tla(&self, val: Val) -> Result<Val> {347 self.run_in_state(|| {348 Ok(match val {349 Val::Func(func) => push(350 None,351 || "during TLA call".to_owned(),352 || {353 func.evaluate_map(354 self.create_default_context(),355 &self.settings().tla_vars,356 true,357 )358 },359 )?,360 v => v,361 })362 })363 }364}365366/// Internals367impl EvaluationState {368 fn data(&self) -> Ref<EvaluationData> {369 self.0.data.borrow()370 }371 fn data_mut(&self) -> RefMut<EvaluationData> {372 self.0.data.borrow_mut()373 }374 pub fn settings(&self) -> Ref<EvaluationSettings> {375 self.0.settings.borrow()376 }377 pub fn settings_mut(&self) -> RefMut<EvaluationSettings> {378 self.0.settings.borrow_mut()379 }380}381382/// Raw methods evaluate passed values but don't perform TLA execution383impl EvaluationState {384 pub fn evaluate_file_raw(&self, name: &PathBuf) -> Result<Val> {385 self.run_in_state(|| self.import_file(&std::env::current_dir().expect("cwd"), name))386 }387 pub fn evaluate_file_raw_nocwd(&self, name: &PathBuf) -> Result<Val> {388 self.run_in_state(|| self.import_file(&PathBuf::from("."), name))389 }390 /// Parses and evaluates the given snippet391 pub fn evaluate_snippet_raw(&self, source: Rc<PathBuf>, code: IStr) -> Result<Val> {392 let parsed = parse(393 &code,394 &ParserSettings {395 file_name: source.clone(),396 loc_data: true,397 },398 )399 .map_err(|e| ImportSyntaxError {400 path: source.clone(),401 source_code: code.clone(),402 error: Box::new(e),403 })?;404 self.add_parsed_file(source, code, parsed.clone())?;405 self.evaluate_expr_raw(parsed)406 }407 /// Evaluates the parsed expression408 pub fn evaluate_expr_raw(&self, code: LocExpr) -> Result<Val> {409 self.run_in_state(|| evaluate(self.create_default_context(), &code))410 }411}412413/// Settings utilities414impl EvaluationState {415 pub fn add_ext_var(&self, name: IStr, value: Val) {416 self.settings_mut().ext_vars.insert(name, value);417 }418 pub fn add_ext_str(&self, name: IStr, value: IStr) {419 self.add_ext_var(name, Val::Str(value));420 }421 pub fn add_ext_code(&self, name: IStr, code: IStr) -> Result<()> {422 let value =423 self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("ext_code {}", name))), code)?;424 self.add_ext_var(name, value);425 Ok(())426 }427428 pub fn add_tla(&self, name: IStr, value: Val) {429 self.settings_mut().tla_vars.insert(name, value);430 }431 pub fn add_tla_str(&self, name: IStr, value: IStr) {432 self.add_tla(name, Val::Str(value));433 }434 pub fn add_tla_code(&self, name: IStr, code: IStr) -> Result<()> {435 let value =436 self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("tla_code {}", name))), code)?;437 self.add_tla(name, value);438 Ok(())439 }440441 pub fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {442 self.settings().import_resolver.resolve_file(from, path)443 }444 pub fn load_file_contents(&self, path: &PathBuf) -> Result<IStr> {445 self.settings().import_resolver.load_file_contents(path)446 }447448 pub fn import_resolver(&self) -> Ref<dyn ImportResolver> {449 Ref::map(self.settings(), |s| &*s.import_resolver)450 }451 pub fn set_import_resolver(&self, resolver: Box<dyn ImportResolver>) {452 self.settings_mut().import_resolver = resolver;453 }454455 pub fn add_native(&self, name: IStr, cb: Gc<NativeCallback>) {456 self.settings_mut().ext_natives.insert(name, cb);457 }458459 pub fn manifest_format(&self) -> ManifestFormat {460 self.settings().manifest_format.clone()461 }462 pub fn set_manifest_format(&self, format: ManifestFormat) {463 self.settings_mut().manifest_format = format;464 }465466 pub fn trace_format(&self) -> Ref<dyn TraceFormat> {467 Ref::map(self.settings(), |s| &*s.trace_format)468 }469 pub fn set_trace_format(&self, format: Box<dyn TraceFormat>) {470 self.settings_mut().trace_format = format;471 }472473 pub fn max_trace(&self) -> usize {474 self.settings().max_trace475 }476 pub fn set_max_trace(&self, trace: usize) {477 self.settings_mut().max_trace = trace;478 }479480 pub fn max_stack(&self) -> usize {481 self.settings().max_stack482 }483 pub fn set_max_stack(&self, trace: usize) {484 self.settings_mut().max_stack = trace;485 }486}487488#[cfg(test)]489pub mod tests {490 use super::Val;491 use crate::{492 error::Error::*, native::NativeCallbackHandler, primitive_equals, EvaluationState,493 };494 use gc::Gc;495 use jrsonnet_interner::IStr;496 use jrsonnet_parser::*;497 use std::{path::PathBuf, rc::Rc};498499 #[test]500 #[should_panic]501 fn eval_state_stacktrace() {502 let state = EvaluationState::default();503 state.run_in_state(|| {504 state505 .push(506 Some(&ExprLocation(507 Rc::new(PathBuf::from("test1.jsonnet")),508 10,509 20,510 )),511 || "outer".to_owned(),512 || {513 state.push(514 Some(&ExprLocation(515 Rc::new(PathBuf::from("test2.jsonnet")),516 30,517 40,518 )),519 || "inner".to_owned(),520 || Err(RuntimeError("".into()).into()),521 )?;522 Ok(())523 },524 )525 .unwrap();526 });527 }528529 #[test]530 fn eval_state_standard() {531 let state = EvaluationState::default();532 state.with_stdlib();533 assert!(primitive_equals(534 &state535 .evaluate_snippet_raw(536 Rc::new(PathBuf::from("raw.jsonnet")),537 r#"std.assertEqual(std.base64("test"), "dGVzdA==")"#.into()538 )539 .unwrap(),540 &Val::Bool(true),541 )542 .unwrap());543 }544545 macro_rules! eval {546 ($str: expr) => {547 EvaluationState::default()548 .with_stdlib()549 .evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())550 .unwrap()551 };552 }553 macro_rules! eval_json {554 ($str: expr) => {{555 let evaluator = EvaluationState::default();556 evaluator.with_stdlib();557 evaluator.run_in_state(|| {558 evaluator559 .evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())560 .unwrap()561 .to_json(0)562 .unwrap()563 .replace("\n", "")564 })565 }};566 }567568 /// Asserts given code returns `true`569 macro_rules! assert_eval {570 ($str: expr) => {571 assert!(primitive_equals(&eval!($str), &Val::Bool(true)).unwrap())572 };573 }574575 /// Asserts given code returns `false`576 macro_rules! assert_eval_neg {577 ($str: expr) => {578 assert!(primitive_equals(&eval!($str), &Val::Bool(false)).unwrap())579 };580 }581 macro_rules! assert_json {582 ($str: expr, $out: expr) => {583 assert_eq!(eval_json!($str), $out.replace("\t", ""))584 };585 }586587 /// Sanity checking, before trusting to another tests588 #[test]589 fn equality_operator() {590 assert_eval!("2 == 2");591 assert_eval_neg!("2 != 2");592 assert_eval!("2 != 3");593 assert_eval_neg!("2 == 3");594 assert_eval!("'Hello' == 'Hello'");595 assert_eval_neg!("'Hello' != 'Hello'");596 assert_eval!("'Hello' != 'World'");597 assert_eval_neg!("'Hello' == 'World'");598 }599600 #[test]601 fn math_evaluation() {602 assert_eval!("2 + 2 * 2 == 6");603 assert_eval!("3 + (2 + 2 * 2) == 9");604 }605606 #[test]607 fn string_concat() {608 assert_eval!("'Hello' + 'World' == 'HelloWorld'");609 assert_eval!("'Hello' * 3 == 'HelloHelloHello'");610 assert_eval!("'Hello' + 'World' * 3 == 'HelloWorldWorldWorld'");611 }612613 #[test]614 fn faster_join() {615 assert_eval!("std.join([0,0], [[1,2],[3,4],[5,6]]) == [1,2,0,0,3,4,0,0,5,6]");616 assert_eval!("std.join(',', ['1','2','3','4']) == '1,2,3,4'");617 }618619 #[test]620 fn function_contexts() {621 assert_eval!(622 r#"623 local k = {624 t(name = self.h): [self.h, name],625 h: 3,626 };627 local f = {628 t: k.t(),629 h: 4,630 };631 f.t[0] == f.t[1]632 "#633 );634 }635636 #[test]637 fn local() {638 assert_eval!("local a = 2; local b = 3; a + b == 5");639 assert_eval!("local a = 1, b = a + 1; a + b == 3");640 assert_eval!("local a = 1; local a = 2; a == 2");641 }642643 #[test]644 fn object_lazyness() {645 assert_json!("local a = {a:error 'test'}; {}", r#"{}"#);646 }647648 #[test]649 fn object_inheritance() {650 assert_json!("{a: self.b} + {b:3}", r#"{"a": 3,"b": 3}"#);651 }652653 #[test]654 fn object_assertion_success() {655 eval!("{assert \"a\" in self} + {a:2}");656 }657658 #[test]659 fn object_assertion_error() {660 eval!("{assert \"a\" in self}");661 }662663 #[test]664 fn lazy_args() {665 eval!("local test(a) = 2; test(error '3')");666 }667668 #[test]669 #[should_panic]670 fn tailstrict_args() {671 eval!("local test(a) = 2; test(error '3') tailstrict");672 }673674 #[test]675 #[should_panic]676 fn no_binding_error() {677 eval!("a");678 }679680 #[test]681 fn test_object() {682 assert_json!("{a:2}", r#"{"a": 2}"#);683 assert_json!("{a:2+2}", r#"{"a": 4}"#);684 assert_json!("{a:2}+{b:2}", r#"{"a": 2,"b": 2}"#);685 assert_json!("{b:3}+{b:2}", r#"{"b": 2}"#);686 assert_json!("{b:3}+{b+:2}", r#"{"b": 5}"#);687 assert_json!("local test='a'; {[test]:2}", r#"{"a": 2}"#);688 assert_json!(689 r#"690 {691 name: "Alice",692 welcome: "Hello " + self.name + "!",693 }694 "#,695 r#"{"name": "Alice","welcome": "Hello Alice!"}"#696 );697 assert_json!(698 r#"699 {700 name: "Alice",701 welcome: "Hello " + self.name + "!",702 } + {703 name: "Bob"704 }705 "#,706 r#"{"name": "Bob","welcome": "Hello Bob!"}"#707 );708 }709710 #[test]711 fn functions() {712 assert_json!(r#"local a = function(b, c = 2) b + c; a(2)"#, "4");713 assert_json!(714 r#"local a = function(b, c = "Dear") b + c + d, d = "World"; a("Hello")"#,715 r#""HelloDearWorld""#716 );717 }718719 #[test]720 fn local_methods() {721 assert_json!(r#"local a(b, c = 2) = b + c; a(2)"#, "4");722 assert_json!(723 r#"local a(b, c = "Dear") = b + c + d, d = "World"; a("Hello")"#,724 r#""HelloDearWorld""#725 );726 }727728 #[test]729 fn object_locals() {730 assert_json!(r#"{local a = 3, b: a}"#, r#"{"b": 3}"#);731 assert_json!(r#"{local a = 3, local c = a, b: c}"#, r#"{"b": 3}"#);732 assert_json!(733 r#"{local a = function (b) {[b]:4}, test: a("test")}"#,734 r#"{"test": {"test": 4}}"#735 );736 }737738 #[test]739 fn object_comp() {740 assert_json!(741 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}"#,742 "{\"h1_2\": \"0a\",\"h1_3\": \"0a\",\"h1_4\": \"0a\",\"h2_3\": \"a1\",\"h2_4\": \"a1\",\"h3_2\": \"0a\",\"h3_4\": \"a1\"}"743 )744 }745746 #[test]747 fn direct_self() {748 println!(749 "{:#?}",750 eval!(751 r#"752 {753 local me = self,754 a: 3,755 b(): me.a,756 }757 "#758 )759 );760 }761762 #[test]763 fn indirect_self() {764 // `self` assigned to `me` was lost when being765 // referenced from field766 eval!(767 r#"{768 local me = self,769 a: 3,770 b: me.a,771 }.b"#772 );773 }774775 // We can't trust other tests (And official jsonnet testsuite), if assert is not working correctly776 #[test]777 fn std_assert_ok() {778 eval!("std.assertEqual(4.5 << 2, 16)");779 }780781 #[test]782 #[should_panic]783 fn std_assert_failure() {784 eval!("std.assertEqual(4.5 << 2, 15)");785 }786787 #[test]788 fn string_is_string() {789 assert!(primitive_equals(790 &eval!("local arr = 'hello'; (!std.isArray(arr)) && (!std.isString(arr))"),791 &Val::Bool(false),792 )793 .unwrap());794 }795796 #[test]797 fn base64_works() {798 assert_json!(r#"std.base64("test")"#, r#""dGVzdA==""#);799 }800801 #[test]802 fn utf8_chars() {803 assert_json!(804 r#"local c="😎";{c:std.codepoint(c),l:std.length(c)}"#,805 r#"{"c": 128526,"l": 1}"#806 )807 }808809 #[test]810 fn json() {811 assert_json!(812 r#"std.manifestJsonEx({a:3, b:4, c:6},"")"#,813 r#""{\n\"a\": 3,\n\"b\": 4,\n\"c\": 6\n}""#814 );815 }816817 #[test]818 fn parse_json() {819 assert_json!(820 r#"std.parseJson('{"a": -1,"b": 1,"c": 3.141,"d": []}')"#,821 r#"{"a": -1,"b": 1,"c": 3.141,"d": []}"#822 );823 // TODO: this should in fact fail as is no proper JSON syntax824 assert_json!(825 r#"std.parseJson("{a:-1, b:1, c:3.141, d:[]}")"#,826 r#"{"a": -1,"b": 1,"c": 3.141,"d": []}"#827 );828 // TODO: this is also no valid JSON829 assert_json!(r#"std.parseJson('local x = 2; x * x')"#, r#"4"#);830 }831832 #[test]833 fn test() {834 assert_json!(835 r#"[[a, b] for a in [1,2,3] for b in [4,5,6]]"#,836 "[[1,4],[1,5],[1,6],[2,4],[2,5],[2,6],[3,4],[3,5],[3,6]]"837 );838 }839840 #[test]841 fn sjsonnet() {842 eval!(843 r#"844 local x0 = {k: 1};845 local x1 = {k: x0.k + x0.k};846 local x2 = {k: x1.k + x1.k};847 local x3 = {k: x2.k + x2.k};848 local x4 = {k: x3.k + x3.k};849 local x5 = {k: x4.k + x4.k};850 local x6 = {k: x5.k + x5.k};851 local x7 = {k: x6.k + x6.k};852 local x8 = {k: x7.k + x7.k};853 local x9 = {k: x8.k + x8.k};854 local x10 = {k: x9.k + x9.k};855 local x11 = {k: x10.k + x10.k};856 local x12 = {k: x11.k + x11.k};857 local x13 = {k: x12.k + x12.k};858 local x14 = {k: x13.k + x13.k};859 local x15 = {k: x14.k + x14.k};860 local x16 = {k: x15.k + x15.k};861 local x17 = {k: x16.k + x16.k};862 local x18 = {k: x17.k + x17.k};863 local x19 = {k: x18.k + x18.k};864 local x20 = {k: x19.k + x19.k};865 local x21 = {k: x20.k + x20.k};866 x21.k867 "#868 );869 }870871 // This test is commented out by default, because of huge compilation slowdown872 // #[bench]873 // fn bench_codegen(b: &mut Bencher) {874 // b.iter(|| {875 // #[allow(clippy::all)]876 // let stdlib = {877 // use jrsonnet_parser::*;878 // include!(concat!(env!("OUT_DIR"), "/stdlib.rs"))879 // };880 // stdlib881 // })882 // }883884 /*885 #[bench]886 fn bench_serialize(b: &mut Bencher) {887 b.iter(|| {888 bincode::deserialize::<jrsonnet_parser::LocExpr>(include_bytes!(concat!(889 env!("OUT_DIR"),890 "/stdlib.bincode"891 )))892 .expect("deserialize stdlib")893 })894 }895896 #[bench]897 fn bench_parse(b: &mut Bencher) {898 b.iter(|| {899 jrsonnet_parser::parse(900 jrsonnet_stdlib::STDLIB_STR,901 &jrsonnet_parser::ParserSettings {902 loc_data: true,903 file_name: Rc::new(PathBuf::from("std.jsonnet")),904 },905 )906 })907 }908 */909910 #[test]911 fn equality() {912 println!(913 "{:?}",914 jrsonnet_parser::parse(915 "{ x: 1, y: 2 } == { x: 1, y: 2 }",916 &ParserSettings::default()917 )918 );919 assert_eval!("{ x: 1, y: 2 } == { x: 1, y: 2 }")920 }921922 #[test]923 fn native_ext() -> crate::error::Result<()> {924 use super::native::NativeCallback;925 let evaluator = EvaluationState::default();926927 evaluator.with_stdlib();928929 #[derive(gc::Trace, gc::Finalize)]930 struct NativeAdd;931 impl NativeCallbackHandler for NativeAdd {932 fn call(&self, from: Option<Rc<PathBuf>>, args: &[Val]) -> crate::error::Result<Val> {933 assert_eq!(934 from.unwrap(),935 Rc::new(PathBuf::from("native_caller.jsonnet"))936 );937 match (&args[0], &args[1]) {938 (Val::Num(a), Val::Num(b)) => Ok(Val::Num(a + b)),939 (_, _) => unreachable!(),940 }941 }942 }943 evaluator.settings_mut().ext_natives.insert(944 "native_add".into(),945 Gc::new(NativeCallback::new(946 ParamsDesc(Rc::new(vec![947 Param("a".into(), None),948 Param("b".into(), None),949 ])),950 Box::new(NativeAdd),951 )),952 );953 evaluator.evaluate_snippet_raw(954 Rc::new(PathBuf::from("native_caller.jsonnet")),955 "std.assertEqual(std.native(\"native_add\")(1, 2), 3)".into(),956 )?;957 Ok(())958 }959960 #[test]961 fn constant_intrinsic() -> crate::error::Result<()> {962 assert_eval!(963 "local std2 = std; local std = std2 { primitiveEquals(a, b):: false }; 1 == 1"964 );965 Ok(())966 }967968 #[test]969 fn standalone_super() -> crate::error::Result<()> {970 assert_eval!(971 r#"972 local obj = {973 a: 1,974 b: 2,975 c: 3,976 };977 local test = obj + {978 fields: std.objectFields(super),979 d: 5,980 };981 test.fields == ['a', 'b', 'c']982 "#983 );984 Ok(())985 }986987 #[test]988 fn comp_self() -> crate::error::Result<()> {989 assert_eval!(990 r#"991 std.objectFields({992 a:{993 [name]: name for name in std.objectFields(self)994 },995 b: 2,996 c: 3,997 }.a) == ['a', 'b', 'c']998 "#999 );10001001 Ok(())1002 }10031004 struct TestImportResolver(IStr);1005 impl crate::import::ImportResolver for TestImportResolver {1006 fn resolve_file(&self, _: &PathBuf, _: &PathBuf) -> crate::error::Result<Rc<PathBuf>> {1007 Ok(Rc::new(PathBuf::from("/test")))1008 }10091010 fn load_file_contents(&self, _: &PathBuf) -> crate::error::Result<IStr> {1011 Ok(self.0.clone())1012 }10131014 unsafe fn as_any(&self) -> &dyn std::any::Any {1015 panic!()1016 }1017 }10181019 #[test]1020 fn issue_23() {1021 let state = EvaluationState::default();1022 state.set_import_resolver(Box::new(TestImportResolver(r#"import "/test""#.into())));1023 let _ = state.evaluate_file_raw(&PathBuf::from("/test"));1024 }10251026 #[test]1027 fn issue_40() {1028 let state = EvaluationState::default();1029 state.with_stdlib();10301031 let error = state1032 .evaluate_snippet_raw(1033 Rc::new(PathBuf::from("issue40.jsonnet")),1034 r#"1035 local conf = {1036 n: ""1037 };1038 1039 local result = conf + {1040 assert std.isNumber(self.n): "is number"1041 };10421043 std.manifestJsonEx(result, "")1044 "#1045 .into(),1046 )1047 .unwrap_err();1048 assert_eq!(error.error().to_string(), "assert failed: is number");1049 }1050}1#![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))]2#![warn(clippy::all, clippy::nursery)]3#![allow(4 macro_expanded_macro_exports_accessed_by_absolute_paths,5 clippy::ptr_arg6)]78mod builtin;9mod ctx;10mod dynamic;11pub mod error;12mod evaluate;13mod function;14mod import;15mod integrations;16mod map;17pub mod native;18mod obj;19pub mod trace;20pub mod typed;21mod val;2223pub use ctx::*;24pub use dynamic::*;25use error::{Error::*, LocError, Result, StackTraceElement};26pub use evaluate::*;27pub use function::parse_function_call;28use gc::{Finalize, Gc, Trace};29pub use import::*;30pub use jrsonnet_interner::IStr;31use jrsonnet_parser::*;32use native::NativeCallback;33pub use obj::*;34use rustc_hash::FxHashMap;35use std::{36 cell::{Ref, RefCell, RefMut},37 collections::HashMap,38 fmt::Debug,39 hash::BuildHasherDefault,40 path::{Path, PathBuf},41 rc::Rc,42};43use trace::{offset_to_location, CodeLocation, CompactFormat, TraceFormat};44pub use val::*;4546pub trait Bindable: Trace {47 fn bind(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal>;48}49#[derive(Trace, Finalize, Clone)]50pub enum LazyBinding {51 Bindable(Gc<Box<dyn Bindable>>),52 Bound(LazyVal),53}5455impl Debug for LazyBinding {56 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {57 write!(f, "LazyBinding")58 }59}60impl LazyBinding {61 pub fn evaluate(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {62 match self {63 Self::Bindable(v) => v.bind(this, super_obj),64 Self::Bound(v) => Ok(v.clone()),65 }66 }67}6869pub struct EvaluationSettings {70 /// Limits recursion by limiting the number of stack frames71 pub max_stack: usize,72 /// Limits amount of stack trace items preserved73 pub max_trace: usize,74 /// Used for s`td.extVar`75 pub ext_vars: HashMap<IStr, Val>,76 /// Used for ext.native77 pub ext_natives: HashMap<IStr, Gc<NativeCallback>>,78 /// TLA vars79 pub tla_vars: HashMap<IStr, Val>,80 /// Global variables are inserted in default context81 pub globals: HashMap<IStr, Val>,82 /// Used to resolve file locations/contents83 pub import_resolver: Box<dyn ImportResolver>,84 /// Used in manifestification functions85 pub manifest_format: ManifestFormat,86 /// Used for bindings87 pub trace_format: Box<dyn TraceFormat>,88}89impl Default for EvaluationSettings {90 fn default() -> Self {91 Self {92 max_stack: 200,93 max_trace: 20,94 globals: Default::default(),95 ext_vars: Default::default(),96 ext_natives: Default::default(),97 tla_vars: Default::default(),98 import_resolver: Box::new(DummyImportResolver),99 manifest_format: ManifestFormat::Json(4),100 trace_format: Box::new(CompactFormat {101 padding: 4,102 resolver: trace::PathResolver::Absolute,103 }),104 }105 }106}107108#[derive(Default)]109struct EvaluationData {110 /// Used for stack overflow detection, stacktrace is populated on unwind111 stack_depth: usize,112 /// Contains file source codes and evaluation results for imports and pretty-printed stacktraces113 files: HashMap<Rc<Path>, FileData>,114 str_files: HashMap<Rc<Path>, IStr>,115}116117pub struct FileData {118 source_code: IStr,119 parsed: LocExpr,120 evaluated: Option<Val>,121}122#[derive(Default)]123pub struct EvaluationStateInternals {124 /// Internal state125 data: RefCell<EvaluationData>,126 /// Settings, safe to change at runtime127 settings: RefCell<EvaluationSettings>,128}129130thread_local! {131 /// Contains the state for a currently executed file.132 /// Global state is fine here.133 pub(crate) static EVAL_STATE: RefCell<Option<EvaluationState>> = RefCell::new(None)134}135pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {136 EVAL_STATE.with(|s| f(s.borrow().as_ref().unwrap()))137}138pub(crate) fn push<T>(139 e: Option<&ExprLocation>,140 frame_desc: impl FnOnce() -> String,141 f: impl FnOnce() -> Result<T>,142) -> Result<T> {143 with_state(|s| s.push(e, frame_desc, f))144}145146pub fn push_stack_frame<T>(147 e: Option<&ExprLocation>,148 frame_desc: impl FnOnce() -> String,149 f: impl FnOnce() -> Result<T>,150) -> Result<T> {151 push(e, frame_desc, f)152}153154/// Maintains stack trace and import resolution155#[derive(Default, Clone)]156pub struct EvaluationState(Rc<EvaluationStateInternals>);157158impl EvaluationState {159 /// Parses and adds file as loaded160 pub fn add_file(&self, path: Rc<Path>, source_code: IStr) -> Result<()> {161 self.add_parsed_file(162 path.clone(),163 source_code.clone(),164 parse(165 &source_code,166 &ParserSettings {167 file_name: path.clone(),168 loc_data: true,169 },170 )171 .map_err(|error| ImportSyntaxError {172 error: Box::new(error),173 path: path.to_owned(),174 source_code,175 })?,176 )?;177178 Ok(())179 }180181 /// Adds file by source code and parsed expr182 pub fn add_parsed_file(183 &self,184 name: Rc<Path>,185 source_code: IStr,186 parsed: LocExpr,187 ) -> Result<()> {188 self.data_mut().files.insert(189 name,190 FileData {191 source_code,192 parsed,193 evaluated: None,194 },195 );196197 Ok(())198 }199 pub fn get_source(&self, name: &Path) -> Option<IStr> {200 let ro_map = &self.data().files;201 ro_map.get(name).map(|value| value.source_code.clone())202 }203 pub fn map_source_locations(&self, file: &Path, locs: &[usize]) -> Vec<CodeLocation> {204 offset_to_location(&self.get_source(file).unwrap(), locs)205 }206207 pub(crate) fn import_file(&self, from: &Path, path: &Path) -> Result<Val> {208 let file_path = self.resolve_file(from, path)?;209 {210 let data = self.data();211 let files = &data.files;212 if files.contains_key(&file_path as &Path) {213 drop(data);214 return self.evaluate_loaded_file_raw(&file_path);215 }216 }217 let contents = self.load_file_contents(&file_path)?;218 self.add_file(file_path.clone(), contents)?;219 self.evaluate_loaded_file_raw(&file_path)220 }221 pub(crate) fn import_file_str(&self, from: &Path, path: &Path) -> Result<IStr> {222 let path = self.resolve_file(from, path)?;223 if !self.data().str_files.contains_key(&path) {224 let file_str = self.load_file_contents(&path)?;225 self.data_mut().str_files.insert(path.clone(), file_str);226 }227 Ok(self.data().str_files.get(&path).cloned().unwrap())228 }229230 fn evaluate_loaded_file_raw(&self, name: &Path) -> Result<Val> {231 let expr: LocExpr = {232 let ro_map = &self.data().files;233 let value = ro_map234 .get(name)235 .unwrap_or_else(|| panic!("file not added: {:?}", name));236 if let Some(ref evaluated) = value.evaluated {237 return Ok(evaluated.clone());238 }239 value.parsed.clone()240 };241 let value = evaluate(self.create_default_context(), &expr)?;242 {243 self.data_mut()244 .files245 .get_mut(name)246 .unwrap()247 .evaluated248 .replace(value.clone());249 }250 Ok(value)251 }252253 /// Adds standard library global variable (std) to this evaluator254 pub fn with_stdlib(&self) -> &Self {255 use jrsonnet_stdlib::STDLIB_STR;256 let std_path: Rc<Path> = PathBuf::from("std.jsonnet").into();257 self.run_in_state(|| {258 self.add_parsed_file(259 std_path.clone(),260 STDLIB_STR.to_owned().into(),261 builtin::get_parsed_stdlib(),262 )263 .unwrap();264 let val = self.evaluate_loaded_file_raw(&std_path).unwrap();265 self.settings_mut().globals.insert("std".into(), val);266 });267 self268 }269270 /// Creates context with all passed global variables271 pub fn create_default_context(&self) -> Context {272 let globals = &self.settings().globals;273 let mut new_bindings: FxHashMap<IStr, LazyVal> =274 FxHashMap::with_capacity_and_hasher(globals.len(), BuildHasherDefault::default());275 for (name, value) in globals.iter() {276 new_bindings.insert(name.clone(), LazyVal::new_resolved(value.clone()));277 }278 Context::new().extend_bound(new_bindings)279 }280281 /// Executes code creating a new stack frame282 pub fn push<T>(283 &self,284 e: Option<&ExprLocation>,285 frame_desc: impl FnOnce() -> String,286 f: impl FnOnce() -> Result<T>,287 ) -> Result<T> {288 {289 let mut data = self.data_mut();290 let stack_depth = &mut data.stack_depth;291 if *stack_depth > self.max_stack() {292 // Error creation uses data, so i drop guard here293 drop(data);294 throw!(StackOverflow);295 } else {296 *stack_depth += 1;297 }298 }299 let result = f();300 self.data_mut().stack_depth -= 1;301 if let Err(mut err) = result {302 err.trace_mut().0.push(StackTraceElement {303 location: e.cloned(),304 desc: frame_desc(),305 });306 return Err(err);307 }308 result309 }310311 /// Runs passed function in state (required if function needs to modify stack trace)312 pub fn run_in_state<T>(&self, f: impl FnOnce() -> T) -> T {313 EVAL_STATE.with(|v| {314 let has_state = v.borrow().is_some();315 if !has_state {316 v.borrow_mut().replace(self.clone());317 }318 let result = f();319 if !has_state {320 v.borrow_mut().take();321 }322 result323 })324 }325326 pub fn stringify_err(&self, e: &LocError) -> String {327 let mut out = String::new();328 self.settings()329 .trace_format330 .write_trace(&mut out, self, e)331 .unwrap();332 out333 }334335 pub fn manifest(&self, val: Val) -> Result<IStr> {336 self.run_in_state(|| val.manifest(&self.manifest_format()))337 }338 pub fn manifest_multi(&self, val: Val) -> Result<Vec<(IStr, IStr)>> {339 self.run_in_state(|| val.manifest_multi(&self.manifest_format()))340 }341 pub fn manifest_stream(&self, val: Val) -> Result<Vec<IStr>> {342 self.run_in_state(|| val.manifest_stream(&self.manifest_format()))343 }344345 /// If passed value is function then call with set TLA346 pub fn with_tla(&self, val: Val) -> Result<Val> {347 self.run_in_state(|| {348 Ok(match val {349 Val::Func(func) => push(350 None,351 || "during TLA call".to_owned(),352 || {353 func.evaluate_map(354 self.create_default_context(),355 &self.settings().tla_vars,356 true,357 )358 },359 )?,360 v => v,361 })362 })363 }364}365366/// Internals367impl EvaluationState {368 fn data(&self) -> Ref<EvaluationData> {369 self.0.data.borrow()370 }371 fn data_mut(&self) -> RefMut<EvaluationData> {372 self.0.data.borrow_mut()373 }374 pub fn settings(&self) -> Ref<EvaluationSettings> {375 self.0.settings.borrow()376 }377 pub fn settings_mut(&self) -> RefMut<EvaluationSettings> {378 self.0.settings.borrow_mut()379 }380}381382/// Raw methods evaluate passed values but don't perform TLA execution383impl EvaluationState {384 pub fn evaluate_file_raw(&self, name: &Path) -> Result<Val> {385 self.run_in_state(|| self.import_file(&std::env::current_dir().expect("cwd"), name))386 }387 pub fn evaluate_file_raw_nocwd(&self, name: &Path) -> Result<Val> {388 self.run_in_state(|| self.import_file(&PathBuf::from("."), name))389 }390 /// Parses and evaluates the given snippet391 pub fn evaluate_snippet_raw(&self, source: Rc<Path>, code: IStr) -> Result<Val> {392 let parsed = parse(393 &code,394 &ParserSettings {395 file_name: source.clone(),396 loc_data: true,397 },398 )399 .map_err(|e| ImportSyntaxError {400 path: source.clone(),401 source_code: code.clone(),402 error: Box::new(e),403 })?;404 self.add_parsed_file(source, code, parsed.clone())?;405 self.evaluate_expr_raw(parsed)406 }407 /// Evaluates the parsed expression408 pub fn evaluate_expr_raw(&self, code: LocExpr) -> Result<Val> {409 self.run_in_state(|| evaluate(self.create_default_context(), &code))410 }411}412413/// Settings utilities414impl EvaluationState {415 pub fn add_ext_var(&self, name: IStr, value: Val) {416 self.settings_mut().ext_vars.insert(name, value);417 }418 pub fn add_ext_str(&self, name: IStr, value: IStr) {419 self.add_ext_var(name, Val::Str(value));420 }421 pub fn add_ext_code(&self, name: IStr, code: IStr) -> Result<()> {422 let value =423 self.evaluate_snippet_raw(PathBuf::from(format!("ext_code {}", name)).into(), code)?;424 self.add_ext_var(name, value);425 Ok(())426 }427428 pub fn add_tla(&self, name: IStr, value: Val) {429 self.settings_mut().tla_vars.insert(name, value);430 }431 pub fn add_tla_str(&self, name: IStr, value: IStr) {432 self.add_tla(name, Val::Str(value));433 }434 pub fn add_tla_code(&self, name: IStr, code: IStr) -> Result<()> {435 let value =436 self.evaluate_snippet_raw(PathBuf::from(format!("tla_code {}", name)).into(), code)?;437 self.add_tla(name, value);438 Ok(())439 }440441 pub fn resolve_file(&self, from: &Path, path: &Path) -> Result<Rc<Path>> {442 self.settings().import_resolver.resolve_file(from, path)443 }444 pub fn load_file_contents(&self, path: &Path) -> Result<IStr> {445 self.settings().import_resolver.load_file_contents(path)446 }447448 pub fn import_resolver(&self) -> Ref<dyn ImportResolver> {449 Ref::map(self.settings(), |s| &*s.import_resolver)450 }451 pub fn set_import_resolver(&self, resolver: Box<dyn ImportResolver>) {452 self.settings_mut().import_resolver = resolver;453 }454455 pub fn add_native(&self, name: IStr, cb: Gc<NativeCallback>) {456 self.settings_mut().ext_natives.insert(name, cb);457 }458459 pub fn manifest_format(&self) -> ManifestFormat {460 self.settings().manifest_format.clone()461 }462 pub fn set_manifest_format(&self, format: ManifestFormat) {463 self.settings_mut().manifest_format = format;464 }465466 pub fn trace_format(&self) -> Ref<dyn TraceFormat> {467 Ref::map(self.settings(), |s| &*s.trace_format)468 }469 pub fn set_trace_format(&self, format: Box<dyn TraceFormat>) {470 self.settings_mut().trace_format = format;471 }472473 pub fn max_trace(&self) -> usize {474 self.settings().max_trace475 }476 pub fn set_max_trace(&self, trace: usize) {477 self.settings_mut().max_trace = trace;478 }479480 pub fn max_stack(&self) -> usize {481 self.settings().max_stack482 }483 pub fn set_max_stack(&self, trace: usize) {484 self.settings_mut().max_stack = trace;485 }486}487488#[cfg(test)]489pub mod tests {490 use super::Val;491 use crate::{492 error::Error::*, native::NativeCallbackHandler, primitive_equals, EvaluationState,493 };494 use gc::Gc;495 use jrsonnet_interner::IStr;496 use jrsonnet_parser::*;497 use std::{498 path::{Path, PathBuf},499 rc::Rc,500 };501502 #[test]503 #[should_panic]504 fn eval_state_stacktrace() {505 let state = EvaluationState::default();506 state.run_in_state(|| {507 state508 .push(509 Some(&ExprLocation(PathBuf::from("test1.jsonnet").into(), 10, 20)),510 || "outer".to_owned(),511 || {512 state.push(513 Some(&ExprLocation(PathBuf::from("test2.jsonnet").into(), 30, 40)),514 || "inner".to_owned(),515 || Err(RuntimeError("".into()).into()),516 )?;517 Ok(())518 },519 )520 .unwrap();521 });522 }523524 #[test]525 fn eval_state_standard() {526 let state = EvaluationState::default();527 state.with_stdlib();528 assert!(primitive_equals(529 &state530 .evaluate_snippet_raw(531 PathBuf::from("raw.jsonnet").into(),532 r#"std.assertEqual(std.base64("test"), "dGVzdA==")"#.into()533 )534 .unwrap(),535 &Val::Bool(true),536 )537 .unwrap());538 }539540 macro_rules! eval {541 ($str: expr) => {542 EvaluationState::default()543 .with_stdlib()544 .evaluate_snippet_raw(PathBuf::from("raw.jsonnet").into(), $str.into())545 .unwrap()546 };547 }548 macro_rules! eval_json {549 ($str: expr) => {{550 let evaluator = EvaluationState::default();551 evaluator.with_stdlib();552 evaluator.run_in_state(|| {553 evaluator554 .evaluate_snippet_raw(PathBuf::from("raw.jsonnet").into(), $str.into())555 .unwrap()556 .to_json(0)557 .unwrap()558 .replace("\n", "")559 })560 }};561 }562563 /// Asserts given code returns `true`564 macro_rules! assert_eval {565 ($str: expr) => {566 assert!(primitive_equals(&eval!($str), &Val::Bool(true)).unwrap())567 };568 }569570 /// Asserts given code returns `false`571 macro_rules! assert_eval_neg {572 ($str: expr) => {573 assert!(primitive_equals(&eval!($str), &Val::Bool(false)).unwrap())574 };575 }576 macro_rules! assert_json {577 ($str: expr, $out: expr) => {578 assert_eq!(eval_json!($str), $out.replace("\t", ""))579 };580 }581582 /// Sanity checking, before trusting to another tests583 #[test]584 fn equality_operator() {585 assert_eval!("2 == 2");586 assert_eval_neg!("2 != 2");587 assert_eval!("2 != 3");588 assert_eval_neg!("2 == 3");589 assert_eval!("'Hello' == 'Hello'");590 assert_eval_neg!("'Hello' != 'Hello'");591 assert_eval!("'Hello' != 'World'");592 assert_eval_neg!("'Hello' == 'World'");593 }594595 #[test]596 fn math_evaluation() {597 assert_eval!("2 + 2 * 2 == 6");598 assert_eval!("3 + (2 + 2 * 2) == 9");599 }600601 #[test]602 fn string_concat() {603 assert_eval!("'Hello' + 'World' == 'HelloWorld'");604 assert_eval!("'Hello' * 3 == 'HelloHelloHello'");605 assert_eval!("'Hello' + 'World' * 3 == 'HelloWorldWorldWorld'");606 }607608 #[test]609 fn faster_join() {610 assert_eval!("std.join([0,0], [[1,2],[3,4],[5,6]]) == [1,2,0,0,3,4,0,0,5,6]");611 assert_eval!("std.join(',', ['1','2','3','4']) == '1,2,3,4'");612 }613614 #[test]615 fn function_contexts() {616 assert_eval!(617 r#"618 local k = {619 t(name = self.h): [self.h, name],620 h: 3,621 };622 local f = {623 t: k.t(),624 h: 4,625 };626 f.t[0] == f.t[1]627 "#628 );629 }630631 #[test]632 fn local() {633 assert_eval!("local a = 2; local b = 3; a + b == 5");634 assert_eval!("local a = 1, b = a + 1; a + b == 3");635 assert_eval!("local a = 1; local a = 2; a == 2");636 }637638 #[test]639 fn object_lazyness() {640 assert_json!("local a = {a:error 'test'}; {}", r#"{}"#);641 }642643 #[test]644 fn object_inheritance() {645 assert_json!("{a: self.b} + {b:3}", r#"{"a": 3,"b": 3}"#);646 }647648 #[test]649 fn object_assertion_success() {650 eval!("{assert \"a\" in self} + {a:2}");651 }652653 #[test]654 fn object_assertion_error() {655 eval!("{assert \"a\" in self}");656 }657658 #[test]659 fn lazy_args() {660 eval!("local test(a) = 2; test(error '3')");661 }662663 #[test]664 #[should_panic]665 fn tailstrict_args() {666 eval!("local test(a) = 2; test(error '3') tailstrict");667 }668669 #[test]670 #[should_panic]671 fn no_binding_error() {672 eval!("a");673 }674675 #[test]676 fn test_object() {677 assert_json!("{a:2}", r#"{"a": 2}"#);678 assert_json!("{a:2+2}", r#"{"a": 4}"#);679 assert_json!("{a:2}+{b:2}", r#"{"a": 2,"b": 2}"#);680 assert_json!("{b:3}+{b:2}", r#"{"b": 2}"#);681 assert_json!("{b:3}+{b+:2}", r#"{"b": 5}"#);682 assert_json!("local test='a'; {[test]:2}", r#"{"a": 2}"#);683 assert_json!(684 r#"685 {686 name: "Alice",687 welcome: "Hello " + self.name + "!",688 }689 "#,690 r#"{"name": "Alice","welcome": "Hello Alice!"}"#691 );692 assert_json!(693 r#"694 {695 name: "Alice",696 welcome: "Hello " + self.name + "!",697 } + {698 name: "Bob"699 }700 "#,701 r#"{"name": "Bob","welcome": "Hello Bob!"}"#702 );703 }704705 #[test]706 fn functions() {707 assert_json!(r#"local a = function(b, c = 2) b + c; a(2)"#, "4");708 assert_json!(709 r#"local a = function(b, c = "Dear") b + c + d, d = "World"; a("Hello")"#,710 r#""HelloDearWorld""#711 );712 }713714 #[test]715 fn local_methods() {716 assert_json!(r#"local a(b, c = 2) = b + c; a(2)"#, "4");717 assert_json!(718 r#"local a(b, c = "Dear") = b + c + d, d = "World"; a("Hello")"#,719 r#""HelloDearWorld""#720 );721 }722723 #[test]724 fn object_locals() {725 assert_json!(r#"{local a = 3, b: a}"#, r#"{"b": 3}"#);726 assert_json!(r#"{local a = 3, local c = a, b: c}"#, r#"{"b": 3}"#);727 assert_json!(728 r#"{local a = function (b) {[b]:4}, test: a("test")}"#,729 r#"{"test": {"test": 4}}"#730 );731 }732733 #[test]734 fn object_comp() {735 assert_json!(736 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}"#,737 "{\"h1_2\": \"0a\",\"h1_3\": \"0a\",\"h1_4\": \"0a\",\"h2_3\": \"a1\",\"h2_4\": \"a1\",\"h3_2\": \"0a\",\"h3_4\": \"a1\"}"738 )739 }740741 #[test]742 fn direct_self() {743 println!(744 "{:#?}",745 eval!(746 r#"747 {748 local me = self,749 a: 3,750 b(): me.a,751 }752 "#753 )754 );755 }756757 #[test]758 fn indirect_self() {759 // `self` assigned to `me` was lost when being760 // referenced from field761 eval!(762 r#"{763 local me = self,764 a: 3,765 b: me.a,766 }.b"#767 );768 }769770 // We can't trust other tests (And official jsonnet testsuite), if assert is not working correctly771 #[test]772 fn std_assert_ok() {773 eval!("std.assertEqual(4.5 << 2, 16)");774 }775776 #[test]777 #[should_panic]778 fn std_assert_failure() {779 eval!("std.assertEqual(4.5 << 2, 15)");780 }781782 #[test]783 fn string_is_string() {784 assert!(primitive_equals(785 &eval!("local arr = 'hello'; (!std.isArray(arr)) && (!std.isString(arr))"),786 &Val::Bool(false),787 )788 .unwrap());789 }790791 #[test]792 fn base64_works() {793 assert_json!(r#"std.base64("test")"#, r#""dGVzdA==""#);794 }795796 #[test]797 fn utf8_chars() {798 assert_json!(799 r#"local c="😎";{c:std.codepoint(c),l:std.length(c)}"#,800 r#"{"c": 128526,"l": 1}"#801 )802 }803804 #[test]805 fn json() {806 assert_json!(807 r#"std.manifestJsonEx({a:3, b:4, c:6},"")"#,808 r#""{\n\"a\": 3,\n\"b\": 4,\n\"c\": 6\n}""#809 );810 }811812 #[test]813 fn parse_json() {814 assert_json!(815 r#"std.parseJson('{"a": -1,"b": 1,"c": 3.141,"d": []}')"#,816 r#"{"a": -1,"b": 1,"c": 3.141,"d": []}"#817 );818 // TODO: this should in fact fail as is no proper JSON syntax819 assert_json!(820 r#"std.parseJson("{a:-1, b:1, c:3.141, d:[]}")"#,821 r#"{"a": -1,"b": 1,"c": 3.141,"d": []}"#822 );823 // TODO: this is also no valid JSON824 assert_json!(r#"std.parseJson('local x = 2; x * x')"#, r#"4"#);825 }826827 #[test]828 fn test() {829 assert_json!(830 r#"[[a, b] for a in [1,2,3] for b in [4,5,6]]"#,831 "[[1,4],[1,5],[1,6],[2,4],[2,5],[2,6],[3,4],[3,5],[3,6]]"832 );833 }834835 #[test]836 fn sjsonnet() {837 eval!(838 r#"839 local x0 = {k: 1};840 local x1 = {k: x0.k + x0.k};841 local x2 = {k: x1.k + x1.k};842 local x3 = {k: x2.k + x2.k};843 local x4 = {k: x3.k + x3.k};844 local x5 = {k: x4.k + x4.k};845 local x6 = {k: x5.k + x5.k};846 local x7 = {k: x6.k + x6.k};847 local x8 = {k: x7.k + x7.k};848 local x9 = {k: x8.k + x8.k};849 local x10 = {k: x9.k + x9.k};850 local x11 = {k: x10.k + x10.k};851 local x12 = {k: x11.k + x11.k};852 local x13 = {k: x12.k + x12.k};853 local x14 = {k: x13.k + x13.k};854 local x15 = {k: x14.k + x14.k};855 local x16 = {k: x15.k + x15.k};856 local x17 = {k: x16.k + x16.k};857 local x18 = {k: x17.k + x17.k};858 local x19 = {k: x18.k + x18.k};859 local x20 = {k: x19.k + x19.k};860 local x21 = {k: x20.k + x20.k};861 x21.k862 "#863 );864 }865866 // This test is commented out by default, because of huge compilation slowdown867 // #[bench]868 // fn bench_codegen(b: &mut Bencher) {869 // b.iter(|| {870 // #[allow(clippy::all)]871 // let stdlib = {872 // use jrsonnet_parser::*;873 // include!(concat!(env!("OUT_DIR"), "/stdlib.rs"))874 // };875 // stdlib876 // })877 // }878879 /*880 #[bench]881 fn bench_serialize(b: &mut Bencher) {882 b.iter(|| {883 bincode::deserialize::<jrsonnet_parser::LocExpr>(include_bytes!(concat!(884 env!("OUT_DIR"),885 "/stdlib.bincode"886 )))887 .expect("deserialize stdlib")888 })889 }890891 #[bench]892 fn bench_parse(b: &mut Bencher) {893 b.iter(|| {894 jrsonnet_parser::parse(895 jrsonnet_stdlib::STDLIB_STR,896 &jrsonnet_parser::ParserSettings {897 loc_data: true,898 file_name: Rc::new(PathBuf::from("std.jsonnet")),899 },900 )901 })902 }903 */904905 #[test]906 fn equality() {907 println!(908 "{:?}",909 jrsonnet_parser::parse(910 "{ x: 1, y: 2 } == { x: 1, y: 2 }",911 &ParserSettings {912 file_name: PathBuf::from("equality").into(),913 loc_data: true,914 }915 )916 );917 assert_eval!("{ x: 1, y: 2 } == { x: 1, y: 2 }")918 }919920 #[test]921 fn native_ext() -> crate::error::Result<()> {922 use super::native::NativeCallback;923 let evaluator = EvaluationState::default();924925 evaluator.with_stdlib();926927 #[derive(gc::Trace, gc::Finalize)]928 struct NativeAdd;929 impl NativeCallbackHandler for NativeAdd {930 fn call(&self, from: Option<Rc<Path>>, args: &[Val]) -> crate::error::Result<Val> {931 assert_eq!(932 &from.unwrap() as &Path,933 &PathBuf::from("native_caller.jsonnet")934 );935 match (&args[0], &args[1]) {936 (Val::Num(a), Val::Num(b)) => Ok(Val::Num(a + b)),937 (_, _) => unreachable!(),938 }939 }940 }941 evaluator.settings_mut().ext_natives.insert(942 "native_add".into(),943 Gc::new(NativeCallback::new(944 ParamsDesc(Rc::new(vec![945 Param("a".into(), None),946 Param("b".into(), None),947 ])),948 Box::new(NativeAdd),949 )),950 );951 evaluator.evaluate_snippet_raw(952 PathBuf::from("native_caller.jsonnet").into(),953 "std.assertEqual(std.native(\"native_add\")(1, 2), 3)".into(),954 )?;955 Ok(())956 }957958 #[test]959 fn constant_intrinsic() -> crate::error::Result<()> {960 assert_eval!(961 "local std2 = std; local std = std2 { primitiveEquals(a, b):: false }; 1 == 1"962 );963 Ok(())964 }965966 #[test]967 fn standalone_super() -> crate::error::Result<()> {968 assert_eval!(969 r#"970 local obj = {971 a: 1,972 b: 2,973 c: 3,974 };975 local test = obj + {976 fields: std.objectFields(super),977 d: 5,978 };979 test.fields == ['a', 'b', 'c']980 "#981 );982 Ok(())983 }984985 #[test]986 fn comp_self() -> crate::error::Result<()> {987 assert_eval!(988 r#"989 std.objectFields({990 a:{991 [name]: name for name in std.objectFields(self)992 },993 b: 2,994 c: 3,995 }.a) == ['a', 'b', 'c']996 "#997 );998999 Ok(())1000 }10011002 struct TestImportResolver(IStr);1003 impl crate::import::ImportResolver for TestImportResolver {1004 fn resolve_file(&self, _: &Path, _: &Path) -> crate::error::Result<Rc<Path>> {1005 Ok(PathBuf::from("/test").into())1006 }10071008 fn load_file_contents(&self, _: &Path) -> crate::error::Result<IStr> {1009 Ok(self.0.clone())1010 }10111012 unsafe fn as_any(&self) -> &dyn std::any::Any {1013 panic!()1014 }1015 }10161017 #[test]1018 fn issue_23() {1019 let state = EvaluationState::default();1020 state.set_import_resolver(Box::new(TestImportResolver(r#"import "/test""#.into())));1021 let _ = state.evaluate_file_raw(&PathBuf::from("/test"));1022 }10231024 #[test]1025 fn issue_40() {1026 let state = EvaluationState::default();1027 state.with_stdlib();10281029 let error = state1030 .evaluate_snippet_raw(1031 PathBuf::from("issue40.jsonnet").into(),1032 r#"1033 local conf = {1034 n: ""1035 };1036 1037 local result = conf + {1038 assert std.isNumber(self.n): "is number"1039 };10401041 std.manifestJsonEx(result, "")1042 "#1043 .into(),1044 )1045 .unwrap_err();1046 assert_eq!(error.error().to_string(), "assert failed: is number");1047 }1048}crates/jrsonnet-evaluator/src/native.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/native.rs
+++ b/crates/jrsonnet-evaluator/src/native.rs
@@ -4,11 +4,11 @@
use gc::{Finalize, Trace};
use jrsonnet_parser::ParamsDesc;
use std::fmt::Debug;
-use std::path::PathBuf;
+use std::path::Path;
use std::rc::Rc;
pub trait NativeCallbackHandler: Trace {
- fn call(&self, from: Option<Rc<PathBuf>>, args: &[Val]) -> Result<Val>;
+ fn call(&self, from: Option<Rc<Path>>, args: &[Val]) -> Result<Val>;
}
#[derive(Trace, Finalize)]
@@ -20,7 +20,7 @@
pub fn new(params: ParamsDesc, handler: Box<dyn NativeCallbackHandler>) -> Self {
Self { params, handler }
}
- pub fn call(&self, caller: Option<Rc<PathBuf>>, args: &[Val]) -> Result<Val> {
+ pub fn call(&self, caller: Option<Rc<Path>>, args: &[Val]) -> Result<Val> {
self.handler.call(caller, args)
}
}
crates/jrsonnet-evaluator/src/trace/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/trace/mod.rs
+++ b/crates/jrsonnet-evaluator/src/trace/mod.rs
@@ -2,7 +2,7 @@
use crate::{error::Error, EvaluationState, LocError};
pub use location::*;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
/// The way paths should be displayed
pub enum PathResolver {
@@ -15,7 +15,7 @@
}
impl PathResolver {
- pub fn resolve(&self, from: &PathBuf) -> String {
+ pub fn resolve(&self, from: &Path) -> String {
match self {
Self::FileName => from.file_name().unwrap().to_string_lossy().into_owned(),
Self::Absolute => from.to_string_lossy().into_owned(),
@@ -255,7 +255,7 @@
&self,
out: &mut dyn std::fmt::Write,
source: &str,
- origin: &PathBuf,
+ origin: &Path,
start: &CodeLocation,
end: &CodeLocation,
desc: &str,
crates/jrsonnet-parser/src/expr.rsdiffbeforeafterboth--- a/crates/jrsonnet-parser/src/expr.rs
+++ b/crates/jrsonnet-parser/src/expr.rs
@@ -7,7 +7,7 @@
use std::{
fmt::{Debug, Display},
ops::Deref,
- path::PathBuf,
+ path::{Path, PathBuf},
rc::Rc,
};
@@ -405,7 +405,7 @@
#[cfg_attr(feature = "serialize", derive(Serialize))]
#[cfg_attr(feature = "deserialize", derive(Deserialize))]
#[derive(Clone, PartialEq)]
-pub struct ExprLocation(pub Rc<PathBuf>, pub usize, pub usize);
+pub struct ExprLocation(pub Rc<Path>, pub usize, pub usize);
impl Finalize for ExprLocation {}
unsafe impl Trace for ExprLocation {
unsafe_empty_trace!();
crates/jrsonnet-parser/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-parser/src/lib.rs
+++ b/crates/jrsonnet-parser/src/lib.rs
@@ -1,15 +1,17 @@
#![allow(clippy::redundant_closure_call)]
use peg::parser;
-use std::{path::PathBuf, rc::Rc};
+use std::{
+ path::{Path, PathBuf},
+ rc::Rc,
+};
mod expr;
pub use expr::*;
pub use peg;
-#[derive(Default)]
pub struct ParserSettings {
pub loc_data: bool,
- pub file_name: Rc<PathBuf>,
+ pub file_name: Rc<Path>,
}
parser! {
@@ -304,7 +306,6 @@
use super::{expr::*, parse};
use crate::ParserSettings;
use std::path::PathBuf;
- use std::rc::Rc;
macro_rules! parse {
($s:expr) => {
@@ -312,7 +313,7 @@
$s,
&ParserSettings {
loc_data: false,
- file_name: Rc::new(PathBuf::from("/test.jsonnet")),
+ file_name: PathBuf::from("/test.jsonnet").into(),
},
)
.unwrap()