git.delta.rocks / jrsonnet / refs/commits / 46d0b239f31a

difftreelog

build(bindings) build with gc

Yaroslav Bolyukin2021-06-05parent: #ab385dd.patch.diff
in: master
It will build, but some methods is broken for now

3 files changed

modifiedbindings/jsonnet/src/native.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/native.rs
+++ b/bindings/jsonnet/src/native.rs
@@ -21,35 +21,5 @@
 	ctx: *const c_void,
 	mut raw_params: *const *const c_char,
 ) {
-	let name = CStr::from_ptr(name).to_str().expect("utf8 name").into();
-	let mut params = Vec::new();
-	loop {
-		if (*raw_params).is_null() {
-			break;
-		}
-		let param = CStr::from_ptr(*raw_params).to_str().expect("not utf8");
-		params.push(Param(param.into(), None));
-		raw_params = raw_params.offset(1);
-	}
-	let params = ParamsDesc(Rc::new(params));
-
-	vm.add_native(
-		name,
-		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())));
-			}
-			n_args.push(None);
-			let mut success = 1;
-			let v = cb(ctx, &n_args as *const _ as *const *const Val, &mut success);
-			let v = *Box::from_raw(v);
-			if success == 1 {
-				Ok(v)
-			} else {
-				let e = v.try_cast_str("native error").expect("error msg");
-				Err(Error::RuntimeError(e).into())
-			}
-		})),
-	)
+	todo!()
 }
modifiedbindings/jsonnet/src/val_make.rsdiffbeforeafterboth
after · bindings/jsonnet/src/val_make.rs
1//! Create values in VM23use jrsonnet_evaluator::{ArrValue, EvaluationState, ObjValue, Val};4use std::{5	ffi::CStr,6	os::raw::{c_char, c_double, c_int},7	rc::Rc,8};910/// # Safety11///12/// This function is safe, if received v is a pointer to normal C string13#[no_mangle]14pub unsafe extern "C" fn jsonnet_json_make_string(15	_vm: &EvaluationState,16	v: *const c_char,17) -> *mut Val {18	let cstr = CStr::from_ptr(v);19	let str = cstr.to_str().unwrap();20	Box::into_raw(Box::new(Val::Str(str.into())))21}2223#[no_mangle]24pub extern "C" fn jsonnet_json_make_number(_vm: &EvaluationState, v: c_double) -> *mut Val {25	Box::into_raw(Box::new(Val::Num(v)))26}2728#[no_mangle]29pub extern "C" fn jsonnet_json_make_bool(_vm: &EvaluationState, v: c_int) -> *mut Val {30	assert!(v == 0 || v == 1);31	Box::into_raw(Box::new(Val::Bool(v == 1)))32}3334#[no_mangle]35pub extern "C" fn jsonnet_json_make_null(_vm: &EvaluationState) -> *mut Val {36	Box::into_raw(Box::new(Val::Null))37}3839#[no_mangle]40pub extern "C" fn jsonnet_json_make_array(_vm: &EvaluationState) -> *mut Val {41	todo!()42}4344#[no_mangle]45pub extern "C" fn jsonnet_json_make_object(_vm: &EvaluationState) -> *mut Val {46	Box::into_raw(Box::new(Val::Obj(ObjValue::new_empty())))47}
modifiedbindings/jsonnet/src/val_modify.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/val_modify.rs
+++ b/bindings/jsonnet/src/val_modify.rs
@@ -2,9 +2,9 @@
 //! 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::{ArrValue, EvaluationState, LazyBinding, LazyVal, ObjMember, Val};
+use jrsonnet_evaluator::{EvaluationState, LazyBinding, LazyVal, ObjMember, Val};
 use jrsonnet_parser::Visibility;
-use std::{ffi::CStr, os::raw::c_char, rc::Rc};
+use std::{ffi::CStr, os::raw::c_char};
 
 /// # Safety
 ///
@@ -22,7 +22,8 @@
 				new.push(item);
 			}
 			new.push(LazyVal::new_resolved(val.clone()));
-			*arr = Val::Arr(ArrValue::Lazy(Rc::new(new)));
+			// *arr = Val::Arr(ArrValue::Lazy(Gc::new(new)));
+			todo!()
 		}
 		_ => panic!("should receive array"),
 	}