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

difftreelog

feat update libjsonnet to use gc

Yaroslav Bolyukin2021-06-12parent: #1bf5e01.patch.diff
in: master

4 files changed

modifiedbindings/jsonnet/Cargo.tomldiffbeforeafterboth
11jrsonnet-interner = { path = "../../crates/jrsonnet-interner", version = "0.3.8" }11jrsonnet-interner = { path = "../../crates/jrsonnet-interner", version = "0.3.8" }
12jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.3.8" }12jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.3.8" }
13jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.3.8" }13jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.3.8" }
14gc = { version = "0.4.1", features = ["derive"] }
1415
15[lib]16[lib]
16crate-type = ["cdylib"]17crate-type = ["cdylib"]
modifiedbindings/jsonnet/src/native.rsdiffbeforeafterboth
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
modifiedbindings/jsonnet/src/val_make.rsdiffbeforeafterboth
1//! Create values in VM1//! Create values in VM
22
3use gc::Gc;
3use jrsonnet_evaluator::{ArrValue, EvaluationState, ObjValue, Val};4use jrsonnet_evaluator::{ArrValue, EvaluationState, ObjValue, Val};
4use std::{5use std::{
5 ffi::CStr,6 ffi::CStr,
6 os::raw::{c_char, c_double, c_int},7 os::raw::{c_char, c_double, c_int},
7 rc::Rc,
8};8};
99
10/// # Safety10/// # Safety
3838
39#[no_mangle]39#[no_mangle]
40pub extern "C" fn jsonnet_json_make_array(_vm: &EvaluationState) -> *mut Val {40pub extern "C" fn jsonnet_json_make_array(_vm: &EvaluationState) -> *mut Val {
41 todo!()41 Box::into_raw(Box::new(Val::Arr(ArrValue::Eager(Gc::new(Vec::new())))))
42}42}
4343
44#[no_mangle]44#[no_mangle]
modifiedbindings/jsonnet/src/val_modify.rsdiffbeforeafterboth
2//! Only tested with variables, which haven't altered by code before appearing here2//! Only tested with variables, which haven't altered by code before appearing here
3//! In jrsonnet every value is immutable, and this code is probally broken3//! In jrsonnet every value is immutable, and this code is probally broken
44
5use gc::Gc;
5use jrsonnet_evaluator::{EvaluationState, LazyBinding, LazyVal, ObjMember, Val};6use jrsonnet_evaluator::{ArrValue, EvaluationState, LazyBinding, LazyVal, ObjMember, Val};
6use jrsonnet_parser::Visibility;7use jrsonnet_parser::Visibility;
7use std::{ffi::CStr, os::raw::c_char};8use std::{ffi::CStr, os::raw::c_char};
89
22 new.push(item);23 new.push(item);
23 }24 }
24 new.push(LazyVal::new_resolved(val.clone()));25 new.push(LazyVal::new_resolved(val.clone()));
25 // *arr = Val::Arr(ArrValue::Lazy(Gc::new(new)));
26 todo!()26 *arr = Val::Arr(ArrValue::Lazy(Gc::new(new)));
27 }27 }
28 _ => panic!("should receive array"),28 _ => panic!("should receive array"),
29 }29 }