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
--- a/bindings/jsonnet/src/val_make.rs
+++ b/bindings/jsonnet/src/val_make.rs
@@ -38,7 +38,7 @@
 
 #[no_mangle]
 pub extern "C" fn jsonnet_json_make_array(_vm: &EvaluationState) -> *mut Val {
-	Box::into_raw(Box::new(Val::Arr(ArrValue::Eager(Rc::new(Vec::new())))))
+	todo!()
 }
 
 #[no_mangle]
modifiedbindings/jsonnet/src/val_modify.rsdiffbeforeafterboth
before · bindings/jsonnet/src/val_modify.rs
1//! Modify VM values2//! Only tested with variables, which haven't altered by code before appearing here3//! In jrsonnet every value is immutable, and this code is probally broken45use jrsonnet_evaluator::{ArrValue, EvaluationState, LazyBinding, LazyVal, ObjMember, Val};6use jrsonnet_parser::Visibility;7use std::{ffi::CStr, os::raw::c_char, rc::Rc};89/// # Safety10///11/// Received arr value should be correct pointer to array allocated by make_array12#[no_mangle]13pub unsafe extern "C" fn jsonnet_json_array_append(14	_vm: &EvaluationState,15	arr: &mut Val,16	val: &Val,17) {18	match arr {19		Val::Arr(old) => {20			let mut new = Vec::new();21			for item in old.iter_lazy() {22				new.push(item);23			}24			new.push(LazyVal::new_resolved(val.clone()));25			*arr = Val::Arr(ArrValue::Lazy(Rc::new(new)));26		}27		_ => panic!("should receive array"),28	}29}3031/// # Safety32///33/// This function is safe if passed name is ok34#[no_mangle]35pub unsafe extern "C" fn jsonnet_json_object_append(36	_vm: &EvaluationState,37	obj: &mut Val,38	name: *const c_char,39	val: &Val,40) {41	match obj {42		Val::Obj(old) => {43			let new_obj = old.clone().extend_with_field(44				CStr::from_ptr(name).to_str().unwrap().into(),45				ObjMember {46					add: false,47					visibility: Visibility::Normal,48					invoke: LazyBinding::Bound(LazyVal::new_resolved(val.clone())),49					location: None,50				},51			);5253			*obj = Val::Obj(new_obj);54		}55		_ => panic!("should receive object"),56	}57}
after · bindings/jsonnet/src/val_modify.rs
1//! Modify VM values2//! Only tested with variables, which haven't altered by code before appearing here3//! In jrsonnet every value is immutable, and this code is probally broken45use jrsonnet_evaluator::{EvaluationState, LazyBinding, LazyVal, ObjMember, Val};6use jrsonnet_parser::Visibility;7use std::{ffi::CStr, os::raw::c_char};89/// # Safety10///11/// Received arr value should be correct pointer to array allocated by make_array12#[no_mangle]13pub unsafe extern "C" fn jsonnet_json_array_append(14	_vm: &EvaluationState,15	arr: &mut Val,16	val: &Val,17) {18	match arr {19		Val::Arr(old) => {20			let mut new = Vec::new();21			for item in old.iter_lazy() {22				new.push(item);23			}24			new.push(LazyVal::new_resolved(val.clone()));25			// *arr = Val::Arr(ArrValue::Lazy(Gc::new(new)));26			todo!()27		}28		_ => panic!("should receive array"),29	}30}3132/// # Safety33///34/// This function is safe if passed name is ok35#[no_mangle]36pub unsafe extern "C" fn jsonnet_json_object_append(37	_vm: &EvaluationState,38	obj: &mut Val,39	name: *const c_char,40	val: &Val,41) {42	match obj {43		Val::Obj(old) => {44			let new_obj = old.clone().extend_with_field(45				CStr::from_ptr(name).to_str().unwrap().into(),46				ObjMember {47					add: false,48					visibility: Visibility::Normal,49					invoke: LazyBinding::Bound(LazyVal::new_resolved(val.clone())),50					location: None,51				},52			);5354			*obj = Val::Obj(new_obj);55		}56		_ => panic!("should receive object"),57	}58}