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
--- 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"]
modifiedbindings/jsonnet/src/native.rsdiffbeforeafterboth
before · bindings/jsonnet/src/native.rs
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	todo!()25}
modifiedbindings/jsonnet/src/val_make.rsdiffbeforeafterboth
--- 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]
modifiedbindings/jsonnet/src/val_modify.rsdiffbeforeafterboth
--- 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"),
 	}