git.delta.rocks / jrsonnet / refs/commits / 94d4a5ac92ff

difftreelog

build temporary disable ffi array manipulation

Yaroslav Bolyukin2020-12-01parent: #407517f.patch.diff
in: master

2 files changed

modifiedbindings/jsonnet/src/val_make.rsdiffbeforeafterboth
before · bindings/jsonnet/src/val_make.rs
1//! Create values in VM23use jrsonnet_evaluator::{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	Box::into_raw(Box::new(Val::Arr(Rc::new(Vec::new()))))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
@@ -12,17 +12,10 @@
 #[no_mangle]
 pub unsafe extern "C" fn jsonnet_json_array_append(
 	_vm: &EvaluationState,
-	arr: *mut Val,
-	val: &Val,
+	_arr: *mut Val,
+	_val: &Val,
 ) {
-	match *Box::from_raw(arr) {
-		Val::Arr(old) => {
-			let mut new = Rc::try_unwrap(old).expect("arr with no refs");
-			new.push(val.clone());
-			*arr = Val::Arr(Rc::new(new));
-		}
-		_ => panic!("should receive array"),
-	}
+	todo!()
 }
 
 /// # Safety