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
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 jrsonnet_evaluator::{ArrValue, EvaluationState, LazyBinding, LazyVal, ObjMember, Val};5use jrsonnet_evaluator::{EvaluationState, LazyBinding, LazyVal, ObjMember, Val};
6use jrsonnet_parser::Visibility;6use jrsonnet_parser::Visibility;
7use std::{ffi::CStr, os::raw::c_char, rc::Rc};7use std::{ffi::CStr, os::raw::c_char};
88
9/// # Safety9/// # Safety
10///10///
22 new.push(item);22 new.push(item);
23 }23 }
24 new.push(LazyVal::new_resolved(val.clone()));24 new.push(LazyVal::new_resolved(val.clone()));
25 // *arr = Val::Arr(ArrValue::Lazy(Gc::new(new)));
25 *arr = Val::Arr(ArrValue::Lazy(Rc::new(new)));26 todo!()
26 }27 }
27 _ => panic!("should receive array"),28 _ => panic!("should receive array"),
28 }29 }