git.delta.rocks / jrsonnet / refs/commits / 020afa68e92f

difftreelog

feat native callbacks

Lach2020-08-23parent: #1feb056.patch.diff
in: master

10 files changed

modifiedbindings/jsonnet/src/interop.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/interop.rs
+++ b/bindings/jsonnet/src/interop.rs
@@ -1,7 +1,7 @@
 //! Jrsonnet specific additional binding helpers
 
-use crate::import::jsonnet_import_callback;
-use jrsonnet_evaluator::EvaluationState;
+use crate::{import::jsonnet_import_callback, native::jsonnet_native_callback};
+use jrsonnet_evaluator::{EvaluationState, Val};
 use std::{
 	ffi::c_void,
 	os::raw::{c_char, c_int},
@@ -15,6 +15,13 @@
 		found_here: *mut *const c_char,
 		success: &mut c_int,
 	) -> *const c_char;
+
+	#[allow(improper_ctypes)]
+	pub fn _jrsonnet_static_native_callback(
+		ctx: *const c_void,
+		argv: *const *const Val,
+		success: *mut c_int,
+	) -> *mut Val;
 }
 
 /// # Safety
@@ -26,6 +33,17 @@
 	jsonnet_import_callback(vm, _jrsonnet_static_import_callback, ctx)
 }
 
+/// # Safety
+#[no_mangle]
+pub unsafe extern "C" fn jrsonnet_apply_static_native_callback(
+	vm: &EvaluationState,
+	name: *const c_char,
+	ctx: *mut c_void,
+	raw_params: *const *const c_char,
+) {
+	jsonnet_native_callback(vm, name, _jrsonnet_static_native_callback, ctx, raw_params)
+}
+
 #[no_mangle]
 pub extern "C" fn jrsonnet_set_trace_format(vm: &EvaluationState, format: u8) {
 	use jrsonnet_evaluator::trace::JSFormat;
modifiedbindings/jsonnet/src/lib.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/lib.rs
+++ b/bindings/jsonnet/src/lib.rs
@@ -1,5 +1,6 @@
 pub mod import;
 pub mod interop;
+pub mod native;
 pub mod val_extract;
 pub mod val_make;
 pub mod val_modify;
@@ -90,11 +91,6 @@
 #[allow(clippy::boxed_local)]
 pub unsafe extern "C" fn jsonnet_json_destroy(_vm: &EvaluationState, v: *mut Val) {
 	Box::from_raw(v);
-}
-
-#[no_mangle]
-pub extern "C" fn jsonnet_native_callback() {
-	todo!()
 }
 
 #[no_mangle]
addedbindings/jsonnet/src/native.rsdiffbeforeafterboth
--- /dev/null
+++ b/bindings/jsonnet/src/native.rs
@@ -0,0 +1,55 @@
+use jrsonnet_evaluator::{error::Error, native::NativeCallback, EvaluationState, Val};
+use jrsonnet_parser::{Param, ParamsDesc};
+use std::{
+	ffi::{c_void, CStr},
+	os::raw::{c_char, c_int},
+	rc::Rc,
+};
+
+type JsonnetNativeCallback = unsafe extern "C" fn(
+	ctx: *const c_void,
+	argv: *const *const Val,
+	success: *mut c_int,
+) -> *mut Val;
+
+/// # Safety
+#[no_mangle]
+pub unsafe extern "C" fn jsonnet_native_callback(
+	vm: &EvaluationState,
+	name: *const c_char,
+	cb: JsonnetNativeCallback,
+	ctx: *const c_void,
+	mut raw_params: *const *const c_char,
+) {
+	let name = CStr::from_ptr(name).to_str().expect("utf8 name").into();
+	let mut params = Vec::new();
+	loop {
+		if (*raw_params).is_null() {
+			break;
+		}
+		let param = CStr::from_ptr(*raw_params).to_str().expect("not utf8");
+		params.push(Param(param.into(), None));
+		raw_params = raw_params.offset(1);
+	}
+	let params = ParamsDesc(Rc::new(params));
+
+	vm.add_native(
+		name,
+		Rc::new(NativeCallback::new(params, move |args| {
+			let mut n_args = Vec::new();
+			for a in args {
+				n_args.push(Some(Box::new(a.clone())));
+			}
+			n_args.push(None);
+			let mut success = 1;
+			let v = cb(ctx, &n_args as *const _ as *const *const Val, &mut success);
+			let v = *Box::from_raw(v);
+			if success == 1 {
+				Ok(v)
+			} else {
+				let e = v.try_cast_str("native error").expect("error msg");
+				Err(Error::RuntimeError(e).into())
+			}
+		})),
+	)
+}
modifiedcrates/jrsonnet-evaluator/src/builtin/manifest.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/builtin/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/manifest.rs
@@ -117,7 +117,7 @@
 			}
 			buf.push('}');
 		}
