`e0c62dfdfc24`

2 files changed

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

9292
93		(Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),93		(Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),
94		(Val::Arr(a), Val::Arr(b)) => Val::Arr(Rc::new([&a[..], &b[..]].concat())),94		(Val::Arr(a), Val::Arr(b)) => Val::Arr(Rc::new([&a[..], &b[..]].concat())),
95		(Val::Num(v1), Val::Num(v2)) => Val::Num(v1 + v2),95		(Val::Num(v1), Val::Num(v2)) => Val::new_checked_num(v1 + v2)?,
96		_ => create_error_result(Error::BinaryOperatorDoesNotOperateOnValues(96		_ => create_error_result(Error::BinaryOperatorDoesNotOperateOnValues(
97			BinaryOpType::Add,97			BinaryOpType::Add,
98			a.value_type()?,98			a.value_type()?,
135		(Val::Str(v1), BinaryOpType::Gte, Val::Str(v2)) => Val::Bool(v1 >= v2),135		(Val::Str(v1), BinaryOpType::Gte, Val::Str(v2)) => Val::Bool(v1 >= v2),
136136
137		// Num X Num137		// Num X Num
138		(Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),138		(Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::new_checked_num(v1 * v2)?,
139		(Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => {139		(Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => {
140			if *v2 <= f64::EPSILON {140			if *v2 <= f64::EPSILON {
141				create_error_result(crate::Error::DivisionByZero)?141				create_error_result(crate::Error::DivisionByZero)?
142			}142			}
143			Val::Num(v1 / v2)143			Val::new_checked_num(v1 / v2)?
144		}144		}
145145
146		(Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::Num(v1 - v2),146		(Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::new_checked_num(v1 - v2)?,
147147
148		(Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => Val::Bool(v1 < v2),148		(Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => Val::Bool(v1 < v2),
149		(Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => Val::Bool(v1 > v2),149		(Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => Val::Bool(v1 > v2),
644		Literal(LiteralType::Null) => Val::Null,644		Literal(LiteralType::Null) => Val::Null,
645		Parened(e) => evaluate(context, e)?,645		Parened(e) => evaluate(context, e)?,
646		Str(v) => Val::Str(v.clone()),646		Str(v) => Val::Str(v.clone()),
647		Num(v) => Val::Num(*v),647		Num(v) => Val::new_checked_num(*v)?,
648		BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,648		BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,
649		UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,649		UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,
650		Var(name) => push(loc, "var", || {650		Var(name) => push(loc, "var", || {

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

134	};134	};
135}135}
136impl Val {136impl Val {
137	/// Creates Val::Num after checking for overflow. As numbers are f64, we can just check for finity
138	pub fn new_checked_num(num: f64) -> Result<Val> {
139		if num.is_finite() {
140			Ok(Val::Num(num))
141		} else {
142			create_error_result(Error::RuntimeError("overflow".into()))
143		}
144	}
145
137	pub fn assert_type(&self, context: &'static str, val_type: ValType) -> Result<()> {146	pub fn assert_type(&self, context: &'static str, val_type: ValType) -> Result<()> {
138		let this_type = self.value_type()?;147		let this_type = self.value_type()?;