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
10mod import;10mod import;
11mod integrations;11mod integrations;
12mod map;12mod map;
13pub mod native;
13mod obj;14mod obj;
14pub mod trace;15pub mod trace;
15mod val;16mod val;
21pub use function::parse_function_call;22pub use function::parse_function_call;
22pub use import::*;23pub use import::*;
23use jrsonnet_parser::*;24use jrsonnet_parser::*;
25use native::NativeCallback;
24pub use obj::*;26pub use obj::*;
25use std::{27use std::{
26	cell::{Ref, RefCell, RefMut},28	cell::{Ref, RefCell, RefMut},
60	pub max_trace: usize,62	pub max_trace: usize,
61	/// Used for std.extVar63	/// Used for std.extVar
62	pub ext_vars: HashMap<Rc<str>, Val>,64	pub ext_vars: HashMap<Rc<str>, Val>,
65	/// Used for ext.native
66	pub ext_natives: HashMap<Rc<str>, Rc<NativeCallback>>,
63	/// TLA vars67	/// TLA vars
64	pub tla_vars: HashMap<Rc<str>, Val>,68	pub tla_vars: HashMap<Rc<str>, Val>,
65	/// Global variables are inserted in default context69	/// Global variables are inserted in default context
78			max_trace: 20,82			max_trace: 20,
79			globals: Default::default(),83			globals: Default::default(),
80			ext_vars: Default::default(),84			ext_vars: Default::default(),
85			ext_natives: Default::default(),
81			tla_vars: Default::default(),86			tla_vars: Default::default(),
82			import_resolver: Box::new(DummyImportResolver),87			import_resolver: Box::new(DummyImportResolver),
83			manifest_format: ManifestFormat::Json(4),88			manifest_format: ManifestFormat::Json(4),
415		self.settings_mut().import_resolver = resolver;420		self.settings_mut().import_resolver = resolver;
416	}421	}
422
423	pub fn add_native(&self, name: Rc<str>, cb: Rc<NativeCallback>) {
424		self.settings_mut().ext_natives.insert(name, cb);
425	}
417426
418	pub fn manifest_format(&self) -> ManifestFormat {427	pub fn manifest_format(&self) -> ManifestFormat {
419		self.settings().manifest_format.clone()428		self.settings().manifest_format.clone()
851		assert_eval!("{ x: 1, y: 2 } == { x: 1, y: 2 }")860		assert_eval!("{ x: 1, y: 2 } == { x: 1, y: 2 }")
852	}861	}
862
863	#[test]
864	fn native_ext() -> crate::error::Result<()> {
865		use super::native::NativeCallback;
866		let evaluator = EvaluationState::default();
867
868		evaluator.with_stdlib();
869		evaluator.settings_mut().ext_natives.insert(
870			"native_add".into(),
871			Rc::new(NativeCallback::new(
872				ParamsDesc(Rc::new(vec![
873					Param("a".into(), None),
874					Param("b".into(), None),
875				])),
876				|args| match (&args[0], &args[1]) {
877					(Val::Num(a), Val::Num(b)) => Ok(Val::Num(a + b)),
878					(_, _) => todo!(),
879				},
880			)),
881		);
882		evaluator.evaluate_snippet_raw(
883			Rc::new(PathBuf::from("test.jsonnet")),
884			"std.assertEqual(std.native(\"native_add\")(1, 2), 3)".into(),
885		)?;
886		Ok(())
887	}
853}888}
854889
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