difftreelog
fix restore ability to edit arrays in libjsonnet
in: master
2 files changed
bindings/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]
bindings/jsonnet/src/val_modify.rsdiffbeforeafterboth1//! 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, ObjValue, Val};6use jrsonnet_parser::Visibility;7use std::{collections::HashMap, 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 todo!()19}2021/// # Safety22///23/// This function is safe if passed name is ok24#[no_mangle]25pub unsafe extern "C" fn jsonnet_json_object_append(26 _vm: &EvaluationState,27 obj: &mut Val,28 name: *const c_char,29 val: &Val,30) {31 match obj {32 Val::Obj(old) => {33 let mut new = HashMap::new();34 new.insert(35 CStr::from_ptr(name).to_str().unwrap().into(),36 ObjMember {37 add: false,38 visibility: Visibility::Normal,39 invoke: LazyBinding::Bound(LazyVal::new_resolved(val.clone())),40 location: None,41 },42 );43 let new_obj = ObjValue::new(Some(old.clone()), Rc::new(new));44 *obj = Val::Obj(new_obj);45 }46 _ => panic!("should receive object"),47 }48}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::{6 ArrValue, EvaluationState, LazyBinding, LazyVal, ObjMember, ObjValue, Val,7};8use jrsonnet_parser::Visibility;9use std::{collections::HashMap, ffi::CStr, os::raw::c_char, rc::Rc};1011/// # Safety12///13/// Received arr value should be correct pointer to array allocated by make_array14#[no_mangle]15pub unsafe extern "C" fn jsonnet_json_array_append(16 _vm: &EvaluationState,17 arr: &mut Val,18 val: &Val,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 }29 _ => panic!("should receive array"),30 }31}3233/// # Safety34///35/// This function is safe if passed name is ok36#[no_mangle]37pub unsafe extern "C" fn jsonnet_json_object_append(38 _vm: &EvaluationState,39 obj: &mut Val,40 name: *const c_char,41 val: &Val,42) {43 match obj {44 Val::Obj(old) => {45 let mut new = HashMap::new();46 new.insert(47 CStr::from_ptr(name).to_str().unwrap().into(),48 ObjMember {49 add: false,50 visibility: Visibility::Normal,51 invoke: LazyBinding::Bound(LazyVal::new_resolved(val.clone())),52 location: None,53 },54 );55 let new_obj = ObjValue::new(Some(old.clone()), Rc::new(new));56 *obj = Val::Obj(new_obj);57 }58 _ => panic!("should receive object"),59 }60}