difftreelog
feat(evaluator) Err instead of panic on unknown variable
in: master
3 files changed
crates/jsonnet-evaluator/src/ctx.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/ctx.rs
+++ b/crates/jsonnet-evaluator/src/ctx.rs
@@ -52,9 +52,11 @@
}))
}
- pub fn binding(&self, name: &str) -> LazyVal {
- self.0.bindings.get(name).cloned().unwrap_or_else(|| {
- panic!("can't find {} in {:?}", name, self);
+ pub fn binding(&self, name: &str) -> Result<LazyVal> {
+ self.0.bindings.get(name).cloned().ok_or_else(|| {
+ create_error::<()>(Error::UnknownVariable(name.to_owned()))
+ .err()
+ .unwrap()
})
}
pub fn into_future(self, ctx: FutureContext) -> Context {
crates/jsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/error.rs
+++ b/crates/jsonnet-evaluator/src/error.rs
@@ -7,6 +7,8 @@
TypeMismatch(&'static str, Vec<ValType>, ValType),
NoSuchField(String),
+ UnknownVariable(String),
+
UnknownFunctionParameter(String),
BindingParameterASecondTime(String),
TooManyArgsFunctionHas(usize),
crates/jsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth397 BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,397 BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,398 UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,398 UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,399 Var(name) => push(locexpr, "var".to_owned(), || {399 Var(name) => push(locexpr, "var".to_owned(), || {400 Val::Lazy(context.binding(&name)).unwrap_if_lazy()400 Val::Lazy(context.binding(&name)?).unwrap_if_lazy()401 })?,401 })?,402 Index(LocExpr(v, _), index) if matches!(&**v, Expr::Literal(LiteralType::Super)) => {402 Index(LocExpr(v, _), index) if matches!(&**v, Expr::Literal(LiteralType::Super)) => {403 let name = evaluate(context.clone(), index)?.try_cast_str("object index")?;403 let name = evaluate(context.clone(), index)?.try_cast_str("object index")?;