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

--- a/bindings/jsonnet/Cargo.toml
+++ b/bindings/jsonnet/Cargo.toml
@@ -11,6 +11,7 @@
 jrsonnet-interner = { path = "../../crates/jrsonnet-interner", version = "0.3.8" }
 jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.3.8" }
 jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.3.8" }
+gc = { version = "0.4.1", features = ["derive"] }
 
 [lib]
 crate-type = ["cdylib"]

1use gc::{unsafe_empty_trace, Finalize, Gc, Trace};
1use jrsonnet_evaluator::{error::Error, native::NativeCallback, EvaluationState, Val};2use jrsonnet_evaluator::{
3	error::{Error, LocError},
4	native::{NativeCallback, NativeCallbackHandler},
5	EvaluationState, Val,
6};
2use jrsonnet_parser::{Param, ParamsDesc};7use jrsonnet_parser::{Param, ParamsDesc};
3use std::{8use std::{
4	ffi::{c_void, CStr},9	ffi::{c_void, CStr},
5	os::raw::{c_char, c_int},10	os::raw::{c_char, c_int},
11	path::PathBuf,
6	rc::Rc,12	rc::Rc,
7};13};
814
12	success: *mut c_int,18	success: *mut c_int,
13) -> *mut Val;19) -> *mut Val;
20
21struct JsonnetNativeCallbackHandler {
22	ctx: *const c_void,
23	cb: JsonnetNativeCallback,
24}
25impl Finalize for JsonnetNativeCallbackHandler {}
26unsafe impl Trace for JsonnetNativeCallbackHandler {
27	unsafe_empty_trace!();
28}
29impl NativeCallbackHandler for JsonnetNativeCallbackHandler {
30	fn call(&self, _from: Option<Rc<PathBuf>>, args: &[Val]) -> Result<Val, LocError> {
31		let mut n_args = Vec::new();
32		for a in args {
33			n_args.push(Some(Box::new(a.clone())));
34		}
35		n_args.push(None);
36		let mut success = 1;
37		let v = unsafe {
38			(self.cb)(
39				self.ctx,
40				&n_args as *const _ as *const *const Val,
41				&mut success,
42			)
43		};
44		let v = unsafe { *Box::from_raw(v) };
45		if success == 1 {
46			Ok(v)
47		} else {
48			let e = v.try_cast_str("native error").expect("error msg");
49			Err(Error::RuntimeError(e).into())
50		}
51	}
52}
1453
15/// # Safety54/// # Safety
16#[no_mangle]55#[no_mangle]
21	ctx: *const c_void,60	ctx: *const c_void,
22	mut raw_params: *const *const c_char,61	mut raw_params: *const *const c_char,
23) {62) {
63	let name = CStr::from_ptr(name).to_str().expect("utf8 name").into();
24	todo!()64	let mut params = Vec::new();
65	loop {
66		if (*raw_params).is_null() {
67			break;
68		}
69		let param = CStr::from_ptr(*raw_params).to_str().expect("not utf8");
70		params.push(Param(param.into(), None));
71		raw_params = raw_params.offset(1);
72	}
73	let params = ParamsDesc(Rc::new(params));
74
75	vm.add_native(
76		name,
77		Gc::new(NativeCallback::new(
78			params,
79			Box::new(JsonnetNativeCallbackHandler { ctx, cb }),
80		)),
81	)
25}82}
2683

--- a/bindings/jsonnet/src/val_make.rs
+++ b/bindings/jsonnet/src/val_make.rs
@@ -1,10 +1,10 @@
 //! Create values in VM
 
+use gc::Gc;
 use jrsonnet_evaluator::{ArrValue, EvaluationState, ObjValue, Val};
 use std::{
 	ffi::CStr,
 	os::raw::{c_char, c_double, c_int},
-	rc::Rc,
 };
 
 /// # Safety
@@ -38,7 +38,7 @@
 
 #[no_mangle]
 pub extern "C" fn jsonnet_json_make_array(_vm: &EvaluationState) -> *mut Val {
-	todo!()
+	Box::into_raw(Box::new(Val::Arr(ArrValue::Eager(Gc::new(Vec::new())))))
 }
 
 #[no_mangle]

--- a/bindings/jsonnet/src/val_modify.rs
+++ b/bindings/jsonnet/src/val_modify.rs
@@ -2,7 +2,8 @@
 //! Only tested with variables, which haven't altered by code before appearing here
 //! In jrsonnet every value is immutable, and this code is probally broken
 
-use jrsonnet_evaluator::{EvaluationState, LazyBinding, LazyVal, ObjMember, Val};
+use gc::Gc;
+use jrsonnet_evaluator::{ArrValue, EvaluationState, LazyBinding, LazyVal, ObjMember, Val};
 use jrsonnet_parser::Visibility;
 use std::{ffi::CStr, os::raw::c_char};
 
@@ -22,8 +23,7 @@
 				new.push(item);
 			}
 			new.push(LazyVal::new_resolved(val.clone()));
-			// *arr = Val::Arr(ArrValue::Lazy(Gc::new(new)));
-			todo!()
+			*arr = Val::Arr(ArrValue::Lazy(Gc::new(new)));
 		}
 		_ => panic!("should receive array"),
 	}