difftreelog
feat native callbacks
in: master
10 files changed
bindings/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;
bindings/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]
bindings/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())
+ }
+ })),
+ )
+}
crates/jrsonnet-evaluator/src/builtin/manifest.rsdiffbeforeafterboth1use crate::error::Error::*;2use crate::error::Result;3use crate::{throw, Val};45#[derive(PartialEq, Clone, Copy)]6pub enum ManifestType {7 // Applied in manifestification8 Manifest,9 /// Used for std.manifestJson10 /// Empty array/objects extends to "[\n\n]" instead of "[ ]" as in manifest11 Std,12 /// No line breaks, used in `obj+''`13 ToString,14 /// Minified json15 Minify,16}1718pub struct ManifestJsonOptions<'s> {19 pub padding: &'s str,20 pub mtype: ManifestType,21}2223pub(crate) fn manifest_json_ex(val: &Val, options: &ManifestJsonOptions<'_>) -> Result<String> {24 let mut out = String::new();25 manifest_json_ex_buf(val, &mut out, &mut String::new(), options)?;26 Ok(out)27}28fn manifest_json_ex_buf(29 val: &Val,30 buf: &mut String,31 cur_padding: &mut String,32 options: &ManifestJsonOptions<'_>,33) -> Result<()> {34 use std::fmt::Write;35 let mtype = options.mtype;36 match val.unwrap_if_lazy()? {37 Val::Bool(v) => {38 if v {39 buf.push_str("true");40 } else {41 buf.push_str("false");42 }43 }44 Val::Null => buf.push_str("null"),45 Val::Str(s) => buf.push_str(&escape_string_json(&s)),46 Val::Num(n) => write!(buf, "{}", n).unwrap(),47 Val::Arr(items) => {48 buf.push('[');49 if !items.is_empty() {50 if mtype != ManifestType::ToString && mtype != ManifestType::Minify {51 buf.push('\n');52 }5354 let old_len = cur_padding.len();55 cur_padding.push_str(options.padding);56 for (i, item) in items.iter().enumerate() {57 if i != 0 {58 buf.push(',');59 if mtype == ManifestType::ToString {60 buf.push(' ');61 } else if mtype != ManifestType::Minify {62 buf.push('\n');63 }64 }65 buf.push_str(cur_padding);66 manifest_json_ex_buf(item, buf, cur_padding, options)?;67 }68 cur_padding.truncate(old_len);6970 if mtype != ManifestType::ToString && mtype != ManifestType::Minify {71 buf.push('\n');72 buf.push_str(cur_padding);73 }74 } else if mtype == ManifestType::Std {75 buf.push_str("\n\n");76 buf.push_str(cur_padding);77 } else if mtype == ManifestType::ToString {78 buf.push(' ');79 }80 buf.push(']');81 }82 Val::Obj(obj) => {83 buf.push('{');84 let fields = obj.visible_fields();85 if !fields.is_empty() {86 if mtype != ManifestType::ToString && mtype != ManifestType::Minify {87 buf.push('\n');88 }8990 let old_len = cur_padding.len();91 cur_padding.push_str(options.padding);92 for (i, field) in fields.into_iter().enumerate() {93 if i != 0 {94 buf.push(',');95 if mtype == ManifestType::ToString {96 buf.push(' ');97 } else if mtype != ManifestType::Minify {98 buf.push('\n');99 }100 }101 buf.push_str(cur_padding);102 buf.push_str(&escape_string_json(&field));103 buf.push_str(": ");104 manifest_json_ex_buf(&obj.get(field)?.unwrap(), buf, cur_padding, options)?;105 }106 cur_padding.truncate(old_len);107108 if mtype != ManifestType::ToString && mtype != ManifestType::Minify {109 buf.push('\n');110 buf.push_str(cur_padding);111 }112 } else if mtype == ManifestType::Std {113 buf.push_str("\n\n");114 buf.push_str(cur_padding);115 } else if mtype == ManifestType::ToString {116 buf.push(' ');117 }118 buf.push('}');119 }120 Val::Func(_) | Val::Intristic(_, _) => {121 throw!(RuntimeError("tried to manifest function".into()))122 }123 Val::Lazy(_) => unreachable!(),124 };125 Ok(())126}127pub fn escape_string_json(s: &str) -> String {128 use std::fmt::Write;129 let mut out = String::new();130 out.push('"');131 for c in s.chars() {132 match c {133 '"' => out.push_str("\\\""),134 '\\' => out.push_str("\\\\"),135 '\u{0008}' => out.push_str("\\b"),136 '\u{000c}' => out.push_str("\\f"),137 '\n' => out.push_str("\\n"),138 '\r' => out.push_str("\\r"),139 '\t' => out.push_str("\\t"),140 c if c < 32 as char || (c >= 127 as char && c <= 159 as char) => {141 write!(out, "\\u{:04x}", c as u32).unwrap()142 }143 c => out.push(c),144 }145 }146 out.push('"');147 out148}149150#[test]151fn json_test() {152 assert_eq!(escape_string_json("\u{001f}"), "\"\\u001f\"")153}1use crate::error::Error::*;2use crate::error::Result;3use crate::{throw, Val};45#[derive(PartialEq, Clone, Copy)]6pub enum ManifestType {7 // Applied in manifestification8 Manifest,9 /// Used for std.manifestJson10 /// Empty array/objects extends to "[\n\n]" instead of "[ ]" as in manifest11 Std,12 /// No line breaks, used in `obj+''`13 ToString,14 /// Minified json15 Minify,16}1718pub struct ManifestJsonOptions<'s> {19 pub padding: &'s str,20 pub mtype: ManifestType,21}2223pub(crate) fn manifest_json_ex(val: &Val, options: &ManifestJsonOptions<'_>) -> Result<String> {24 let mut out = String::new();25 manifest_json_ex_buf(val, &mut out, &mut String::new(), options)?;26 Ok(out)27}28fn manifest_json_ex_buf(29 val: &Val,30 buf: &mut String,31 cur_padding: &mut String,32 options: &ManifestJsonOptions<'_>,33) -> Result<()> {34 use std::fmt::Write;35 let mtype = options.mtype;36 match val.unwrap_if_lazy()? {37 Val::Bool(v) => {38 if v {39 buf.push_str("true");40 } else {41 buf.push_str("false");42 }43 }44 Val::Null => buf.push_str("null"),45 Val::Str(s) => buf.push_str(&escape_string_json(&s)),46 Val::Num(n) => write!(buf, "{}", n).unwrap(),47 Val::Arr(items) => {48 buf.push('[');49 if !items.is_empty() {50 if mtype != ManifestType::ToString && mtype != ManifestType::Minify {51 buf.push('\n');52 }5354 let old_len = cur_padding.len();55 cur_padding.push_str(options.padding);56 for (i, item) in items.iter().enumerate() {57 if i != 0 {58 buf.push(',');59 if mtype == ManifestType::ToString {60 buf.push(' ');61 } else if mtype != ManifestType::Minify {62 buf.push('\n');63 }64 }65 buf.push_str(cur_padding);66 manifest_json_ex_buf(item, buf, cur_padding, options)?;67 }68 cur_padding.truncate(old_len);6970 if mtype != ManifestType::ToString && mtype != ManifestType::Minify {71 buf.push('\n');72 buf.push_str(cur_padding);73 }74 } else if mtype == ManifestType::Std {75 buf.push_str("\n\n");76 buf.push_str(cur_padding);77 } else if mtype == ManifestType::ToString {78 buf.push(' ');79 }80 buf.push(']');81 }82 Val::Obj(obj) => {83 buf.push('{');84 let fields = obj.visible_fields();85 if !fields.is_empty() {86 if mtype != ManifestType::ToString && mtype != ManifestType::Minify {87 buf.push('\n');88 }8990 let old_len = cur_padding.len();91 cur_padding.push_str(options.padding);92 for (i, field) in fields.into_iter().enumerate() {93 if i != 0 {94 buf.push(',');95 if mtype == ManifestType::ToString {96 buf.push(' ');97 } else if mtype != ManifestType::Minify {98 buf.push('\n');99 }100 }101 buf.push_str(cur_padding);102 buf.push_str(&escape_string_json(&field));103 buf.push_str(": ");104 manifest_json_ex_buf(&obj.get(field)?.unwrap(), buf, cur_padding, options)?;105 }106 cur_padding.truncate(old_len);107108 if mtype != ManifestType::ToString && mtype != ManifestType::Minify {109 buf.push('\n');110 buf.push_str(cur_padding);111 }112 } else if mtype == ManifestType::Std {113 buf.push_str("\n\n");114 buf.push_str(cur_padding);115 } else if mtype == ManifestType::ToString {116 buf.push(' ');117 }118 buf.push('}');119 }120 Val::Func(_) | Val::Intristic(_, _) | Val::NativeExt(_, _) => {121 throw!(RuntimeError("tried to manifest function".into()))122 }123 Val::Lazy(_) => unreachable!(),124 };125 Ok(())126}127pub fn escape_string_json(s: &str) -> String {128 use std::fmt::Write;129 let mut out = String::new();130 out.push('"');131 for c in s.chars() {132 match c {133 '"' => out.push_str("\\\""),134 '\\' => out.push_str("\\\\"),135 '\u{0008}' => out.push_str("\\b"),136 '\u{000c}' => out.push_str("\\f"),137 '\n' => out.push_str("\\n"),138 '\r' => out.push_str("\\r"),139 '\t' => out.push_str("\\t"),140 c if c < 32 as char || (c >= 127 as char && c <= 159 as char) => {141 write!(out, "\\u{:04x}", c as u32).unwrap()142 }143 c => out.push(c),144 }145 }146 out.push('"');147 out148}149150#[test]151fn json_test() {152 assert_eq!(escape_string_json("\u{001f}"), "\"\\u001f\"")153}crates/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),
crates/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 {
crates/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()))
}
})
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -10,6 +10,7 @@
mod import;
mod integrations;
mod map;
+pub mod native;
mod obj;
pub mod trace;
mod val;
@@ -21,6 +22,7 @@
pub use function::parse_function_call;
pub use import::*;
use jrsonnet_parser::*;
+use native::NativeCallback;
pub use obj::*;
use std::{
cell::{Ref, RefCell, RefMut},
@@ -60,6 +62,8 @@
pub max_trace: usize,
/// Used for std.extVar
pub ext_vars: HashMap<Rc<str>, Val>,
+ /// Used for ext.native
+ pub ext_natives: HashMap<Rc<str>, Rc<NativeCallback>>,
/// TLA vars
pub tla_vars: HashMap<Rc<str>, Val>,
/// Global variables are inserted in default context
@@ -78,6 +82,7 @@
max_trace: 20,
globals: Default::default(),
ext_vars: Default::default(),
+ ext_natives: Default::default(),
tla_vars: Default::default(),
import_resolver: Box::new(DummyImportResolver),
manifest_format: ManifestFormat::Json(4),
@@ -415,6 +420,10 @@
self.settings_mut().import_resolver = resolver;
}
+ pub fn add_native(&self, name: Rc<str>, cb: Rc<NativeCallback>) {
+ self.settings_mut().ext_natives.insert(name, cb);
+ }
+
pub fn manifest_format(&self) -> ManifestFormat {
self.settings().manifest_format.clone()
}
@@ -850,4 +859,30 @@
);
assert_eval!("{ x: 1, y: 2 } == { x: 1, y: 2 }")
}
+
+ #[test]
+ fn native_ext() -> crate::error::Result<()> {
+ use super::native::NativeCallback;
+ let evaluator = EvaluationState::default();
+
+ evaluator.with_stdlib();
+ evaluator.settings_mut().ext_natives.insert(
+ "native_add".into(),
+ Rc::new(NativeCallback::new(
+ ParamsDesc(Rc::new(vec![
+ Param("a".into(), None),
+ Param("b".into(), None),
+ ])),
+ |args| match (&args[0], &args[1]) {
+ (Val::Num(a), Val::Num(b)) => Ok(Val::Num(a + b)),
+ (_, _) => todo!(),
+ },
+ )),
+ );
+ evaluator.evaluate_snippet_raw(
+ Rc::new(PathBuf::from("test.jsonnet")),
+ "std.assertEqual(std.native(\"native_add\")(1, 2), 3)".into(),
+ )?;
+ Ok(())
+ }
}
crates/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()
+ }
+}
crates/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