git.delta.rocks / jrsonnet / refs/commits / 41ef1e2d3380

1use crate::ValType;1use crate::ValType;
2use jsonnet_parser::ExprLocation;2use jsonnet_parser::{BinaryOpType, ExprLocation, UnaryOpType};
3use std::{path::PathBuf, rc::Rc};3use std::{path::PathBuf, rc::Rc};
44
5#[derive(Debug, Clone)]5#[derive(Debug, Clone)]
6pub enum Error {6pub enum Error {
7	IntristicNotFound(Rc<str>, Rc<str>),7	IntristicNotFound(Rc<str>, Rc<str>),
8	IntristicArgumentReorderingIsNotSupportedYet,8	IntristicArgumentReorderingIsNotSupportedYet,
9
10	UnaryOperatorDoesNotOperateOnType(UnaryOpType, ValType),
11	BinaryOperatorDoesNotOperateOnValues(BinaryOpType, ValType, ValType),
912
10	VariableIsNotDefined(String),13	VariableIsNotDefined(String),
11	TypeMismatch(&'static str, Vec<ValType>, ValType),14	TypeMismatch(&'static str, Vec<ValType>, ValType),

--- a/crates/jsonnet-evaluator/src/evaluate.rs
+++ b/crates/jsonnet-evaluator/src/evaluate.rs
@@ -74,7 +74,10 @@
 		(UnaryOpType::Not, Val::Bool(v)) => Val::Bool(!v),
 		(UnaryOpType::Minus, Val::Num(n)) => Val::Num(-*n),
 		(UnaryOpType::BitNot, Val::Num(n)) => Val::Num(!(*n as i32) as f64),
-		(op, o) => panic!("unary op not implemented: {:?} {:?}", op, o),
+		(op, o) => create_error(Error::UnaryOperatorDoesNotOperateOnType(
+			op,
+			o.value_type()?,
+		))?,
 	})
 }
 
@@ -92,7 +95,11 @@
 		(Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),
 		(Val::Arr(a), Val::Arr(b)) => Val::Arr(Rc::new([&a[..], &b[..]].concat())),
 		(Val::Num(v1), Val::Num(v2)) => Val::Num(v1 + v2),
-		_ => panic!("can't add: {:?} and {:?}", a, b),
+		_ => create_error(Error::BinaryOperatorDoesNotOperateOnValues(
+			BinaryOpType::Add,
+			a.value_type()?,
+			b.value_type()?,
+		))?,
 	})
 }
 
@@ -161,7 +168,11 @@
 			Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)
 		}
 
-		_ => panic!("no rules for binary operation: {:?} {:?} {:?}", a, op, b),
+		_ => create_error(Error::BinaryOperatorDoesNotOperateOnValues(
+			op,
+			a.value_type()?,
+			b.value_type()?,
+		))?,
 	})
 }