git.delta.rocks / jrsonnet / refs/commits / c437de150173

--- a/bindings/jsonnet/src/native.rs
+++ b/bindings/jsonnet/src/native.rs
@@ -35,7 +35,7 @@
 
 	vm.add_native(
 		name,
-		Rc::new(NativeCallback::new(params, move |args| {
+		Rc::new(NativeCallback::new(params, move |_caller, args| {
 			let mut n_args = Vec::new();
 			for a in args {
 				n_args.push(Some(Box::new(a.clone())));

--- 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())
 		}

--- 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(())

1use crate::{error::Result, Val};1use crate::{error::Result, Val};
2use jrsonnet_parser::ParamsDesc;2use jrsonnet_parser::ParamsDesc;
3use std::fmt::Debug;3use std::fmt::Debug;
4use std::path::PathBuf;
5use std::rc::Rc;
46
5pub struct NativeCallback {7pub struct NativeCallback {
6	pub params: ParamsDesc,8	pub params: ParamsDesc,
7	handler: Box<dyn Fn(&[Val]) -> Result<Val>>,9	handler: Box<dyn Fn(Option<Rc<PathBuf>>, &[Val]) -> Result<Val>>,
8}10}
9impl NativeCallback {11impl NativeCallback {
10	pub fn new(params: ParamsDesc, handler: impl Fn(&[Val]) -> Result<Val> + 'static) -> Self {12	pub fn new(
13		params: ParamsDesc,
14		handler: impl Fn(Option<Rc<PathBuf>>, &[Val]) -> Result<Val> + 'static,
15	) -> Self {
11		Self {16		Self {
12			params,17			params,
13			handler: Box::new(handler),18			handler: Box::new(handler),
14		}19		}
15	}20	}
16	pub fn call(&self, args: &[Val]) -> Result<Val> {21	pub fn call(&self, caller: Option<Rc<PathBuf>>, args: &[Val]) -> Result<Val> {
17		(self.handler)(args)22		(self.handler)(caller, args)
18	}23	}
19}24}
20impl Debug for NativeCallback {25impl Debug for NativeCallback {

--- 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)?)
 			}
 		}
 	}