-		Val::Func(_) | Val::Intristic(_, _) => {
+		Val::Func(_) | Val::Intristic(_, _) | Val::NativeExt(_, _) => {
 			throw!(RuntimeError("tried to manifest function".into()))
 		}
 		Val::Lazy(_) => unreachable!(),
modifiedcrates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -33,6 +33,7 @@
 	FunctionParameterNotBoundInCall(Rc<str>),
 
 	UndefinedExternalVariable(Rc<str>),
+	UndefinedExternalFunction(Rc<str>),
 
 	FieldMustBeStringGot(ValType),
 
modifiedcrates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -5,9 +5,9 @@
 	},
 	context_creator, equals,
 	error::Error::*,
-	future_wrapper, lazy_val, parse_args, primitive_equals, push, throw, with_state, Context,
-	ContextCreator, FuncDesc, LazyBinding, LazyVal, LocError, ObjMember, ObjValue, Result, Val,
-	ValType,
+	future_wrapper, lazy_val, parse_args, parse_function_call, primitive_equals, push, throw,
+	with_state, Context, ContextCreator, FuncDesc, LazyBinding, LazyVal, LocError, ObjMember,
+	ObjValue, Result, Val, ValType,
 };
 use closure::closure;
 use jrsonnet_parser::{
@@ -549,13 +549,20 @@
 					], {
 						Ok(Val::Num(x.powf(n)))
 					})?,
-					("std", "extVar") => parse_args!(context, "std.extVar", args, 2, [
+					("std", "extVar") => parse_args!(context, "std.extVar", args, 1, [
 						0, x: [Val::Str]!!Val::Str, vec![ValType::Str];
 					], {
 						Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or_else(
 							|| UndefinedExternalVariable(x),
 						)?)
 					})?,
+					("std", "native") => parse_args!(context, "std.native", args, 1, [
+						0, x: [Val::Str]!!Val::Str, vec![ValType::Str];
+					], {
+						Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::NativeExt(x.clone(), v)).ok_or_else(
+							|| UndefinedExternalFunction(x),
+						)?)
+					})?,
 					("std", "filter") => noinline!(parse_args!(context, "std.filter", args, 2, [
 						0, func: [Val::Func]!!Val::Func, vec![ValType::Func];
 						1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
@@ -780,6 +787,18 @@
 				})
 			},
 		)?,
+		Val::NativeExt(n, f) => push(
+			loc,
+			|| format!("native <{}> call", n),
+			|| {
+				let args = parse_function_call(context, None, &f.params, args, true)?;
+				let mut out_args = Vec::with_capacity(f.params.len());
+				for p in f.params.0.iter() {
+					out_args.push(args.binding(p.0.clone())?.evaluate()?);
+				}
+				Ok(f.call(&out_args)?)
+			},
+		)?,
 		Val::Func(f) => {
 			let body = || f.evaluate(context, args, tailstrict);
 			if tailstrict {
modifiedcrates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/integrations/serde.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/serde.rs
@@ -40,7 +40,7 @@
 				}
 				Value::Object(out)
 			}
-			Val::Func(_) | Val::Intristic(_, _) => {
+			Val::Func(_) | Val::Intristic(_, _) | Val::NativeExt(_, _) => {
 				throw!(RuntimeError("tried to manifest function".into()))
 			}
 		})
