git.delta.rocks / jrsonnet / refs/commits / 3214093c7388

difftreelog

fix restore ability to edit arrays in libjsonnet

Yaroslav Bolyukin2021-01-24parent: #ced22d8.patch.diff
in: master

2 files changed

modifiedbindings/jsonnet/src/val_make.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/val_make.rs
+++ b/bindings/jsonnet/src/val_make.rs
@@ -1,9 +1,10 @@
 //! Create values in VM
 
-use jrsonnet_evaluator::{EvaluationState, ObjValue, Val};
+use jrsonnet_evaluator::{ArrValue, EvaluationState, ObjValue, Val};
 use std::{
 	ffi::CStr,
 	os::raw::{c_char, c_double, c_int},
+	rc::Rc,
 };
 
 /// # Safety
@@ -37,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(Rc::new(Vec::new())))))
 }
 
 #[no_mangle]
modifiedbindings/jsonnet/src/val_modify.rsdiffbeforeafterboth
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::{EvaluationState, LazyBinding, LazyVal, ObjMember, ObjValue, Val};5use jrsonnet_evaluator::{
6 ArrValue, EvaluationState, LazyBinding, LazyVal, ObjMember, ObjValue, Val,
7};
6use jrsonnet_parser::Visibility;8use jrsonnet_parser::Visibility;
7use std::{collections::HashMap, ffi::CStr, os::raw::c_char, rc::Rc};9use std::{collections::HashMap, ffi::CStr, os::raw::c_char, rc::Rc};
12#[no_mangle]14#[no_mangle]
13pub unsafe extern "C" fn jsonnet_json_array_append(15pub unsafe extern "C" fn jsonnet_json_array_append(
14 _vm: &EvaluationState,16 _vm: &EvaluationState,
15 _arr: *mut Val,17 arr: &mut Val,
16 _val: &Val,18 val: &Val,
17) {19) {
20 match arr {
21 Val::Arr(old) => {
22 let mut new = Vec::new();
23 for item in old.iter_lazy() {
24 new.push(item);
25 }
26 new.push(LazyVal::new_resolved(val.clone()));
27 *arr = Val::Arr(ArrValue::Lazy(Rc::new(new)));
28 }
18 todo!()29 _ => panic!("should receive array"),
30 }
19}31}
2032
21/// # Safety33/// # Safety