git.delta.rocks / jrsonnet / refs/commits / 9f3d17001fc1

difftreelog

feat obj comp support

Лач2020-06-11parent: #abdb122.patch.diff
in: master

5 files changed

modifiedcrates/jsonnet-evaluator/src/error.rsdiffbeforeafterboth
--- a/crates/jsonnet-evaluator/src/error.rs
+++ b/crates/jsonnet-evaluator/src/error.rs
@@ -14,6 +14,8 @@
 
 	UndefinedExternalVariable(String),
 
+	FieldMustBeStringGot(ValType),
+
 	RuntimeError(String),
 	StackOverflow,
 	FractionalIndex,
modifiedcrates/jsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth
before · crates/jsonnet-evaluator/src/evaluate.rs
1use crate::{2	context_creator, create_error, future_wrapper, lazy_val, push, with_state, Context,3	ContextCreator, FuncDesc, LazyBinding, LazyVal, ObjMember, ObjValue, Result, Val,4};5use closure::closure;6use jsonnet_parser::{7	el, Arg, ArgsDesc, AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, FieldMember,8	ForSpecData, IfSpecData, LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType,9	Visibility,10};11use std::{12	collections::{BTreeMap, HashMap},13	rc::Rc,14};1516pub fn evaluate_binding(b: &BindSpec, context_creator: ContextCreator) -> (String, LazyBinding) {17	let b = b.clone();18	if let Some(params) = &b.params {19		let params = params.clone();20		(21			b.name.clone(),22			LazyBinding::Bindable(Rc::new(move |this, super_obj| {23				Ok(lazy_val!(24					closure!(clone b, clone params, clone context_creator, || Ok(evaluate_method(25						context_creator.0(this.clone(), super_obj.clone())?,26						params.clone(),27						b.value.clone(),28					)))29				))30			})),31		)32	} else {33		(34			b.name.clone(),35			LazyBinding::Bindable(Rc::new(move |this, super_obj| {36				Ok(lazy_val!(closure!(clone context_creator, clone b, ||37					push(b.value.clone(), "thunk".to_owned(), ||{38						evaluate(39							context_creator.0(this.clone(), super_obj.clone())?,40							&b.value41						)42					})43				)))44			})),45		)46	}47}4849pub fn evaluate_method(ctx: Context, params: ParamsDesc, body: LocExpr) -> Val {50	Val::Func(FuncDesc { ctx, params, body })51}5253pub fn evaluate_field_name(54	context: Context,55	field_name: &jsonnet_parser::FieldName,56) -> Result<Option<String>> {57	Ok(match field_name {58		jsonnet_parser::FieldName::Fixed(n) => Some(n.clone()),59		jsonnet_parser::FieldName::Dyn(expr) => {60			let value = evaluate(context, expr)?.unwrap_if_lazy()?;61			if matches!(value, Val::Null) {62				None63			} else {64				Some(value.try_cast_str("dynamic field name")?)65			}66		}67	})68}6970pub fn evaluate_unary_op(op: UnaryOpType, b: &Val) -> Result<Val> {71	Ok(match (op, b) {72		(o, Val::Lazy(l)) => evaluate_unary_op(o, &l.evaluate()?)?,73		(UnaryOpType::Not, Val::Bool(v)) => Val::Bool(!v),74		(UnaryOpType::Minus, Val::Num(n)) => Val::Num(-*n),75		(UnaryOpType::BitNot, Val::Num(n)) => Val::Num(!(*n as i32) as f64),76		(op, o) => panic!("unary op not implemented: {:?} {:?}", op, o),77	})78}7980pub(crate) fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {81	Ok(match (a, b) {82		(Val::Str(v1), Val::Str(v2)) => Val::Str(v1.to_owned() + &v2),8384		(Val::Str(v1), Val::Num(v2)) => Val::Str(format!("{}{}", v1, v2)),85		(Val::Num(v1), Val::Str(v2)) => Val::Str(format!("{}{}", v1, v2)),86		(Val::Str(v1), Val::Bool(v2)) => Val::Str(format!("{}{}", v1, v2)),87		(Val::Bool(v1), Val::Str(v2)) => Val::Str(format!("{}{}", v1, v2)),88		(Val::Str(v1), Val::Null) => Val::Str(format!("{}null", v1)),89		(Val::Null, Val::Str(v2)) => Val::Str(format!("null{}", v2)),9091		(Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),92		(Val::Arr(a), Val::Arr(b)) => Val::Arr([&a[..], &b[..]].concat()),93		(Val::Num(v1), Val::Num(v2)) => Val::Num(v1 + v2),94		_ => panic!("can't add: {:?} and {:?}", a, b),95	})96}9798pub fn evaluate_binary_op_special(99	context: Context,100	a: &LocExpr,101	op: BinaryOpType,102	b: &LocExpr,103) -> Result<Val> {104	Ok(105		match (evaluate(context.clone(), &a)?.unwrap_if_lazy()?, op, b) {106			(Val::Bool(true), BinaryOpType::Or, _o) => Val::Bool(true),107			(Val::Bool(false), BinaryOpType::And, _o) => Val::Bool(false),108			(a, op, eb) => {109				evaluate_binary_op_normal(&a, op, &evaluate(context, eb)?.unwrap_if_lazy()?)?110			}111		},112	)113}114115pub fn evaluate_binary_op_normal(a: &Val, op: BinaryOpType, b: &Val) -> Result<Val> {116	Ok(match (a, op, b) {117		(a, BinaryOpType::Add, b) => evaluate_add_op(a, b)?,118119		(Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize)),120121		// Bool X Bool122		(Val::Bool(a), BinaryOpType::And, Val::Bool(b)) => Val::Bool(*a && *b),123		(Val::Bool(a), BinaryOpType::Or, Val::Bool(b)) => Val::Bool(*a || *b),124125		// Str X Str126		(Val::Str(v1), BinaryOpType::Lt, Val::Str(v2)) => Val::Bool(v1 < v2),127		(Val::Str(v1), BinaryOpType::Gt, Val::Str(v2)) => Val::Bool(v1 > v2),128		(Val::Str(v1), BinaryOpType::Lte, Val::Str(v2)) => Val::Bool(v1 <= v2),129		(Val::Str(v1), BinaryOpType::Gte, Val::Str(v2)) => Val::Bool(v1 >= v2),130131		// Num X Num132		(Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),133		(Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => {134			if *v2 <= f64::EPSILON {135				create_error(crate::Error::DivisionByZero)?136			}137			Val::Num(v1 / v2)138		}139140		(Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::Num(v1 - v2),141142		(Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => Val::Bool(v1 < v2),143		(Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => Val::Bool(v1 > v2),144		(Val::Num(v1), BinaryOpType::Lte, Val::Num(v2)) => Val::Bool(v1 <= v2),145		(Val::Num(v1), BinaryOpType::Gte, Val::Num(v2)) => Val::Bool(v1 >= v2),146147		(Val::Num(v1), BinaryOpType::BitAnd, Val::Num(v2)) => {148			Val::Num(((*v1 as i32) & (*v2 as i32)) as f64)149		}150		(Val::Num(v1), BinaryOpType::BitOr, Val::Num(v2)) => {151			Val::Num(((*v1 as i32) | (*v2 as i32)) as f64)152		}153		(Val::Num(v1), BinaryOpType::BitXor, Val::Num(v2)) => {154			Val::Num(((*v1 as i32) ^ (*v2 as i32)) as f64)155		}156		(Val::Num(v1), BinaryOpType::Lhs, Val::Num(v2)) => {157			Val::Num(((*v1 as i32) << (*v2 as i32)) as f64)158		}159		(Val::Num(v1), BinaryOpType::Rhs, Val::Num(v2)) => {160			Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)161		}162163		_ => panic!("no rules for binary operation: {:?} {:?} {:?}", a, op, b),164	})165}166167future_wrapper!(HashMap<String, LazyBinding>, FutureNewBindings);168future_wrapper!(ObjValue, FutureObjValue);169170pub fn evaluate_comp(171	context: Context,172	value: &LocExpr,173	specs: &[CompSpec],174) -> Result<Option<Vec<Val>>> {175	Ok(match specs.get(0) {176		None => Some(vec![evaluate(context, &value)?]),177		Some(CompSpec::IfSpec(IfSpecData(cond))) => {178			if evaluate(context.clone(), &cond)?.try_cast_bool("if spec")? {179				evaluate_comp(context, value, &specs[1..])?180			} else {181				None182			}183		}184		Some(CompSpec::ForSpec(ForSpecData(var, expr))) => {185			match evaluate(context.clone(), &expr)?.unwrap_if_lazy()? {186				Val::Arr(list) => {187					let mut out = Vec::new();188					for item in list {189						let item = item.clone().unwrap_if_lazy()?;190						out.push(evaluate_comp(191							context.with_var(var.clone(), item)?,192							value,193							&specs[1..],194						)?);195					}196					Some(out.iter().flatten().flatten().cloned().collect())197				}198				_ => panic!("for expression evaluated to non-iterable value"),199			}200		}201	})202}203204// TODO: Asserts205pub fn evaluate_object(context: Context, object: ObjBody) -> Result<ObjValue> {206	Ok(match object {207		ObjBody::MemberList(members) => {208			let new_bindings = FutureNewBindings::new();209			let future_this = FutureObjValue::new();210			let context_creator = context_creator!(211				closure!(clone context, clone new_bindings, clone future_this, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {212					Ok(context.clone().extend_unbound(213						new_bindings.clone().unwrap(),214						context.clone().dollar().clone().or_else(||this.clone()),215						Some(this.unwrap()),216						super_obj217					)?)218				})219			);220			{221				let mut bindings: HashMap<String, LazyBinding> = HashMap::new();222				for (n, b) in members223					.iter()224					.filter_map(|m| match m {225						Member::BindStmt(b) => Some(b.clone()),226						_ => None,227					})228					.map(|b| evaluate_binding(&b, context_creator.clone()))229				{230					bindings.insert(n, b);231				}232				new_bindings.fill(bindings);233			}234235			let mut new_members = BTreeMap::new();236			for member in members.into_iter() {237				match member {238					Member::Field(FieldMember {239						name,240						plus,241						params: None,242						visibility,243						value,244					}) => {245						let name = evaluate_field_name(context.clone(), &name)?;246						if name.is_none() {247							continue;248						}249						let name = name.unwrap();250						new_members.insert(251							name.clone(),252							ObjMember {253								add: plus,254								visibility: visibility.clone(),255								invoke: LazyBinding::Bindable(Rc::new(256									closure!(clone name, clone value, clone context_creator, |this, super_obj| {257										Ok(LazyVal::new_resolved(push(value.clone(), "object ".to_owned()+&name+" field", ||{258											let context = context_creator.0(this, super_obj)?;259											evaluate(260												context,261												&value,262											)?.unwrap_if_lazy()263										})?))264									}),265								)),266							},267						);268					}269					Member::Field(FieldMember {270						name,271						params: Some(params),272						value,273						..274					}) => {275						let name = evaluate_field_name(context.clone(), &name)?;276						if name.is_none() {277							continue;278						}279						let name = name.unwrap();280						new_members.insert(281							name,282							ObjMember {283								add: false,284								visibility: Visibility::Hidden,285								invoke: LazyBinding::Bindable(Rc::new(286									closure!(clone value, clone context_creator, |this, super_obj| {287										// TODO: Assert288										Ok(LazyVal::new_resolved(evaluate_method(289											context_creator.0(this, super_obj)?,290											params.clone(),291											value.clone(),292										)))293									}),294								)),295							},296						);297					}298					Member::BindStmt(_) => {}299					Member::AssertStmt(_) => {}300				}301			}302			future_this.fill(ObjValue::new(None, Rc::new(new_members)))303		}304		_ => todo!(),305	})306}307308#[inline(always)]309pub fn evaluate(context: Context, expr: &LocExpr) -> Result<Val> {310	use Expr::*;311	let locexpr = expr.clone();312	let LocExpr(expr, loc) = expr;313	Ok(match &**expr {314		Literal(LiteralType::This) => Val::Obj(315			context316				.this()317				.clone()318				.unwrap_or_else(|| panic!("this not found")),319		),320		Literal(LiteralType::Dollar) => Val::Obj(321			context322				.dollar()323				.clone()324				.unwrap_or_else(|| panic!("dollar not found")),325		),326		Literal(LiteralType::True) => Val::Bool(true),327		Literal(LiteralType::False) => Val::Bool(false),328		Literal(LiteralType::Null) => Val::Null,329		Parened(e) => evaluate(context, e)?,330		Str(v) => Val::Str(v.clone()),331		Num(v) => Val::Num(*v),332		BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,333		UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,334		Var(name) => push(locexpr, "var".to_owned(), || {335			Val::Lazy(context.binding(&name)).unwrap_if_lazy()336		})?,337		Index(LocExpr(v, _), index) if matches!(&**v, Expr::Literal(LiteralType::Super)) => {338			let name = evaluate(context.clone(), index)?.try_cast_str("object index")?;339			context340				.super_obj()341				.clone()342				.expect("no super found")343				.get_raw(&name, &context.this().clone().expect("no this found"))?344				.expect("value not found")345		}346		Index(value, index) => {347			match (348				evaluate(context.clone(), value)?.unwrap_if_lazy()?,349				evaluate(context, index)?,350			) {351				(Val::Obj(v), Val::Str(s)) => {352					if let Some(v) = v.get(&s)? {353						v.unwrap_if_lazy()?354					} else if let Some(Val::Str(n)) = v.get("__intristic_namespace__")? {355						Val::Intristic(n, s)356					} else {357						create_error(crate::Error::NoSuchField(s))?358					}359				}360				(Val::Arr(v), Val::Num(n)) => {361					if n.fract() > f64::EPSILON {362						create_error(crate::Error::FractionalIndex)?363					}364					v.get(n as usize)365						.unwrap_or_else(|| panic!("out of bounds"))366						.clone()367						.unwrap_if_lazy()?368				}369				(Val::Str(s), Val::Num(n)) => {370					Val::Str(s.chars().skip(n as usize).take(1).collect())371				}372				(v, i) => todo!("not implemented: {:?}[{:?}]", v, i.unwrap_if_lazy()),373			}374		}375		LocalExpr(bindings, returned) => {376			let mut new_bindings: HashMap<String, LazyBinding> = HashMap::new();377			let future_context = Context::new_future();378379			let context_creator = context_creator!(380				closure!(clone future_context, |_, _| Ok(future_context.clone().unwrap()))381			);382383			for (k, v) in bindings384				.iter()385				.map(|b| evaluate_binding(b, context_creator.clone()))386			{387				new_bindings.insert(k, v);388			}389390			let context = context391				.extend_unbound(new_bindings, None, None, None)?392				.into_future(future_context);393			evaluate(context, &returned.clone())?394		}395		Arr(items) => {396			let mut out = Vec::with_capacity(items.len());397			for item in items {398				out.push(Val::Lazy(lazy_val!(399					closure!(clone context, clone item, || {400						evaluate(context.clone(), &item)401					})402				)));403			}404			Val::Arr(out)405		}406		ArrComp(expr, compspecs) => Val::Arr(407			// First compspec should be forspec, so no "None" possible here408			evaluate_comp(context, expr, compspecs)?.unwrap(),409		),410		Obj(body) => Val::Obj(evaluate_object(context, body.clone())?),411		ObjExtend(s, t) => evaluate_add_op(412			&evaluate(context.clone(), s)?,413			&Val::Obj(evaluate_object(context, t.clone())?),414		)?,415		Apply(value, args, tailstrict) => {416			let value = evaluate(context.clone(), value)?.unwrap_if_lazy()?;417			match value {418				Val::Intristic(ns, name) => match (&ns as &str, &name as &str) {419					// arr/string/function420					("std", "length") => {421						assert_eq!(args.len(), 1);422						let expr = &args.get(0).unwrap().1;423						match evaluate(context, expr)? {424							Val::Str(n) => Val::Num(n.chars().count() as f64),425							Val::Arr(i) => Val::Num(i.len() as f64),426							Val::Obj(o) => Val::Num(427								o.fields_visibility()428									.into_iter()429									.filter(|(_k, v)| *v)430									.count() as f64,431							),432							v => panic!("can't get length of {:?}", v),433						}434					}435					// any436					("std", "type") => {437						assert_eq!(args.len(), 1);438						let expr = &args.get(0).unwrap().1;439						Val::Str(evaluate(context, expr)?.value_type()?.name().to_owned())440					}441					// length, idx=>any442					("std", "makeArray") => {443						assert_eq!(args.len(), 2);444						if let (Val::Num(v), Val::Func(d)) = (445							evaluate(context.clone(), &args[0].1)?,446							evaluate(context, &args[1].1)?,447						) {448							assert!(v >= 0.0);449							let mut out = Vec::with_capacity(v as usize);450							for i in 0..v as usize {451								let call_ctx =452									Context::new().with_var("v".to_owned(), Val::Num(i as f64))?;453								out.push(d.evaluate(454									call_ctx,455									&ArgsDesc(vec![Arg(None, el!(Expr::Var("v".to_owned())))]),456									true,457								)?)458							}459							Val::Arr(out)460						} else {461							panic!("bad makeArray call");462						}463					}464					// string465					("std", "codepoint") => {466						assert_eq!(args.len(), 1);467						if let Val::Str(s) = evaluate(context, &args[0].1)? {468							assert!(469								s.chars().count() == 1,470								"std.codepoint should receive single char string"471							);472							Val::Num(s.chars().take(1).next().unwrap() as u32 as f64)473						} else {474							panic!("bad codepoint call");475						}476					}477					// object, includeHidden478					("std", "objectFieldsEx") => {479						assert_eq!(args.len(), 2);480						if let (Val::Obj(body), Val::Bool(include_hidden)) = (481							evaluate(context.clone(), &args[0].1)?,482							evaluate(context, &args[1].1)?,483						) {484							Val::Arr(485								body.fields_visibility()486									.into_iter()487									.filter(|(_k, v)| *v || include_hidden)488									.map(|(k, _v)| Val::Str(k))489									.collect(),490							)491						} else {492							panic!("bad objectFieldsEx call");493						}494					}495					("std", "primitiveEquals") => {496						assert_eq!(args.len(), 2);497						let (a, b) = (498							evaluate(context.clone(), &args[0].1)?,499							evaluate(context, &args[1].1)?,500						);501						Val::Bool(a == b)502					}503					("std", "modulo") => {504						assert_eq!(args.len(), 2);505						if let (Val::Num(a), Val::Num(b)) = (506							evaluate(context.clone(), &args[0].1)?,507							evaluate(context, &args[1].1)?,508						) {509							Val::Num(a % b)510						} else {511							panic!("bad modulo call");512						}513					}514					("std", "floor") => {515						assert_eq!(args.len(), 1);516						if let Val::Num(a) = evaluate(context, &args[0].1)? {517							Val::Num(a.floor())518						} else {519							panic!("bad floor call");520						}521					}522					("std", "trace") => {523						assert_eq!(args.len(), 2);524						if let (Val::Str(a), b) = (525							evaluate(context.clone(), &args[0].1)?,526							evaluate(context, &args[1].1)?,527						) {528							// TODO: Line numbers as in original jsonnet529							println!("TRACE: {}", a);530							b531						} else {532							panic!("bad trace call");533						}534					}535					("std", "pow") => {536						assert_eq!(args.len(), 2);537						if let (Val::Num(a), Val::Num(b)) = (538							evaluate(context.clone(), &args[0].1)?,539							evaluate(context, &args[1].1)?,540						) {541							Val::Num(a.powf(b))542						} else {543							panic!("bad pow call");544						}545					}546					("std", "extVar") => {547						assert_eq!(args.len(), 1);548						if let Val::Str(a) = evaluate(context, &args[0].1)? {549							with_state(|s| s.0.ext_vars.borrow().get(&a).cloned()).ok_or_else(550								|| {551									create_error::<()>(crate::Error::UndefinedExternalVariable(a))552										.err()553										.unwrap()554								},555							)?556						} else {557							panic!("bad extVar call");558						}559					}560					(ns, name) => panic!("Intristic not found: {}.{}", ns, name),561				},562				Val::Func(f) => {563					let body = #[inline(always)]564					|| f.evaluate(context, args, *tailstrict);565					if *tailstrict {566						body()?567					} else {568						push(locexpr, "function call".to_owned(), body)?569					}570				}571				_ => panic!("{:?} is not a function", value),572			}573		}574		Function(params, body) => evaluate_method(context, params.clone(), body.clone()),575		AssertExpr(AssertStmt(value, msg), returned) => {576			let assertion_result = push(value.clone(), "assertion condition".to_owned(), || {577				evaluate(context.clone(), &value)?578					.try_cast_bool("assertion condition should be boolean")579			})?;580			if assertion_result {581				push(582					returned.clone(),583					"assert 'return' branch".to_owned(),584					|| evaluate(context, returned),585				)?586			} else if let Some(msg) = msg {587				panic!(588					"assertion failed ({:?}): {}",589					value,590					evaluate(context, msg)?.try_cast_str("assertion message should be string")?591				);592			} else {593				panic!("assertion failed ({:?}): no message", value);594			}595		}596		Error(e) => create_error(crate::Error::RuntimeError(597			evaluate(context, e)?.try_cast_str("error text should be string")?,598		))?,599		IfElse {600			cond,601			cond_then,602			cond_else,603		} => {604			let condition_result = push(cond.0.clone(), "if condition".to_owned(), || {605				evaluate(context.clone(), &cond.0)?.try_cast_bool("if condition should be boolean")606			})?;607			if condition_result {608				push(609					cond_then.clone(),610					"if condition 'then' branch".to_owned(),611					|| evaluate(context, cond_then),612				)?613			} else {614				match cond_else {615					Some(v) => evaluate(context, v)?,616					None => Val::Null,617				}618			}619		}620		Import(path) => {621			let mut lib_path = loc622				.clone()623				.expect("imports can't be used without loc_data")624				.0625				.clone();626			lib_path.pop();627			lib_path.push(path);628			with_state(|s| s.import_file(&lib_path))?629		}630		_ => panic!(631			"evaluation not implemented: {:?}",632			LocExpr(expr.clone(), loc.clone())633		),634	})635}
after · crates/jsonnet-evaluator/src/evaluate.rs
1use crate::{2	context_creator, create_error, future_wrapper, lazy_val, push, with_state, Context,3	ContextCreator, Error, FuncDesc, LazyBinding, LazyVal, ObjMember, ObjValue, Result, Val,4};5use closure::closure;6use jsonnet_parser::{7	el, Arg, ArgsDesc, AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, FieldMember,8	ForSpecData, IfSpecData, LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType,9	Visibility,10};11use std::{12	collections::{BTreeMap, HashMap},13	rc::Rc,14};1516pub fn evaluate_binding(b: &BindSpec, context_creator: ContextCreator) -> (String, LazyBinding) {17	let b = b.clone();18	if let Some(params) = &b.params {19		let params = params.clone();20		(21			b.name.clone(),22			LazyBinding::Bindable(Rc::new(move |this, super_obj| {23				Ok(lazy_val!(24					closure!(clone b, clone params, clone context_creator, || Ok(evaluate_method(25						context_creator.0(this.clone(), super_obj.clone())?,26						params.clone(),27						b.value.clone(),28					)))29				))30			})),31		)32	} else {33		(34			b.name.clone(),35			LazyBinding::Bindable(Rc::new(move |this, super_obj| {36				Ok(lazy_val!(closure!(clone context_creator, clone b, ||37					push(b.value.clone(), "thunk".to_owned(), ||{38						evaluate(39							context_creator.0(this.clone(), super_obj.clone())?,40							&b.value41						)42					})43				)))44			})),45		)46	}47}4849pub fn evaluate_method(ctx: Context, params: ParamsDesc, body: LocExpr) -> Val {50	Val::Func(FuncDesc { ctx, params, body })51}5253pub fn evaluate_field_name(54	context: Context,55	field_name: &jsonnet_parser::FieldName,56) -> Result<Option<String>> {57	Ok(match field_name {58		jsonnet_parser::FieldName::Fixed(n) => Some(n.clone()),59		jsonnet_parser::FieldName::Dyn(expr) => {60			let value = evaluate(context, expr)?.unwrap_if_lazy()?;61			if matches!(value, Val::Null) {62				None63			} else {64				Some(value.try_cast_str("dynamic field name")?)65			}66		}67	})68}6970pub fn evaluate_unary_op(op: UnaryOpType, b: &Val) -> Result<Val> {71	Ok(match (op, b) {72		(o, Val::Lazy(l)) => evaluate_unary_op(o, &l.evaluate()?)?,73		(UnaryOpType::Not, Val::Bool(v)) => Val::Bool(!v),74		(UnaryOpType::Minus, Val::Num(n)) => Val::Num(-*n),75		(UnaryOpType::BitNot, Val::Num(n)) => Val::Num(!(*n as i32) as f64),76		(op, o) => panic!("unary op not implemented: {:?} {:?}", op, o),77	})78}7980pub(crate) fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {81	Ok(match (a, b) {82		(Val::Str(v1), Val::Str(v2)) => Val::Str(v1.to_owned() + &v2),8384		(Val::Str(v1), Val::Num(v2)) => Val::Str(format!("{}{}", v1, v2)),85		(Val::Num(v1), Val::Str(v2)) => Val::Str(format!("{}{}", v1, v2)),86		(Val::Str(v1), Val::Bool(v2)) => Val::Str(format!("{}{}", v1, v2)),87		(Val::Bool(v1), Val::Str(v2)) => Val::Str(format!("{}{}", v1, v2)),88		(Val::Str(v1), Val::Null) => Val::Str(format!("{}null", v1)),89		(Val::Null, Val::Str(v2)) => Val::Str(format!("null{}", v2)),9091		(Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),92		(Val::Arr(a), Val::Arr(b)) => Val::Arr([&a[..], &b[..]].concat()),93		(Val::Num(v1), Val::Num(v2)) => Val::Num(v1 + v2),94		_ => panic!("can't add: {:?} and {:?}", a, b),95	})96}9798pub fn evaluate_binary_op_special(99	context: Context,100	a: &LocExpr,101	op: BinaryOpType,102	b: &LocExpr,103) -> Result<Val> {104	Ok(105		match (evaluate(context.clone(), &a)?.unwrap_if_lazy()?, op, b) {106			(Val::Bool(true), BinaryOpType::Or, _o) => Val::Bool(true),107			(Val::Bool(false), BinaryOpType::And, _o) => Val::Bool(false),108			(a, op, eb) => {109				evaluate_binary_op_normal(&a, op, &evaluate(context, eb)?.unwrap_if_lazy()?)?110			}111		},112	)113}114115pub fn evaluate_binary_op_normal(a: &Val, op: BinaryOpType, b: &Val) -> Result<Val> {116	Ok(match (a, op, b) {117		(a, BinaryOpType::Add, b) => evaluate_add_op(a, b)?,118119		(Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize)),120121		// Bool X Bool122		(Val::Bool(a), BinaryOpType::And, Val::Bool(b)) => Val::Bool(*a && *b),123		(Val::Bool(a), BinaryOpType::Or, Val::Bool(b)) => Val::Bool(*a || *b),124125		// Str X Str126		(Val::Str(v1), BinaryOpType::Lt, Val::Str(v2)) => Val::Bool(v1 < v2),127		(Val::Str(v1), BinaryOpType::Gt, Val::Str(v2)) => Val::Bool(v1 > v2),128		(Val::Str(v1), BinaryOpType::Lte, Val::Str(v2)) => Val::Bool(v1 <= v2),129		(Val::Str(v1), BinaryOpType::Gte, Val::Str(v2)) => Val::Bool(v1 >= v2),130131		// Num X Num132		(Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),133		(Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => {134			if *v2 <= f64::EPSILON {135				create_error(crate::Error::DivisionByZero)?136			}137			Val::Num(v1 / v2)138		}139140		(Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::Num(v1 - v2),141142		(Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => Val::Bool(v1 < v2),143		(Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => Val::Bool(v1 > v2),144		(Val::Num(v1), BinaryOpType::Lte, Val::Num(v2)) => Val::Bool(v1 <= v2),145		(Val::Num(v1), BinaryOpType::Gte, Val::Num(v2)) => Val::Bool(v1 >= v2),146147		(Val::Num(v1), BinaryOpType::BitAnd, Val::Num(v2)) => {148			Val::Num(((*v1 as i32) & (*v2 as i32)) as f64)149		}150		(Val::Num(v1), BinaryOpType::BitOr, Val::Num(v2)) => {151			Val::Num(((*v1 as i32) | (*v2 as i32)) as f64)152		}153		(Val::Num(v1), BinaryOpType::BitXor, Val::Num(v2)) => {154			Val::Num(((*v1 as i32) ^ (*v2 as i32)) as f64)155		}156		(Val::Num(v1), BinaryOpType::Lhs, Val::Num(v2)) => {157			Val::Num(((*v1 as i32) << (*v2 as i32)) as f64)158		}159		(Val::Num(v1), BinaryOpType::Rhs, Val::Num(v2)) => {160			Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)161		}162163		_ => panic!("no rules for binary operation: {:?} {:?} {:?}", a, op, b),164	})165}166167future_wrapper!(HashMap<String, LazyBinding>, FutureNewBindings);168future_wrapper!(ObjValue, FutureObjValue);169170#[inline(always)]171pub fn evaluate_comp<T>(172	context: Context,173	value: &impl Fn(Context) -> Result<T>,174	specs: &[CompSpec],175) -> Result<Option<Vec<T>>> {176	Ok(match specs.get(0) {177		None => Some(vec![value(context)?]),178		Some(CompSpec::IfSpec(IfSpecData(cond))) => {179			if evaluate(context.clone(), &cond)?.try_cast_bool("if spec")? {180				evaluate_comp(context, value, &specs[1..])?181			} else {182				None183			}184		}185		Some(CompSpec::ForSpec(ForSpecData(var, expr))) => {186			match evaluate(context.clone(), &expr)?.unwrap_if_lazy()? {187				Val::Arr(list) => {188					let mut out = Vec::new();189					for item in list {190						let item = item.clone().unwrap_if_lazy()?;191						out.push(evaluate_comp(192							context.with_var(var.clone(), item)?,193							value,194							&specs[1..],195						)?);196					}197					Some(out.into_iter().flatten().flatten().collect())198				}199				_ => panic!("for expression evaluated to non-iterable value"),200			}201		}202	})203}204205// TODO: Asserts206pub fn evaluate_object(context: Context, object: ObjBody) -> Result<ObjValue> {207	Ok(match object {208		ObjBody::MemberList(members) => {209			let new_bindings = FutureNewBindings::new();210			let future_this = FutureObjValue::new();211			let context_creator = context_creator!(212				closure!(clone context, clone new_bindings, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {213					Ok(context.clone().extend_unbound(214						new_bindings.clone().unwrap(),215						context.clone().dollar().clone().or_else(||this.clone()),216						Some(this.unwrap()),217						super_obj218					)?)219				})220			);221			{222				let mut bindings: HashMap<String, LazyBinding> = HashMap::new();223				for (n, b) in members224					.iter()225					.filter_map(|m| match m {226						Member::BindStmt(b) => Some(b.clone()),227						_ => None,228					})229					.map(|b| evaluate_binding(&b, context_creator.clone()))230				{231					bindings.insert(n, b);232				}233				new_bindings.fill(bindings);234			}235236			let mut new_members = BTreeMap::new();237			for member in members.into_iter() {238				match member {239					Member::Field(FieldMember {240						name,241						plus,242						params: None,243						visibility,244						value,245					}) => {246						let name = evaluate_field_name(context.clone(), &name)?;247						if name.is_none() {248							continue;249						}250						let name = name.unwrap();251						new_members.insert(252							name.clone(),253							ObjMember {254								add: plus,255								visibility: visibility.clone(),256								invoke: LazyBinding::Bindable(Rc::new(257									closure!(clone name, clone value, clone context_creator, |this, super_obj| {258										Ok(LazyVal::new_resolved(push(value.clone(), "object ".to_owned()+&name+" field", ||{259											let context = context_creator.0(this, super_obj)?;260											evaluate(261												context,262												&value,263											)?.unwrap_if_lazy()264										})?))265									}),266								)),267							},268						);269					}270					Member::Field(FieldMember {271						name,272						params: Some(params),273						value,274						..275					}) => {276						let name = evaluate_field_name(context.clone(), &name)?;277						if name.is_none() {278							continue;279						}280						let name = name.unwrap();281						new_members.insert(282							name,283							ObjMember {284								add: false,285								visibility: Visibility::Hidden,286								invoke: LazyBinding::Bindable(Rc::new(287									closure!(clone value, clone context_creator, |this, super_obj| {288										// TODO: Assert289										Ok(LazyVal::new_resolved(evaluate_method(290											context_creator.0(this, super_obj)?,291											params.clone(),292											value.clone(),293										)))294									}),295								)),296							},297						);298					}299					Member::BindStmt(_) => {}300					Member::AssertStmt(_) => {}301				}302			}303			future_this.fill(ObjValue::new(None, Rc::new(new_members)))304		}305		ObjBody::ObjComp {306			pre_locals,307			key,308			value,309			post_locals,310			compspecs,311		} => {312			let future_this = FutureObjValue::new();313			let mut new_members = BTreeMap::new();314			for (k, v) in evaluate_comp(315				context.clone(),316				&|ctx| {317					let new_bindings = FutureNewBindings::new();318					let context_creator = context_creator!(319						closure!(clone context, clone new_bindings, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {320							Ok(context.clone().extend_unbound(321								new_bindings.clone().unwrap(),322								context.clone().dollar().clone().or_else(||this.clone()),323								None,324								super_obj325							)?)326						})327					);328					let mut bindings: HashMap<String, LazyBinding> = HashMap::new();329					for (n, b) in pre_locals330						.iter()331						.chain(post_locals.iter())332						.map(|b| evaluate_binding(b, context_creator.clone()))333					{334						bindings.insert(n, b);335					}336					let bindings = new_bindings.fill(bindings);337					let ctx = ctx.extend_unbound(bindings, None, None, None)?;338					let key = evaluate(ctx.clone(), &key)?;339					let value = LazyBinding::Bindable(Rc::new(340						closure!(clone ctx, clone value, |this, _super_obj| {341							Ok(LazyVal::new_resolved(evaluate(ctx.extend(HashMap::new(), None, this, None)?, &value)?))342						}),343					));344345					Ok((key, value))346				},347				&compspecs,348			)?349			.unwrap()350			{351				match k {352					Val::Null => {}353					Val::Str(n) => {354						new_members.insert(355							n,356							ObjMember {357								add: false,358								visibility: Visibility::Normal,359								invoke: v,360							},361						);362					}363					v => create_error(Error::FieldMustBeStringGot(v.value_type()?))?,364				}365			}366367			future_this.fill(ObjValue::new(None, Rc::new(new_members)))368		}369	})370}371372#[inline(always)]373pub fn evaluate(context: Context, expr: &LocExpr) -> Result<Val> {374	use Expr::*;375	let locexpr = expr.clone();376	let LocExpr(expr, loc) = expr;377	Ok(match &**expr {378		Literal(LiteralType::This) => Val::Obj(379			context380				.this()381				.clone()382				.unwrap_or_else(|| panic!("this not found")),383		),384		Literal(LiteralType::Dollar) => Val::Obj(385			context386				.dollar()387				.clone()388				.unwrap_or_else(|| panic!("dollar not found")),389		),390		Literal(LiteralType::True) => Val::Bool(true),391		Literal(LiteralType::False) => Val::Bool(false),392		Literal(LiteralType::Null) => Val::Null,393		Parened(e) => evaluate(context, e)?,394		Str(v) => Val::Str(v.clone()),395		Num(v) => Val::Num(*v),396		BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,397		UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,398		Var(name) => push(locexpr, "var".to_owned(), || {399			Val::Lazy(context.binding(&name)).unwrap_if_lazy()400		})?,401		Index(LocExpr(v, _), index) if matches!(&**v, Expr::Literal(LiteralType::Super)) => {402			let name = evaluate(context.clone(), index)?.try_cast_str("object index")?;403			context404				.super_obj()405				.clone()406				.expect("no super found")407				.get_raw(&name, &context.this().clone().expect("no this found"))?408				.expect("value not found")409		}410		Index(value, index) => {411			match (412				evaluate(context.clone(), value)?.unwrap_if_lazy()?,413				evaluate(context, index)?,414			) {415				(Val::Obj(v), Val::Str(s)) => {416					if let Some(v) = v.get(&s)? {417						v.unwrap_if_lazy()?418					} else if let Some(Val::Str(n)) = v.get("__intristic_namespace__")? {419						Val::Intristic(n, s)420					} else {421						create_error(crate::Error::NoSuchField(s))?422					}423				}424				(Val::Arr(v), Val::Num(n)) => {425					if n.fract() > f64::EPSILON {426						create_error(crate::Error::FractionalIndex)?427					}428					v.get(n as usize)429						.unwrap_or_else(|| panic!("out of bounds"))430						.clone()431						.unwrap_if_lazy()?432				}433				(Val::Str(s), Val::Num(n)) => {434					Val::Str(s.chars().skip(n as usize).take(1).collect())435				}436				(v, i) => todo!("not implemented: {:?}[{:?}]", v, i.unwrap_if_lazy()),437			}438		}439		LocalExpr(bindings, returned) => {440			let mut new_bindings: HashMap<String, LazyBinding> = HashMap::new();441			let future_context = Context::new_future();442443			let context_creator = context_creator!(444				closure!(clone future_context, |_, _| Ok(future_context.clone().unwrap()))445			);446447			for (k, v) in bindings448				.iter()449				.map(|b| evaluate_binding(b, context_creator.clone()))450			{451				new_bindings.insert(k, v);452			}453454			let context = context455				.extend_unbound(new_bindings, None, None, None)?456				.into_future(future_context);457			evaluate(context, &returned.clone())?458		}459		Arr(items) => {460			let mut out = Vec::with_capacity(items.len());461			for item in items {462				out.push(Val::Lazy(lazy_val!(463					closure!(clone context, clone item, || {464						evaluate(context.clone(), &item)465					})466				)));467			}468			Val::Arr(out)469		}470		ArrComp(expr, compspecs) => Val::Arr(471			// First compspec should be forspec, so no "None" possible here472			evaluate_comp(context, &|ctx| evaluate(ctx, expr), compspecs)?.unwrap(),473		),474		Obj(body) => Val::Obj(evaluate_object(context, body.clone())?),475		ObjExtend(s, t) => evaluate_add_op(476			&evaluate(context.clone(), s)?,477			&Val::Obj(evaluate_object(context, t.clone())?),478		)?,479		Apply(value, args, tailstrict) => {480			let value = evaluate(context.clone(), value)?.unwrap_if_lazy()?;481			match value {482				Val::Intristic(ns, name) => match (&ns as &str, &name as &str) {483					// arr/string/function484					("std", "length") => {485						assert_eq!(args.len(), 1);486						let expr = &args.get(0).unwrap().1;487						match evaluate(context, expr)? {488							Val::Str(n) => Val::Num(n.chars().count() as f64),489							Val::Arr(i) => Val::Num(i.len() as f64),490							Val::Obj(o) => Val::Num(491								o.fields_visibility()492									.into_iter()493									.filter(|(_k, v)| *v)494									.count() as f64,495							),496							v => panic!("can't get length of {:?}", v),497						}498					}499					// any500					("std", "type") => {501						assert_eq!(args.len(), 1);502						let expr = &args.get(0).unwrap().1;503						Val::Str(evaluate(context, expr)?.value_type()?.name().to_owned())504					}505					// length, idx=>any506					("std", "makeArray") => {507						assert_eq!(args.len(), 2);508						if let (Val::Num(v), Val::Func(d)) = (509							evaluate(context.clone(), &args[0].1)?,510							evaluate(context, &args[1].1)?,511						) {512							assert!(v >= 0.0);513							let mut out = Vec::with_capacity(v as usize);514							for i in 0..v as usize {515								let call_ctx =516									Context::new().with_var("v".to_owned(), Val::Num(i as f64))?;517								out.push(d.evaluate(518									call_ctx,519									&ArgsDesc(vec![Arg(None, el!(Expr::Var("v".to_owned())))]),520									true,521								)?)522							}523							Val::Arr(out)524						} else {525							panic!("bad makeArray call");526						}527					}528					// string529					("std", "codepoint") => {530						assert_eq!(args.len(), 1);531						if let Val::Str(s) = evaluate(context, &args[0].1)? {532							assert!(533								s.chars().count() == 1,534								"std.codepoint should receive single char string"535							);536							Val::Num(s.chars().take(1).next().unwrap() as u32 as f64)537						} else {538							panic!("bad codepoint call");539						}540					}541					// object, includeHidden542					("std", "objectFieldsEx") => {543						assert_eq!(args.len(), 2);544						if let (Val::Obj(body), Val::Bool(include_hidden)) = (545							evaluate(context.clone(), &args[0].1)?,546							evaluate(context, &args[1].1)?,547						) {548							Val::Arr(549								body.fields_visibility()550									.into_iter()551									.filter(|(_k, v)| *v || include_hidden)552									.map(|(k, _v)| Val::Str(k))553									.collect(),554							)555						} else {556							panic!("bad objectFieldsEx call");557						}558					}559					("std", "primitiveEquals") => {560						assert_eq!(args.len(), 2);561						let (a, b) = (562							evaluate(context.clone(), &args[0].1)?,563							evaluate(context, &args[1].1)?,564						);565						Val::Bool(a == b)566					}567					("std", "modulo") => {568						assert_eq!(args.len(), 2);569						if let (Val::Num(a), Val::Num(b)) = (570							evaluate(context.clone(), &args[0].1)?,571							evaluate(context, &args[1].1)?,572						) {573							Val::Num(a % b)574						} else {575							panic!("bad modulo call");576						}577					}578					("std", "floor") => {579						assert_eq!(args.len(), 1);580						if let Val::Num(a) = evaluate(context, &args[0].1)? {581							Val::Num(a.floor())582						} else {583							panic!("bad floor call");584						}585					}586					("std", "trace") => {587						assert_eq!(args.len(), 2);588						if let (Val::Str(a), b) = (589							evaluate(context.clone(), &args[0].1)?,590							evaluate(context, &args[1].1)?,591						) {592							// TODO: Line numbers as in original jsonnet593							println!("TRACE: {}", a);594							b595						} else {596							panic!("bad trace call");597						}598					}599					("std", "pow") => {600						assert_eq!(args.len(), 2);601						if let (Val::Num(a), Val::Num(b)) = (602							evaluate(context.clone(), &args[0].1)?,603							evaluate(context, &args[1].1)?,604						) {605							Val::Num(a.powf(b))606						} else {607							panic!("bad pow call");608						}609					}610					("std", "extVar") => {611						assert_eq!(args.len(), 1);612						if let Val::Str(a) = evaluate(context, &args[0].1)? {613							with_state(|s| s.0.ext_vars.borrow().get(&a).cloned()).ok_or_else(614								|| {615									create_error::<()>(crate::Error::UndefinedExternalVariable(a))616										.err()617										.unwrap()618								},619							)?620						} else {621							panic!("bad extVar call");622						}623					}624					(ns, name) => panic!("Intristic not found: {}.{}", ns, name),625				},626				Val::Func(f) => {627					let body = #[inline(always)]628					|| f.evaluate(context, args, *tailstrict);629					if *tailstrict {630						body()?631					} else {632						push(locexpr, "function call".to_owned(), body)?633					}634				}635				_ => panic!("{:?} is not a function", value),636			}637		}638		Function(params, body) => evaluate_method(context, params.clone(), body.clone()),639		AssertExpr(AssertStmt(value, msg), returned) => {640			let assertion_result = push(value.clone(), "assertion condition".to_owned(), || {641				evaluate(context.clone(), &value)?642					.try_cast_bool("assertion condition should be boolean")643			})?;644			if assertion_result {645				push(646					returned.clone(),647					"assert 'return' branch".to_owned(),648					|| evaluate(context, returned),649				)?650			} else if let Some(msg) = msg {651				panic!(652					"assertion failed ({:?}): {}",653					value,654					evaluate(context, msg)?.try_cast_str("assertion message should be string")?655				);656			} else {657				panic!("assertion failed ({:?}): no message", value);658			}659		}660		Error(e) => create_error(crate::Error::RuntimeError(661			evaluate(context, e)?.try_cast_str("error text should be string")?,662		))?,663		IfElse {664			cond,665			cond_then,666			cond_else,667		} => {668			let condition_result = push(cond.0.clone(), "if condition".to_owned(), || {669				evaluate(context.clone(), &cond.0)?.try_cast_bool("if condition should be boolean")670			})?;671			if condition_result {672				push(673					cond_then.clone(),674					"if condition 'then' branch".to_owned(),675					|| evaluate(context, cond_then),676				)?677			} else {678				match cond_else {679					Some(v) => evaluate(context, v)?,680					None => Val::Null,681				}682			}683		}684		Import(path) => {685			let mut lib_path = loc686				.clone()687				.expect("imports can't be used without loc_data")688				.0689				.clone();690			lib_path.pop();691			lib_path.push(path);692			with_state(|s| s.import_file(&lib_path))?693		}694		_ => panic!(695			"evaluation not implemented: {:?}",696			LocExpr(expr.clone(), loc.clone())697		),698	})699}
modifiedcrates/jsonnet-evaluator/src/lib.rsdiffbeforeafterboth
--- a/crates/jsonnet-evaluator/src/lib.rs
+++ b/crates/jsonnet-evaluator/src/lib.rs
@@ -493,6 +493,14 @@
 	}
 
 	#[test]
+	fn object_comp() {
+		assert_json!(
+			r#"{local t = "a", ["h"+i+"_"+z]: if "h"+(i-1)+"_"+z in self then t+1 else 0+t for i in [1,2,3] for z in [2,3,4] if z != i}"#,
+			"{\"h1_2\": \"0a\",\"h1_3\": \"0a\",\"h1_4\": \"0a\",\"h2_3\": \"a1\",\"h2_4\": \"a1\",\"h3_2\": \"0a\",\"h3_4\": \"a1\"}"
+		)
+	}
+
+	#[test]
 	fn direct_self() {
 		println!(
 			"{:#?}",
modifiedcrates/jsonnet-parser/src/expr.rsdiffbeforeafterboth
--- a/crates/jsonnet-parser/src/expr.rs
+++ b/crates/jsonnet-parser/src/expr.rs
@@ -120,7 +120,7 @@
 		key: LocExpr,
 		value: LocExpr,
 		post_locals: Vec<BindSpec>,
-		rest: Vec<CompSpec>,
+		compspecs: Vec<CompSpec>,
 	},
 }
 
modifiedcrates/jsonnet-parser/src/lib.rsdiffbeforeafterboth
--- a/crates/jsonnet-parser/src/lib.rs
+++ b/crates/jsonnet-parser/src/lib.rs
@@ -138,7 +138,7 @@
 					key,
 					value,
 					post_locals,
-					rest: [vec![CompSpec::ForSpec(forspec)], others.unwrap_or_default()].concat(),
+					compspecs: [vec![CompSpec::ForSpec(forspec)], others.unwrap_or_default()].concat(),
 				}
 			}
 			/ members:(member(s) ** comma()) comma()? {expr::ObjBody::MemberList(members)}