modifiedcrates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/lib.rs
1#![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))]2#![allow(macro_expanded_macro_exports_accessed_by_absolute_paths)]34mod builtin;5mod ctx;6mod dynamic;7pub mod error;8mod evaluate;9mod function;10mod import;11mod integrations;12mod map;13mod obj;14pub mod trace;15mod val;1617pub use ctx::*;18pub use dynamic::*;19use error::{Error::*, LocError, Result, StackTraceElement};20pub use evaluate::*;21pub use function::parse_function_call;22pub use import::*;23use jrsonnet_parser::*;24pub use obj::*;25use std::{26	cell::{Ref, RefCell, RefMut},27	collections::HashMap,28	fmt::Debug,29	path::PathBuf,30	rc::Rc,31};32use trace::{offset_to_location, CodeLocation, CompactFormat, TraceFormat};33pub use val::*;3435type BindableFn = dyn Fn(Option<ObjValue>, Option<ObjValue>) -> Result<LazyVal>;36#[derive(Clone)]37pub enum LazyBinding {38	Bindable(Rc<BindableFn>),39	Bound(LazyVal),40}4142impl Debug for LazyBinding {43	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {44		write!(f, "LazyBinding")45	}46}47impl LazyBinding {48	pub fn evaluate(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {49		match self {50			LazyBinding::Bindable(v) => v(this, super_obj),51			LazyBinding::Bound(v) => Ok(v.clone()),52		}53	}54}5556pub struct EvaluationSettings {57	/// Limits recursion by limiting stack frames58	pub max_stack: usize,59	/// Limit amount of stack trace items preserved60	pub max_trace: usize,61	/// Used for std.extVar62	pub ext_vars: HashMap<Rc<str>, Val>,63	/// TLA vars64	pub tla_vars: HashMap<Rc<str>, Val>,65	/// Global variables are inserted in default context66	pub globals: HashMap<Rc<str>, Val>,67	/// Used to resolve file locations/contents68	pub import_resolver: Box<dyn ImportResolver>,69	/// Used in manifestification functions70	pub manifest_format: ManifestFormat,71	/// Used for bindings72	pub trace_format: Box<dyn TraceFormat>,73}74impl Default for EvaluationSettings {75	fn default() -> Self {76		EvaluationSettings {77			max_stack: 200,78			max_trace: 20,79			globals: Default::default(),80			ext_vars: Default::default(),81			tla_vars: Default::default(),82			import_resolver: Box::new(DummyImportResolver),83			manifest_format: ManifestFormat::Json(4),84			trace_format: Box::new(CompactFormat {85				padding: 4,86				resolver: trace::PathResolver::Absolute,87			}),88		}89	}90}9192#[derive(Default)]93struct EvaluationData {94	/// Used for stack overflow detection, stacktrace is now populated on unwind95	stack_depth: usize,96	/// Contains file source codes and evaluated results for imports and pretty97	/// printing stacktraces98	files: HashMap<Rc<PathBuf>, FileData>,99	str_files: HashMap<Rc<PathBuf>, Rc<str>>,100}101102pub struct FileData {103	source_code: Rc<str>,104	parsed: LocExpr,105	evaluated: Option<Val>,106}107#[derive(Default)]108pub struct EvaluationStateInternals {109	/// Internal state110	data: RefCell<EvaluationData>,111	/// Settings, safe to change at runtime112	settings: RefCell<EvaluationSettings>,113}114115thread_local! {116	/// Contains state for currently executing file117	/// Global state is fine there118	pub(crate) static EVAL_STATE: RefCell<Option<EvaluationState>> = RefCell::new(None)119}120pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {121	EVAL_STATE.with(|s| f(s.borrow().as_ref().unwrap()))122}123pub(crate) fn push<T>(124	e: &Option<ExprLocation>,125	frame_desc: impl FnOnce() -> String,126	f: impl FnOnce() -> Result<T>,127) -> Result<T> {128	if let Some(v) = e {129		with_state(|s| s.push(&v, frame_desc, f))130	} else {131		f()132	}133}134135/// Maintains stack trace and import resolution136#[derive(Default, Clone)]137pub struct EvaluationState(Rc<EvaluationStateInternals>);138139impl EvaluationState {140	/// Parses and adds file to loaded141	pub fn add_file(&self, path: Rc<PathBuf>, source_code: Rc<str>) -> Result<()> {142		self.add_parsed_file(143			path.clone(),144			source_code.clone(),145			parse(146				&source_code,147				&ParserSettings {148					file_name: path.clone(),149					loc_data: true,150				},151			)152			.map_err(|error| ImportSyntaxError {153				error,154				path,155				source_code,156			})?,157		)?;158159		Ok(())160	}161162	/// Adds file by source code and parsed expr163	pub fn add_parsed_file(164		&self,165		name: Rc<PathBuf>,166		source_code: Rc<str>,167		parsed: LocExpr,168	) -> Result<()> {169		self.data_mut().files.insert(170			name,171			FileData {172				source_code,173				parsed,174				evaluated: None,175			},176		);177178		Ok(())179	}180	pub fn get_source(&self, name: &PathBuf) -> Option<Rc<str>> {181		let ro_map = &self.data().files;182		ro_map.get(name).map(|value| value.source_code.clone())183	}184	pub fn map_source_locations(&self, file: &PathBuf, locs: &[usize]) -> Vec<CodeLocation> {185		offset_to_location(&self.get_source(file).unwrap(), locs)186	}187188	pub(crate) fn import_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Val> {189		let file_path = self.resolve_file(from, path)?;190		{191			let files = &self.data().files;192			if files.contains_key(&file_path) {193				return self.evaluate_loaded_file_raw(&file_path);194			}195		}196		let contents = self.load_file_contents(&file_path)?;197		self.add_file(file_path.clone(), contents)?;198		self.evaluate_loaded_file_raw(&file_path)199	}200	pub(crate) fn import_file_str(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<str>> {201		let path = self.resolve_file(from, path)?;202		if !self.data().str_files.contains_key(&path) {203			let file_str = self.load_file_contents(&path)?;204			self.data_mut().str_files.insert(path.clone(), file_str);205		}206		Ok(self.data().str_files.get(&path).cloned().unwrap())207	}208209	fn evaluate_loaded_file_raw(&self, name: &PathBuf) -> Result<Val> {210		let expr: LocExpr = {211			let ro_map = &self.data().files;212			let value = ro_map213				.get(name)214				.unwrap_or_else(|| panic!("file not added: {:?}", name));215			if let Some(ref evaluated) = value.evaluated {216				return Ok(evaluated.clone());217			}218			value.parsed.clone()219		};220		let value = evaluate(self.create_default_context()?, &expr)?;221		{222			self.data_mut()223				.files224				.get_mut(name)225				.unwrap()226				.evaluated227				.replace(value.clone());228		}229		Ok(value)230	}231232	/// Adds standard library global variable (std) to this evaluator233	pub fn with_stdlib(&self) -> &Self {234		use jrsonnet_stdlib::STDLIB_STR;235		let std_path = Rc::new(PathBuf::from("std.jsonnet"));236		self.run_in_state(|| {237			self.add_parsed_file(238				std_path.clone(),239				STDLIB_STR.to_owned().into(),240				builtin::get_parsed_stdlib(),241			)242			.unwrap();243			let val = self.evaluate_loaded_file_raw(&std_path).unwrap();244			self.settings_mut().globals.insert("std".into(), val);245		});246		self247	}248249	/// Creates context with all passed global variables250	pub fn create_default_context(&self) -> Result<Context> {251		let globals = &self.settings().globals;252		let mut new_bindings: HashMap<Rc<str>, LazyBinding> = HashMap::new();253		for (name, value) in globals.iter() {254			new_bindings.insert(255				name.clone(),256				LazyBinding::Bound(resolved_lazy_val!(value.clone())),257			);258		}259		Context::new().extend_unbound(new_bindings, None, None, None)260	}261262	/// Executes code, creating new stack frame263	pub fn push<T>(264		&self,265		e: &ExprLocation,266		frame_desc: impl FnOnce() -> String,267		f: impl FnOnce() -> Result<T>,268	) -> Result<T> {269		{270			let mut data = self.data_mut();271			let stack_depth = &mut data.stack_depth;272			if *stack_depth > self.max_stack() {273				// Error creation uses data, so i drop guard here274				drop(data);275				throw!(StackOverflow);276			} else {277				*stack_depth += 1;278			}279		}280		let result = f();281		self.data_mut().stack_depth -= 1;282		if let Err(mut err) = result {283			(err.1).0.push(StackTraceElement {284				location: e.clone(),285				desc: frame_desc(),286			});287			return Err(err);288		}289		result290	}291292	/// Runs passed function in state (required, if function needs to modify stack trace)293	pub fn run_in_state<T>(&self, f: impl FnOnce() -> T) -> T {294		EVAL_STATE.with(|v| {295			let has_state = v.borrow().is_some();296			if !has_state {297				v.borrow_mut().replace(self.clone());298			}299			let result = f();300			if !has_state {301				v.borrow_mut().take();302			}303			result304		})305	}306307	pub fn stringify_err(&self, e: &LocError) -> String {308		let mut out = String::new();309		self.settings()310			.trace_format311			.write_trace(&mut out, self, e)312			.unwrap();313		out314	}315316	pub fn manifest(&self, val: Val) -> Result<Rc<str>> {317		self.run_in_state(|| val.manifest(&self.manifest_format()))318	}319320	/// If passed value is function - call with set TLA321	pub fn with_tla(&self, val: Val) -> Result<Val> {322		Ok(match val {323			Val::Func(func) => func.evaluate_map(324				self.create_default_context()?,325				&self.settings().tla_vars,326				true,327			)?,328			v => v,329		})330	}331}332333/// Internals334impl EvaluationState {335	fn data(&self) -> Ref<EvaluationData> {336		self.0.data.borrow()337	}338	fn data_mut(&self) -> RefMut<EvaluationData> {339		self.0.data.borrow_mut()340	}341	pub fn settings(&self) -> Ref<EvaluationSettings> {342		self.0.settings.borrow()343	}344	pub fn settings_mut(&self) -> RefMut<EvaluationSettings> {345		self.0.settings.borrow_mut()346	}347}348349/// Raw methods evaluates passed values, but not performs TLA execution350impl EvaluationState {351	pub fn evaluate_file_raw(&self, name: &PathBuf) -> Result<Val> {352		self.run_in_state(|| self.import_file(&std::env::current_dir().expect("cwd"), &name))353	}354	pub fn evaluate_file_raw_nocwd(&self, name: &PathBuf) -> Result<Val> {355		self.run_in_state(|| self.import_file(&PathBuf::from("."), &name))356	}357	/// Parses and evaluates snippet358	pub fn evaluate_snippet_raw(&self, source: Rc<PathBuf>, code: Rc<str>) -> Result<Val> {359		let parsed = parse(360			&code,361			&ParserSettings {362				file_name: source.clone(),363				loc_data: true,364			},365		)366		.unwrap();367		self.add_parsed_file(source, code, parsed.clone())?;368		self.evaluate_expr_raw(parsed)369	}370	/// Evaluates parsed expression371	pub fn evaluate_expr_raw(&self, code: LocExpr) -> Result<Val> {372		self.run_in_state(|| evaluate(self.create_default_context()?, &code))373	}374}375376/// Settings utilities377impl EvaluationState {378	pub fn add_ext_var(&self, name: Rc<str>, value: Val) {379		self.settings_mut().ext_vars.insert(name, value);380	}381	pub fn add_ext_str(&self, name: Rc<str>, value: Rc<str>) {382		self.add_ext_var(name, Val::Str(value));383	}384	pub fn add_ext_code(&self, name: Rc<str>, code: Rc<str>) -> Result<()> {385		let value =386			self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("ext_code {}", name))), code)?;387		self.add_ext_var(name, value);388		Ok(())389	}390391	pub fn add_tla(&self, name: Rc<str>, value: Val) {392		self.settings_mut().tla_vars.insert(name, value);393	}394	pub fn add_tla_str(&self, name: Rc<str>, value: Rc<str>) {395		self.add_tla(name, Val::Str(value));396	}397	pub fn add_tla_code(&self, name: Rc<str>, code: Rc<str>) -> Result<()> {398		let value =399			self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("tla_code {}", name))), code)?;400		self.add_ext_var(name, value);401		Ok(())402	}403404	pub fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {405		Ok(self.settings().import_resolver.resolve_file(from, path)?)406	}407	pub fn load_file_contents(&self, path: &PathBuf) -> Result<Rc<str>> {408		Ok(self.settings().import_resolver.load_file_contents(path)?)409	}410411	pub fn import_resolver(&self) -> Ref<dyn ImportResolver> {412		Ref::map(self.settings(), |s| &*s.import_resolver)413	}414	pub fn set_import_resolver(&self, resolver: Box<dyn ImportResolver>) {415		self.settings_mut().import_resolver = resolver;416	}417418	pub fn manifest_format(&self) -> ManifestFormat {419		self.settings().manifest_format.clone()420	}421	pub fn set_manifest_format(&self, format: ManifestFormat) {422		self.settings_mut().manifest_format = format;423	}424425	pub fn trace_format(&self) -> Ref<dyn TraceFormat> {426		Ref::map(self.settings(), |s| &*s.trace_format)427	}428	pub fn set_trace_format(&self, format: Box<dyn TraceFormat>) {429		self.settings_mut().trace_format = format;430	}431432	pub fn max_trace(&self) -> usize {433		self.settings().max_trace434	}435	pub fn set_max_trace(&self, trace: usize) {436		self.settings_mut().max_trace = trace;437	}438439	pub fn max_stack(&self) -> usize {440		self.settings().max_stack441	}442	pub fn set_max_stack(&self, trace: usize) {443		self.settings_mut().max_stack = trace;444	}445}446447#[cfg(test)]448pub mod tests {449	use super::Val;450	use crate::{error::Error::*, primitive_equals, EvaluationState};451	use jrsonnet_parser::*;452	use std::{path::PathBuf, rc::Rc};453454	#[test]455	#[should_panic]456	fn eval_state_stacktrace() {457		let state = EvaluationState::default();458		state.run_in_state(|| {459			state460				.push(461					&ExprLocation(Rc::new(PathBuf::from("test1.jsonnet")), 10, 20),462					|| "outer".to_owned(),463					|| {464						state.push(465							&ExprLocation(Rc::new(PathBuf::from("test2.jsonnet")), 30, 40),466							|| "inner".to_owned(),467							|| Err(RuntimeError("".into()).into()),468						)?;469						Ok(())470					},471				)472				.unwrap();473		});474	}475476	#[test]477	fn eval_state_standard() {478		let state = EvaluationState::default();479		state.with_stdlib();480		assert!(primitive_equals(481			&state482				.evaluate_snippet_raw(483					Rc::new(PathBuf::from("raw.jsonnet")),484					r#"std.assertEqual(std.base64("test"), "dGVzdA==")"#.into()485				)486				.unwrap(),487			&Val::Bool(true),488		)489		.unwrap());490	}491492	macro_rules! eval {493		($str: expr) => {494			EvaluationState::default()495				.with_stdlib()496				.evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())497				.unwrap()498		};499	}500	macro_rules! eval_json {501		($str: expr) => {{502			let evaluator = EvaluationState::default();503			evaluator.with_stdlib();504			evaluator.run_in_state(|| {505				evaluator506					.evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())507					.unwrap()508					.to_json(0)509					.unwrap()510					.replace("\n", "")511				})512			}};513	}514515	/// Asserts given code returns `true`516	macro_rules! assert_eval {517		($str: expr) => {518			assert!(primitive_equals(&eval!($str), &Val::Bool(true)).unwrap())519		};520	}521522	/// Asserts given code returns `false`523	macro_rules! assert_eval_neg {524		($str: expr) => {525			assert!(primitive_equals(&eval!($str), &Val::Bool(false)).unwrap())526		};527	}528	macro_rules! assert_json {529		($str: expr, $out: expr) => {530			assert_eq!(eval_json!($str), $out.replace("\t", ""))531		};532	}533534	/// Sanity checking, before trusting to another tests535	#[test]536	fn equality_operator() {537		assert_eval!("2 == 2");538		assert_eval_neg!("2 != 2");539		assert_eval!("2 != 3");540		assert_eval_neg!("2 == 3");541		assert_eval!("'Hello' == 'Hello'");542		assert_eval_neg!("'Hello' != 'Hello'");543		assert_eval!("'Hello' != 'World'");544		assert_eval_neg!("'Hello' == 'World'");545	}546547	#[test]548	fn math_evaluation() {549		assert_eval!("2 + 2 * 2 == 6");550		assert_eval!("3 + (2 + 2 * 2) == 9");551	}552553	#[test]554	fn string_concat() {555		assert_eval!("'Hello' + 'World' == 'HelloWorld'");556		assert_eval!("'Hello' * 3 == 'HelloHelloHello'");557		assert_eval!("'Hello' + 'World' * 3 == 'HelloWorldWorldWorld'");558	}559560	#[test]561	fn faster_join() {562		assert_eval!("std.join([0,0], [[1,2],[3,4],[5,6]]) == [1,2,0,0,3,4,0,0,5,6]");563		assert_eval!("std.join(',', ['1','2','3','4']) == '1,2,3,4'");564	}565566	#[test]567	fn function_contexts() {568		assert_eval!(569			r#"570				local k = {571					t(name = self.h): [self.h, name],572					h: 3,573				};574				local f = {575					t: k.t(),576					h: 4,577				};578				f.t[0] == f.t[1]579			"#580		);581	}582583	#[test]584	fn local() {585		assert_eval!("local a = 2; local b = 3; a + b == 5");586		assert_eval!("local a = 1, b = a + 1; a + b == 3");587		assert_eval!("local a = 1; local a = 2; a == 2");588	}589590	#[test]591	fn object_lazyness() {592		assert_json!("local a = {a:error 'test'}; {}", r#"{}"#);593	}594595	#[test]596	fn object_inheritance() {597		assert_json!("{a: self.b} + {b:3}", r#"{"a": 3,"b": 3}"#);598	}599600	#[test]601	fn object_assertion_success() {602		eval!("{assert \"a\" in self} + {a:2}");603	}604605	#[test]606	fn object_assertion_error() {607		eval!("{assert \"a\" in self}");608	}609610	#[test]611	fn lazy_args() {612		eval!("local test(a) = 2; test(error '3')");613	}614615	#[test]616	#[should_panic]617	fn tailstrict_args() {618		eval!("local test(a) = 2; test(error '3') tailstrict");619	}620621	#[test]622	#[should_panic]623	fn no_binding_error() {624		eval!("a");625	}626627	#[test]628	fn test_object() {629		assert_json!("{a:2}", r#"{"a": 2}"#);630		assert_json!("{a:2+2}", r#"{"a": 4}"#);631		assert_json!("{a:2}+{b:2}", r#"{"a": 2,"b": 2}"#);632		assert_json!("{b:3}+{b:2}", r#"{"b": 2}"#);633		assert_json!("{b:3}+{b+:2}", r#"{"b": 5}"#);634		assert_json!("local test='a'; {[test]:2}", r#"{"a": 2}"#);635		assert_json!(636			r#"637				{638					name: "Alice",639					welcome: "Hello " + self.name + "!",640				}641			"#,642			r#"{"name": "Alice","welcome": "Hello Alice!"}"#643		);644		assert_json!(645			r#"646				{647					name: "Alice",648					welcome: "Hello " + self.name + "!",649				} + {650					name: "Bob"651				}652			"#,653			r#"{"name": "Bob","welcome": "Hello Bob!"}"#654		);655	}656657	#[test]658	fn functions() {659		assert_json!(r#"local a = function(b, c = 2) b + c; a(2)"#, "4");660		assert_json!(661			r#"local a = function(b, c = "Dear") b + c + d, d = "World"; a("Hello")"#,662			r#""HelloDearWorld""#663		);664	}665666	#[test]667	fn local_methods() {668		assert_json!(r#"local a(b, c = 2) = b + c; a(2)"#, "4");669		assert_json!(670			r#"local a(b, c = "Dear") = b + c + d, d = "World"; a("Hello")"#,671			r#""HelloDearWorld""#672		);673	}674675	#[test]676	fn object_locals() {677		assert_json!(r#"{local a = 3, b: a}"#, r#"{"b": 3}"#);678		assert_json!(r#"{local a = 3, local c = a, b: c}"#, r#"{"b": 3}"#);679		assert_json!(680			r#"{local a = function (b) {[b]:4}, test: a("test")}"#,681			r#"{"test": {"test": 4}}"#682		);683	}684685	#[test]686	fn object_comp() {687		assert_json!(688			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}"#,689			"{\"h1_2\": \"0a\",\"h1_3\": \"0a\",\"h1_4\": \"0a\",\"h2_3\": \"a1\",\"h2_4\": \"a1\",\"h3_2\": \"0a\",\"h3_4\": \"a1\"}"690		)691	}692693	#[test]694	fn direct_self() {695		println!(696			"{:#?}",697			eval!(698				r#"699					{700						local me = self,701						a: 3,702						b(): me.a,703					}704				"#705			)706		);707	}708709	#[test]710	fn indirect_self() {711		// `self` assigned to `me` was lost when being712		// referenced from field713		eval!(714			r#"{715				local me = self,716				a: 3,717				b: me.a,718			}.b"#719		);720	}721722	// We can't trust other tests (And official jsonnet testsuite), if assert is not working correctly723	#[test]724	fn std_assert_ok() {725		eval!("std.assertEqual(4.5 << 2, 16)");726	}727728	#[test]729	#[should_panic]730	fn std_assert_failure() {731		eval!("std.assertEqual(4.5 << 2, 15)");732	}733734	#[test]735	fn string_is_string() {736		assert!(primitive_equals(737			&eval!("local arr = 'hello'; (!std.isArray(arr)) && (!std.isString(arr))"),738			&Val::Bool(false),739		)740		.unwrap());741	}742743	#[test]744	fn base64_works() {745		assert_json!(r#"std.base64("test")"#, r#""dGVzdA==""#);746	}747748	#[test]749	fn utf8_chars() {750		assert_json!(751			r#"local c="😎";{c:std.codepoint(c),l:std.length(c)}"#,752			r#"{"c": 128526,"l": 1}"#753		)754	}755756	#[test]757	fn json() {758		assert_json!(759			r#"std.manifestJsonEx({a:3, b:4, c:6},"")"#,760			r#""{\n\"a\": 3,\n\"b\": 4,\n\"c\": 6\n}""#761		);762	}763764	#[test]765	fn test() {766		assert_json!(767			r#"[[a, b] for a in [1,2,3] for b in [4,5,6]]"#,768			"[[1,4],[1,5],[1,6],[2,4],[2,5],[2,6],[3,4],[3,5],[3,6]]"769		);770	}771772	#[test]773	fn sjsonnet() {774		eval!(775			r#"776			local x0 = {k: 1};777			local x1 = {k: x0.k + x0.k};778			local x2 = {k: x1.k + x1.k};779			local x3 = {k: x2.k + x2.k};780			local x4 = {k: x3.k + x3.k};781			local x5 = {k: x4.k + x4.k};782			local x6 = {k: x5.k + x5.k};783			local x7 = {k: x6.k + x6.k};784			local x8 = {k: x7.k + x7.k};785			local x9 = {k: x8.k + x8.k};786			local x10 = {k: x9.k + x9.k};787			local x11 = {k: x10.k + x10.k};788			local x12 = {k: x11.k + x11.k};789			local x13 = {k: x12.k + x12.k};790			local x14 = {k: x13.k + x13.k};791			local x15 = {k: x14.k + x14.k};792			local x16 = {k: x15.k + x15.k};793			local x17 = {k: x16.k + x16.k};794			local x18 = {k: x17.k + x17.k};795			local x19 = {k: x18.k + x18.k};796			local x20 = {k: x19.k + x19.k};797			local x21 = {k: x20.k + x20.k};798			x21.k799		"#800		);801	}802803	// This test is commented out by default, because of huge compilation slowdown804	// #[bench]805	// fn bench_codegen(b: &mut Bencher) {806	// 	b.iter(|| {807	// 		#[allow(clippy::all)]808	// 		let stdlib = {809	// 			use jrsonnet_parser::*;810	// 			include!(concat!(env!("OUT_DIR"), "/stdlib.rs"))811	// 		};812	// 		stdlib813	// 	})814	// }815816	/*817	#[bench]818	fn bench_serialize(b: &mut Bencher) {819		b.iter(|| {820			bincode::deserialize::<jrsonnet_parser::LocExpr>(include_bytes!(concat!(821				env!("OUT_DIR"),822				"/stdlib.bincode"823			)))824			.expect("deserialize stdlib")825		})826	}827828	#[bench]829	fn bench_parse(b: &mut Bencher) {830		b.iter(|| {831			jrsonnet_parser::parse(832				jrsonnet_stdlib::STDLIB_STR,833				&jrsonnet_parser::ParserSettings {834					loc_data: true,835					file_name: Rc::new(PathBuf::from("std.jsonnet")),836				},837			)838		})839	}840	*/841842	#[test]843	fn equality() {844		println!(845			"{:?}",846			jrsonnet_parser::parse(847				"{ x: 1, y: 2 } == { x: 1, y: 2 }",848				&ParserSettings::default()849			)850		);851		assert_eval!("{ x: 1, y: 2 } == { x: 1, y: 2 }")852	}853}
addedcrates/jrsonnet-evaluator/src/native.rsdiffbeforeafterboth
--- /dev/null
+++ b/crates/jrsonnet-evaluator/src/native.rs
@@ -0,0 +1,24 @@
+use crate::{error::Result, Val};
+use jrsonnet_parser::ParamsDesc;
+use std::fmt::Debug;
+
+pub struct NativeCallback {
+	pub params: ParamsDesc,
+	handler: Box<dyn Fn(&[Val]) -> Result<Val>>,
+}
+impl NativeCallback {
+	pub fn new(params: ParamsDesc, handler: impl Fn(&[Val]) -> Result<Val> + 'static) -> Self {
+		Self {
+			params,
+			handler: Box::new(handler),
+		}
+	}
+	pub fn call(&self, args: &[Val]) -> Result<Val> {
+		(self.handler)(args)
+	}
+}
+impl Debug for NativeCallback {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		f.debug_struct("NativeCallback").finish()
+	}
+}
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -3,6 +3,7 @@
 	error::Error::*,
 	evaluate,
 	function::{parse_function_call, parse_function_call_map, place_args},
