`b8416d678e88`

2 files changed

modifiedcrates/jsonnet-evaluator/src/evaluate.rsdiff before after both

121	Ok(match (a, op, b) {121	Ok(match (a, op, b) {
122		(a, BinaryOpType::Add, b) => evaluate_add_op(a, b)?,122		(a, BinaryOpType::Add, b) => evaluate_add_op(a, b)?,
123123
124		(Val::Str(v1), BinaryOpType::Eq, Val::Str(v2)) => Val::Bool(v1 == v2),
124		(Val::Str(v1), BinaryOpType::Ne, Val::Str(v2)) => Val::Bool(v1 != v2),125		(Val::Str(v1), BinaryOpType::Ne, Val::Str(v2)) => Val::Bool(v1 != v2),
125126
126		(Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize)),127		(Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize)),
146			)),147			)),
147		)?,148		)?,
149
150		// Bool X Bool
151		(Val::Bool(a), BinaryOpType::Eq, Val::Bool(b)) => Val::Bool(a == b),
152		(Val::Bool(a), BinaryOpType::Ne, Val::Bool(b)) => Val::Bool(a != b),
148153
149		(Val::Bool(a), BinaryOpType::And, Val::Bool(b)) => Val::Bool(*a && *b),154		(Val::Bool(a), BinaryOpType::And, Val::Bool(b)) => Val::Bool(*a && *b),
150		(Val::Bool(a), BinaryOpType::Or, Val::Bool(b)) => Val::Bool(*a || *b),155		(Val::Bool(a), BinaryOpType::Or, Val::Bool(b)) => Val::Bool(*a || *b),
151156
157		// Str X Str
158		(Val::Str(v1), BinaryOpType::Lt, Val::Str(v2)) => Val::Bool(v1 < v2),
159		(Val::Str(v1), BinaryOpType::Gt, Val::Str(v2)) => Val::Bool(v1 > v2),
160		(Val::Str(v1), BinaryOpType::Lte, Val::Str(v2)) => Val::Bool(v1 <= v2),
161		(Val::Str(v1), BinaryOpType::Gte, Val::Str(v2)) => Val::Bool(v1 >= v2),
162
163		// Num X Num
152		(Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),164		(Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),
153		(Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => Val::Num(v1 / v2),165		(Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => Val::Num(v1 / v2),
154		(Val::Num(v1), BinaryOpType::Mod, Val::Num(v2)) => Val::Num(v1 % v2),166		(Val::Num(v1), BinaryOpType::Mod, Val::Num(v2)) => Val::Num(v1 % v2),
155167
156		(Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::Num(v1 - v2),168		(Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::Num(v1 - v2),
157
158		(Val::Num(v1), BinaryOpType::Lhs, Val::Num(v2)) => {
159			Val::Num(((*v1 as i32) << (*v2 as i32)) as f64)
160		}
161		(Val::Num(v1), BinaryOpType::Rhs, Val::Num(v2)) => {
162			Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)
163		}
164
165		(Val::Str(v1), BinaryOpType::Lt, Val::Str(v2)) => Val::Bool(v1 < v2),
166		(Val::Str(v1), BinaryOpType::Gt, Val::Str(v2)) => Val::Bool(v1 > v2),
167		(Val::Str(v1), BinaryOpType::Lte, Val::Str(v2)) => Val::Bool(v1 <= v2),
168		(Val::Str(v1), BinaryOpType::Gte, Val::Str(v2)) => Val::Bool(v1 >= v2),
169169
170		(Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => Val::Bool(v1 < v2),170		(Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => Val::Bool(v1 < v2),
171		(Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => Val::Bool(v1 > v2),171		(Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => Val::Bool(v1 > v2),
184		(Val::Num(v1), BinaryOpType::BitXor, Val::Num(v2)) => {184		(Val::Num(v1), BinaryOpType::BitXor, Val::Num(v2)) => {
185			Val::Num(((*v1 as i32) ^ (*v2 as i32)) as f64)185			Val::Num(((*v1 as i32) ^ (*v2 as i32)) as f64)
186		}186		}
187		(Val::Num(v1), BinaryOpType::Lhs, Val::Num(v2)) => {
188			Val::Num(((*v1 as i32) << (*v2 as i32)) as f64)
189		}
187		(a, BinaryOpType::Eq, b) => Val::Bool(a == b),190		(Val::Num(v1), BinaryOpType::Rhs, Val::Num(v2)) => {
191			Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)
192		}
193
194		// Arr X Arr
188		(a, BinaryOpType::Ne, b) => Val::Bool(a != b),195		(Val::Arr(a), BinaryOpType::Eq, Val::Arr(b)) => {
196			if a.len() != b.len() {
197				Val::Bool(false)
198			} else {
199				for i in 0..a.len() {
200					if let Val::Bool(v) = evaluate_binary_op_normal(
201						context.clone(),
202						&a[i].clone().unwrap_if_lazy()?,
203						op,
204						&b[i].clone().unwrap_if_lazy()?,
205					)? {
206						if !v {
207							return Ok(Val::Bool(false));
208						}
209					} else {
210						unreachable!()
211					}
212				}
213				return Ok(Val::Bool(true));
214			}
215		}
189		_ => panic!("no rules for binary operation: {:?} {:?} {:?}", a, op, b),216		_ => panic!("no rules for binary operation: {:?} {:?} {:?}", a, op, b),
190	})217	})
191}218}
212				Val::Arr(list) => {239				Val::Arr(list) => {
213					let mut out = Vec::new();240					let mut out = Vec::new();
214					for item in list {241					for item in list {
215						let item = item.clone();242						let item = item.clone().unwrap_if_lazy()?;
216						out.push(evaluate_comp(243						out.push(evaluate_comp(
217							context.with_var(var.clone(), item)?,244							context.with_var(var.clone(), item)?,
218							value,245							value,
373					.get(n as usize)400					.get(n as usize)
374					.unwrap_or_else(|| panic!("out of bounds"))401					.unwrap_or_else(|| panic!("out of bounds"))
375					.clone(),402					.clone()
403					.unwrap_if_lazy()?,
376				(Val::Str(s), Val::Num(n)) => {404				(Val::Str(s), Val::Num(n)) => {
377					Val::Str(s.chars().skip(n as usize).take(1).collect())405					Val::Str(s.chars().skip(n as usize).take(1).collect())
378				}406				}
402		Arr(items) => {430		Arr(items) => {
403			let mut out = Vec::with_capacity(items.len());431			let mut out = Vec::with_capacity(items.len());
404			for item in items {432			for item in items {
405				out.push(evaluate(context.clone(), item)?);433				out.push(Val::Lazy(lazy_val!(
434					closure!(clone context, clone item, || {
435						evaluate(context.clone(), &item)
436					})
437				)));
406			}438			}
407			Val::Arr(out)439			Val::Arr(out)
408		}440		}

modifiedcrates/jsonnet-evaluator/src/val.rsdiff before after both

44}44}
45impl Debug for LazyVal {45impl Debug for LazyVal {
46	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {46	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
47		if self.0.cached.borrow().is_some() {
48			write!(f, "{:?}", self.0.cached.borrow().clone().unwrap())
49		} else {
47		write!(f, "Lazy")50			write!(f, "Lazy")
48	}51		}
52	}
49}53}
50impl PartialEq for LazyVal {54impl PartialEq for LazyVal {