difftreelog
fix restore ability to edit arrays in libjsonnet
in: master
2 files changed
bindings/jsonnet/src/val_make.rsdiffbeforeafterboth1//! Create values in VM1//! Create values in VM223use jrsonnet_evaluator::{EvaluationState, ObjValue, Val};3use jrsonnet_evaluator::{ArrValue, EvaluationState, ObjValue, Val};4use std::{4use std::{5 ffi::CStr,5 ffi::CStr,6 os::raw::{c_char, c_double, c_int},6 os::raw::{c_char, c_double, c_int},7 rc::Rc,7};8};899/// # Safety10/// # Safety373838#[no_mangle]39#[no_mangle]39pub extern "C" fn jsonnet_json_make_array(_vm: &EvaluationState) -> *mut Val {40pub extern "C" fn jsonnet_json_make_array(_vm: &EvaluationState) -> *mut Val {40 todo!()41 Box::into_raw(Box::new(Val::Arr(ArrValue::Eager(Rc::new(Vec::new())))))41}42}424343#[no_mangle]44#[no_mangle]bindings/jsonnet/src/val_modify.rsdiffbeforeafterboth--- a/bindings/jsonnet/src/val_modify.rs
+++ b/bindings/jsonnet/src/val_modify.rs
@@ -2,7 +2,9 @@
//! Only tested with variables, which haven't altered by code before appearing here
//! In jrsonnet every value is immutable, and this code is probally broken
-use jrsonnet_evaluator::{EvaluationState, LazyBinding, LazyVal, ObjMember, ObjValue, Val};
+use jrsonnet_evaluator::{
+ ArrValue, EvaluationState, LazyBinding, LazyVal, ObjMember, ObjValue, Val,
+};
use jrsonnet_parser::Visibility;
use std::{collections::HashMap, ffi::CStr, os::raw::c_char, rc::Rc};
@@ -12,10 +14,20 @@
#[no_mangle]
pub unsafe extern "C" fn jsonnet_json_array_append(
_vm: &EvaluationState,
- _arr: *mut Val,
- _val: &Val,
+ arr: &mut Val,
+ val: &Val,
) {
- todo!()
+ match arr {
+ Val::Arr(old) => {
+ let mut new = Vec::new();
+ for item in old.iter_lazy() {
+ new.push(item);
+ }
+ new.push(LazyVal::new_resolved(val.clone()));
+ *arr = Val::Arr(ArrValue::Lazy(Rc::new(new)));
+ }
+ _ => panic!("should receive array"),
+ }
}
/// # Safety