difftreelog
feat pass caller location to native function
in: master
5 files changed
bindings/jsonnet/src/native.rsdiffbeforeafterboth1use jrsonnet_evaluator::{error::Error, native::NativeCallback, EvaluationState, Val};2use jrsonnet_parser::{Param, ParamsDesc};3use std::{4 ffi::{c_void, CStr},5 os::raw::{c_char, c_int},6 rc::Rc,7};89type JsonnetNativeCallback = unsafe extern "C" fn(10 ctx: *const c_void,11 argv: *const *const Val,12 success: *mut c_int,13) -> *mut Val;1415/// # Safety16#[no_mangle]17pub unsafe extern "C" fn jsonnet_native_callback(18 vm: &EvaluationState,19 name: *const c_char,20 cb: JsonnetNativeCallback,21 ctx: *const c_void,22 mut raw_params: *const *const c_char,23) {24 let name = CStr::from_ptr(name).to_str().expect("utf8 name").into();25 let mut params = Vec::new();26 loop {27 if (*raw_params).is_null() {28 break;29 }30 let param = CStr::from_ptr(*raw_params).to_str().expect("not utf8");31 params.push(Param(param.into(), None));32 raw_params = raw_params.offset(1);33 }34 let params = ParamsDesc(Rc::new(params));3536 vm.add_native(37 name,38 Rc::new(NativeCallback::new(params, move |args| {39 let mut n_args = Vec::new();40 for a in args {41 n_args.push(Some(Box::new(a.clone())));42 }43 n_args.push(None);44 let mut success = 1;45 let v = cb(ctx, &n_args as *const _ as *const *const Val, &mut success);46 let v = *Box::from_raw(v);47 if success == 1 {48 Ok(v)49 } else {50 let e = v.try_cast_str("native error").expect("error msg");51 Err(Error::RuntimeError(e).into())52 }53 })),54 )55}1use jrsonnet_evaluator::{error::Error, native::NativeCallback, EvaluationState, Val};2use jrsonnet_parser::{Param, ParamsDesc};3use std::{4 ffi::{c_void, CStr},5 os::raw::{c_char, c_int},6 rc::Rc,7};89type JsonnetNativeCallback = unsafe extern "C" fn(10 ctx: *const c_void,11 argv: *const *const Val,12 success: *mut c_int,13) -> *mut Val;1415/// # Safety16#[no_mangle]17pub unsafe extern "C" fn jsonnet_native_callback(18 vm: &EvaluationState,19 name: *const c_char,20 cb: JsonnetNativeCallback,21 ctx: *const c_void,22 mut raw_params: *const *const c_char,23) {24 let name = CStr::from_ptr(name).to_str().expect("utf8 name").into();25 let mut params = Vec::new();26 loop {27 if (*raw_params).is_null() {28 break;29 }30 let param = CStr::from_ptr(*raw_params).to_str().expect("not utf8");31 params.push(Param(param.into(), None));32 raw_params = raw_params.offset(1);33 }34 let params = ParamsDesc(Rc::new(params));3536 vm.add_native(37 name,38 Rc::new(NativeCallback::new(params, move |_caller, args| {39 let mut n_args = Vec::new();40 for a in args {41 n_args.push(Some(Box::new(a.clone())));42 }43 n_args.push(None);44 let mut success = 1;45 let v = cb(ctx, &n_args as *const _ as *const *const Val, &mut success);46 let v = *Box::from_raw(v);47 if success == 1 {48 Ok(v)49 } else {50 let e = v.try_cast_str("native error").expect("error msg");51 Err(Error::RuntimeError(e).into())52 }53 })),54 )55}crates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -540,7 +540,9 @@
&evaluate(context.clone(), s)?,
&Val::Obj(evaluate_object(context, t)?),
)?,
- Apply(value, args, tailstrict) => evaluate_apply(context, value, args, loc.as_ref(), *tailstrict)?,
+ Apply(value, args, tailstrict) => {
+ evaluate_apply(context, value, args, loc.as_ref(), *tailstrict)?
+ }
Function(params, body) => {
evaluate_method(context, "anonymous".into(), params.clone(), body.clone())
}
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -886,14 +886,20 @@
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!(),
+ |caller, args| {
+ assert_eq!(
+ caller.unwrap(),
+ Rc::new(PathBuf::from("native_caller.jsonnet"))
+ );
+ match (&args[0], &args[1]) {
+ (Val::Num(a), Val::Num(b)) => Ok(Val::Num(a + b)),
+ (_, _) => unreachable!(),
+ }
},
)),
);
evaluator.evaluate_snippet_raw(
- Rc::new(PathBuf::from("test.jsonnet")),
+ Rc::new(PathBuf::from("native_caller.jsonnet")),
"std.assertEqual(std.native(\"native_add\")(1, 2), 3)".into(),
)?;
Ok(())
crates/jrsonnet-evaluator/src/native.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/native.rs
+++ b/crates/jrsonnet-evaluator/src/native.rs
@@ -1,20 +1,25 @@
use crate::{error::Result, Val};
use jrsonnet_parser::ParamsDesc;
use std::fmt::Debug;
+use std::path::PathBuf;
+use std::rc::Rc;
pub struct NativeCallback {
pub params: ParamsDesc,
- handler: Box<dyn Fn(&[Val]) -> Result<Val>>,
+ handler: Box<dyn Fn(Option<Rc<PathBuf>>, &[Val]) -> Result<Val>>,
}
impl NativeCallback {
- pub fn new(params: ParamsDesc, handler: impl Fn(&[Val]) -> Result<Val> + 'static) -> Self {
+ pub fn new(
+ params: ParamsDesc,
+ handler: impl Fn(Option<Rc<PathBuf>>, &[Val]) -> Result<Val> + 'static,
+ ) -> Self {
Self {
params,
handler: Box::new(handler),
}
}
- pub fn call(&self, args: &[Val]) -> Result<Val> {
- (self.handler)(args)
+ pub fn call(&self, caller: Option<Rc<PathBuf>>, args: &[Val]) -> Result<Val> {
+ (self.handler)(caller, args)
}
}
impl Debug for NativeCallback {
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -124,7 +124,7 @@
for p in handler.params.0.iter() {
out_args.push(args.binding(p.0.clone())?.evaluate()?);
}
- Ok(handler.call(&out_args)?)
+ Ok(handler.call(loc.clone().map(|l| l.0.clone()), &out_args)?)
}
}
}