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

--- a/crates/jsonnet-evaluator/src/evaluate.rs
+++ b/crates/jsonnet-evaluator/src/evaluate.rs
@@ -54,11 +54,16 @@
 pub fn evaluate_field_name(
 	context: Context,
 	field_name: &jsonnet_parser::FieldName,
-) -> Result<String> {
+) -> Result<Option<String>> {
 	Ok(match field_name {
-		jsonnet_parser::FieldName::Fixed(n) => n.clone(),
+		jsonnet_parser::FieldName::Fixed(n) => Some(n.clone()),
 		jsonnet_parser::FieldName::Dyn(expr) => {
-			evaluate(context, expr)?.try_cast_str("dynamic field name")?
+			let value = evaluate(context, expr)?.unwrap_if_lazy()?;
+			if matches!(value, Val::Null) {
+				None
+			} else {
+				Some(value.try_cast_str("dynamic field name")?)
+			}
 		}
 	})
 }
@@ -234,6 +239,10 @@
 						value,
 					}) => {
 						let name = evaluate_field_name(context.clone(), &name)?;
+						if name.is_none() {
+							continue;
+						}
+						let name = name.unwrap();
 						new_members.insert(
 							name.clone(),
 							ObjMember {
@@ -260,6 +269,10 @@
 						..
 					}) => {
 						let name = evaluate_field_name(context.clone(), &name)?;
+						if name.is_none() {
+							continue;
+						}
+						let name = name.unwrap();
 						new_members.insert(
 							name,
 							ObjMember {
@@ -299,12 +312,6 @@
 				.clone()
 				.unwrap_or_else(|| panic!("this not found")),
 		),
-		Literal(LiteralType::Super) => Val::Obj(
-			context
-				.super_obj()
-				.clone()
-				.unwrap_or_else(|| panic!("super not found")),
-		),
 		Literal(LiteralType::Dollar) => Val::Obj(
 			context
 				.dollar()
@@ -320,6 +327,15 @@
 		BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,
 		UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,
 		Var(name) => Val::Lazy(context.binding(&name)).unwrap_if_lazy()?,
+		Index(LocExpr(v, _), index) if matches!(&**v, Expr::Literal(LiteralType::Super)) => {
+			let name = evaluate(context.clone(), index)?.try_cast_str("object index")?;
+			context
+				.super_obj()
+				.clone()
+				.expect("no super found")
+				.get_raw(&name, &context.this().clone().expect("no this found"))?
+				.expect("value not found")
+		}
 		Index(value, index) => {
 			match (
 				evaluate(context.clone(), value)?.unwrap_if_lazy()?,
@@ -381,6 +397,10 @@
 			evaluate_comp(context, expr, compspecs)?.unwrap(),
 		),
 		Obj(body) => Val::Obj(evaluate_object(context, body.clone())?),
+		ObjExtend(s, t) => evaluate_add_op(
+			&evaluate(context.clone(), s)?,
+			&Val::Obj(evaluate_object(context, t.clone())?),
+		)?,
 		Apply(value, ArgsDesc(args)) => {
 			let value = evaluate(context.clone(), value)?.unwrap_if_lazy()?;
 			match value {
@@ -408,7 +428,7 @@
 							evaluate(context.clone(), &args[0].1)?,
 							evaluate(context, &args[1].1)?,
 						) {
-							assert!(v > 0.0);
+							assert!(v >= 0.0);
 							let mut out = Vec::with_capacity(v as usize);
 							for i in 0..v as usize {
 								out.push(d.evaluate(vec![(None, Val::Num(i as f64))])?)
@@ -452,6 +472,25 @@
 						);
 						Val::Bool(a == b)
 					}
+					("std", "modulo") => {
+						assert_eq!(args.len(), 2);
+						if let (Val::Num(a), Val::Num(b)) = (
+							evaluate(context.clone(), &args[0].1)?,
+							evaluate(context, &args[1].1)?,
+						) {
+							Val::Num(a % b)
+						} else {
+							panic!("bad modulo call");
+						}
+					}
+					("std", "floor") => {
+						assert_eq!(args.len(), 1);
+						if let Val::Num(a) = evaluate(context, &args[0].1)? {
+							Val::Num(a.floor())
+						} else {
+							panic!("bad floor call");
+						}
+					}
 					(ns, name) => panic!("Intristic not found: {}.{}", ns, name),
 				},
 				Val::Func(f) => push(locexpr, "function call".to_owned(), || {
@@ -516,7 +555,7 @@
 					Some(v) => push(v.clone(), "if condition 'else' branch".to_owned(), || {
 						evaluate(context, v)
 					})?,
-					None => Val::Bool(false),
+					None => Val::Null,
 				}
 			}
 		}

83			Ok(None)83			Ok(None)
84		}84		}
85	}85	}
86	fn get_raw(&self, key: &str, real_this: &ObjValue) -> Result<Option<Val>> {86	pub(crate) fn get_raw(&self, key: &str, real_this: &ObjValue) -> Result<Option<Val>> {
87		match (self.0.this_entries.get(key), &self.0.super_obj) {87		match (self.0.this_entries.get(key), &self.0.super_obj) {
88			(Some(k), None) => Ok(Some(k.invoke.0(88			(Some(k), None) => Ok(Some(k.invoke.0(
89				Some(real_this.clone()),89				Some(real_this.clone()),

--- a/crates/jsonnet-evaluator/src/val.rs
+++ b/crates/jsonnet-evaluator/src/val.rs
@@ -3,7 +3,7 @@
 	ObjValue, Result,
 };
 use closure::closure;
-use jsonnet_parser::ParamsDesc;
+use jsonnet_parser::{Param, ParamsDesc};
 use std::{
 	cell::RefCell,
 	collections::HashMap,
@@ -70,19 +70,15 @@
 		let mut new_bindings: HashMap<String, LazyBinding> = HashMap::new();
 		let future_ctx = Context::new_future();
 
-		// self.params
-		// 	.with_defaults()
-		// 	.into_iter()
-		// 	.for_each(|Param(name, default)| {
-		// 		let default = Rc::new(*default.unwrap());
-		// 		new_bindings.insert(
-		// 			name,
-		// 			binding!(move |_, _| Val::Lazy(lazy_val!(|| self
-		// 				.eval_default
-		// 				.0
-		// 				.default(future_ctx.unwrap(), *default.clone())))),
-		// 		);
-		// 	});
+		for Param(name, default) in self.params.with_defaults() {
+			let default = default.unwrap();
+			let eval_default = self.eval_default.clone();
+			new_bindings.insert(
+				name,
+				lazy_binding!(closure!(clone future_ctx, clone default, clone eval_default, |_, _| Ok(lazy_val!(closure!(clone future_ctx, clone eval_default, clone default, || (eval_default.clone()).0
+					(future_ctx.clone().unwrap(), default.clone())))))),
+			);
+		}
 		for (name, val) in args.clone().into_iter().filter(|e| e.0.is_some()) {
 			new_bindings.insert(
 				name.as_ref().unwrap().clone(),