difftreelog
fix restore ability to edit arrays in libjsonnet
in: master
2 files changed
bindings/jsonnet/src/val_make.rsdiffbeforeafterboth1//! Create values in VM23use jrsonnet_evaluator::{EvaluationState, ObjValue, Val};4use std::{5 ffi::CStr,6 os::raw::{c_char, c_double, c_int},7};89/// # Safety10///11/// This function is safe, if received v is a pointer to normal C string12#[no_mangle]13pub unsafe extern "C" fn jsonnet_json_make_string(14 _vm: &EvaluationState,15 v: *const c_char,16) -> *mut Val {17 let cstr = CStr::from_ptr(v);18 let str = cstr.to_str().unwrap();19 Box::into_raw(Box::new(Val::Str(str.into())))20}2122#[no_mangle]23pub extern "C" fn jsonnet_json_make_number(_vm: &EvaluationState, v: c_double) -> *mut Val {24 Box::into_raw(Box::new(Val::Num(v)))25}2627#[no_mangle]28pub extern "C" fn jsonnet_json_make_bool(_vm: &EvaluationState, v: c_int) -> *mut Val {29 assert!(v == 0 || v == 1);30 Box::into_raw(Box::new(Val::Bool(v == 1)))31}3233#[no_mangle]34pub extern "C" fn jsonnet_json_make_null(_vm: &EvaluationState) -> *mut Val {35 Box::into_raw(Box::new(Val::Null))36}3738#[no_mangle]39pub extern "C" fn jsonnet_json_make_array(_vm: &EvaluationState) -> *mut Val {40 todo!()41}4243#[no_mangle]44pub extern "C" fn jsonnet_json_make_object(_vm: &EvaluationState) -> *mut Val {45 Box::into_raw(Box::new(Val::Obj(ObjValue::new_empty())))46}1//! Create values in VM23use jrsonnet_evaluator::{ArrValue, EvaluationState, ObjValue, Val};4use std::{5 ffi::CStr,6 os::raw::{c_char, c_double, c_int},7 rc::Rc,8};910/// # Safety11///12/// This function is safe, if received v is a pointer to normal C string13#[no_mangle]14pub unsafe extern "C" fn jsonnet_json_make_string(15 _vm: &EvaluationState,16 v: *const c_char,17) -> *mut Val {18 let cstr = CStr::from_ptr(v);19 let str = cstr.to_str().unwrap();20 Box::into_raw(Box::new(Val::Str(str.into())))21}2223#[no_mangle]24pub extern "C" fn jsonnet_json_make_number(_vm: &EvaluationState, v: c_double) -> *mut Val {25 Box::into_raw(Box::new(Val::Num(v)))26}2728#[no_mangle]29pub extern "C" fn jsonnet_json_make_bool(_vm: &EvaluationState, v: c_int) -> *mut Val {30 assert!(v == 0 || v == 1);31 Box::into_raw(Box::new(Val::Bool(v == 1)))32}3334#[no_mangle]35pub extern "C" fn jsonnet_json_make_null(_vm: &EvaluationState) -> *mut Val {36 Box::into_raw(Box::new(Val::Null))37}3839#[no_mangle]40pub extern "C" fn jsonnet_json_make_array(_vm: &EvaluationState) -> *mut Val {41 Box::into_raw(Box::new(Val::Arr(ArrValue::Eager(Rc::new(Vec::new())))))42}4344#[no_mangle]45pub extern "C" fn jsonnet_json_make_object(_vm: &EvaluationState) -> *mut Val {46 Box::into_raw(Box::new(Val::Obj(ObjValue::new_empty())))47}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