git.delta.rocks / jrsonnet / refs/commits / abdb122c59b2

--- a/crates/jsonnet-evaluator/src/evaluate.rs
+++ b/crates/jsonnet-evaluator/src/evaluate.rs
@@ -1,6 +1,6 @@
 use crate::{
-	binding, context_creator, create_error, future_wrapper, lazy_val, push, with_state, Context,
-	ContextCreator, FuncDesc, LazyBinding, ObjMember, ObjValue, Result, Val,
+	context_creator, create_error, future_wrapper, lazy_val, push, with_state, Context,
+	ContextCreator, FuncDesc, LazyBinding, LazyVal, ObjMember, ObjValue, Result, Val,
 };
 use closure::closure;
 use jsonnet_parser::{
@@ -252,17 +252,17 @@
 							ObjMember {
 								add: plus,
 								visibility: visibility.clone(),
-								invoke: binding!(
+								invoke: LazyBinding::Bindable(Rc::new(
 									closure!(clone name, clone value, clone context_creator, |this, super_obj| {
-										push(value.clone(), "object ".to_owned()+&name+" field", ||{
+										Ok(LazyVal::new_resolved(push(value.clone(), "object ".to_owned()+&name+" field", ||{
 											let context = context_creator.0(this, super_obj)?;
 											evaluate(
 												context,
 												&value,
 											)?.unwrap_if_lazy()
-										})
-									})
-								),
+										})?))
+									}),
+								)),
 							},
 						);
 					}
@@ -282,16 +282,16 @@
 							ObjMember {
 								add: false,
 								visibility: Visibility::Hidden,
-								invoke: binding!(
+								invoke: LazyBinding::Bindable(Rc::new(
 									closure!(clone value, clone context_creator, |this, super_obj| {
 										// TODO: Assert
-										Ok(evaluate_method(
+										Ok(LazyVal::new_resolved(evaluate_method(
 											context_creator.0(this, super_obj)?,
 											params.clone(),
 											value.clone(),
-										))
-									})
-								),
+										)))
+									}),
+								)),
 							},
 						);
 					}

--- a/crates/jsonnet-evaluator/src/lib.rs
+++ b/crates/jsonnet-evaluator/src/lib.rs
@@ -22,12 +22,6 @@
 use std::{cell::RefCell, collections::HashMap, fmt::Debug, path::PathBuf, rc::Rc};
 pub use val::*;
 
-rc_fn_helper!(
-	Binding,
-	binding,
-	dyn Fn(Option<ObjValue>, Option<ObjValue>) -> Result<Val>
-);
-
 type BindableFn = dyn Fn(Option<ObjValue>, Option<ObjValue>) -> Result<LazyVal>;
 #[derive(Clone)]
 pub enum LazyBinding {

--- a/crates/jsonnet-evaluator/src/map.rs
+++ b/crates/jsonnet-evaluator/src/map.rs
@@ -18,6 +18,7 @@
 		}))
 	}
 
+	#[inline(always)]
 	pub fn get<Q: ?Sized>(&self, key: &Q) -> Option<&V>
 	where
 		K: Borrow<Q>,

1use crate::{evaluate_add_op, Binding, Result, Val};1use crate::{evaluate_add_op, LazyBinding, Result, Val};
2use indexmap::IndexMap;2use indexmap::IndexMap;
3use jsonnet_parser::Visibility;3use jsonnet_parser::Visibility;
4use std::{4use std::{
12pub struct ObjMember {12pub struct ObjMember {
13	pub add: bool,13	pub add: bool,
14	pub visibility: Visibility,14	pub visibility: Visibility,
15	pub invoke: Binding,15	pub invoke: LazyBinding,
16}16}
1717
18#[derive(Debug)]18#[derive(Debug)]
102	}102	}
103	pub(crate) fn get_raw(&self, key: &str, real_this: &ObjValue) -> Result<Option<Val>> {103	pub(crate) fn get_raw(&self, key: &str, real_this: &ObjValue) -> Result<Option<Val>> {
104		match (self.0.this_entries.get(key), &self.0.super_obj) {104		match (self.0.this_entries.get(key), &self.0.super_obj) {
105			(Some(k), None) => Ok(Some(k.invoke.0(105			(Some(k), None) => Ok(Some(
106				k.invoke
106				Some(real_this.clone()),107					.evaluate(Some(real_this.clone()), self.0.super_obj.clone())?
107				self.0.super_obj.clone(),
108			)?)),108					.evaluate()?,
109			)),
109			(Some(k), Some(s)) => {110			(Some(k), Some(s)) => {
110				let our = k.invoke.0(Some(real_this.clone()), self.0.super_obj.clone())?;111				let our = k
112					.invoke
113					.evaluate(Some(real_this.clone()), self.0.super_obj.clone())?
114					.evaluate()?;
111				if k.add {115				if k.add {
112					s.get_raw(key, real_this)?116					s.get_raw(key, real_this)?
113						.map_or(Ok(Some(our.clone())), |v| {117						.map_or(Ok(Some(our.clone())), |v| {