+	native::NativeCallback,
 	throw, with_state, Context, ObjValue, Result,
 };
 use jrsonnet_parser::{el, Arg, ArgsDesc, Expr, LocExpr, ParamsDesc};
@@ -152,6 +153,7 @@
 
 	// Library functions implemented in native
 	Intristic(Rc<str>, Rc<str>),
+	NativeExt(Rc<str>, Rc<NativeCallback>),
 }
 macro_rules! matches_unwrap {
 	($e: expr, $p: pat, $r: expr) => {
@@ -204,10 +206,9 @@
 			Val::Num(..) => ValType::Num,
 			Val::Arr(..) => ValType::Arr,
 			Val::Obj(..) => ValType::Obj,
-			Val::Func(..) => ValType::Func,
 			Val::Bool(_) => ValType::Bool,
 			Val::Null => ValType::Null,
-			Val::Intristic(_, _) => ValType::Func,
+			Val::Func(..) | Val::Intristic(_, _) | Val::NativeExt(_, _) => ValType::Func,
 			Val::Lazy(_) => self.clone().unwrap_if_lazy()?.value_type()?,
 		})
 	}
@@ -343,7 +344,7 @@
 }
 
 fn is_function_like(val: &Val) -> bool {
-	matches!(val, Val::Func(_) | Val::Intristic(_, _))
+	matches!(val, Val::Func(_) | Val::Intristic(_, _) | Val::NativeExt(_, _))
 }
 
 /// Implements std.primitiveEquals builtin