difftreelog
refactor(evaluator) error handling cleanup
in: master
6 files changed
crates/jsonnet-evaluator/src/ctx.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/ctx.rs
+++ b/crates/jsonnet-evaluator/src/ctx.rs
@@ -54,11 +54,11 @@
}
pub fn binding(&self, name: Rc<str>) -> Result<LazyVal> {
- self.0.bindings.get(&name).cloned().ok_or_else(|| {
- create_error::<()>(Error::UnknownVariable(name))
- .err()
- .unwrap()
- })
+ self.0
+ .bindings
+ .get(&name)
+ .cloned()
+ .ok_or_else(|| create_error(Error::UnknownVariable(name)))
}
pub fn into_future(self, ctx: FutureContext) -> Context {
{
crates/jsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth1use crate::{1use crate::{2 context_creator, create_error, escape_string_json, future_wrapper, lazy_val, manifest_json_ex,2 context_creator, create_error, create_error_result, escape_string_json, future_wrapper,3 parse_args, push, with_state, Context, ContextCreator, Error, FuncDesc, LazyBinding, LazyVal,3 lazy_val, manifest_json_ex, parse_args, push, with_state, Context, ContextCreator, Error,4 ObjMember, ObjValue, Result, Val, ValType,4 FuncDesc, LazyBinding, LazyVal, ObjMember, ObjValue, Result, Val, ValType,5};5};74 (UnaryOpType::Not, Val::Bool(v)) => Val::Bool(!v),74 (UnaryOpType::Not, Val::Bool(v)) => Val::Bool(!v),75 (UnaryOpType::Minus, Val::Num(n)) => Val::Num(-*n),75 (UnaryOpType::Minus, Val::Num(n)) => Val::Num(-*n),76 (UnaryOpType::BitNot, Val::Num(n)) => Val::Num(!(*n as i32) as f64),76 (UnaryOpType::BitNot, Val::Num(n)) => Val::Num(!(*n as i32) as f64),77 (op, o) => create_error(Error::UnaryOperatorDoesNotOperateOnType(77 (op, o) => create_error_result(Error::UnaryOperatorDoesNotOperateOnType(78 op,78 op,79 o.value_type()?,79 o.value_type()?,80 ))?,80 ))?,95 (Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),95 (Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),96 (Val::Arr(a), Val::Arr(b)) => Val::Arr(Rc::new([&a[..], &b[..]].concat())),96 (Val::Arr(a), Val::Arr(b)) => Val::Arr(Rc::new([&a[..], &b[..]].concat())),97 (Val::Num(v1), Val::Num(v2)) => Val::Num(v1 + v2),97 (Val::Num(v1), Val::Num(v2)) => Val::Num(v1 + v2),98 _ => create_error(Error::BinaryOperatorDoesNotOperateOnValues(98 _ => create_error_result(Error::BinaryOperatorDoesNotOperateOnValues(99 BinaryOpType::Add,99 BinaryOpType::Add,100 a.value_type()?,100 a.value_type()?,101 b.value_type()?,101 b.value_type()?,140 (Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),140 (Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),141 (Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => {141 (Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => {142 if *v2 <= f64::EPSILON {142 if *v2 <= f64::EPSILON {143 create_error(crate::Error::DivisionByZero)?143 create_error_result(crate::Error::DivisionByZero)?144 }144 }145 Val::Num(v1 / v2)145 Val::Num(v1 / v2)146 }146 }168 Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)168 Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)169 }169 }170170171 _ => create_error(Error::BinaryOperatorDoesNotOperateOnValues(171 _ => create_error_result(Error::BinaryOperatorDoesNotOperateOnValues(172 op,172 op,173 a.value_type()?,173 a.value_type()?,174 b.value_type()?,174 b.value_type()?,367 },367 },368 );368 );369 }369 }370 v => create_error(Error::FieldMustBeStringGot(v.value_type()?))?,370 v => create_error_result(Error::FieldMustBeStringGot(v.value_type()?))?,371 }371 }372 }372 }373373423 } else if let Some(Val::Str(n)) = v.get("__intristic_namespace__".into())? {423 } else if let Some(Val::Str(n)) = v.get("__intristic_namespace__".into())? {424 Val::Intristic(n, s)424 Val::Intristic(n, s)425 } else {425 } else {426 create_error(crate::Error::NoSuchField(s))?426 create_error_result(crate::Error::NoSuchField(s))?427 }427 }428 }428 }429 (Val::Obj(_), n) => create_error(crate::Error::ValueIndexMustBeTypeGot(429 (Val::Obj(_), n) => create_error_result(crate::Error::ValueIndexMustBeTypeGot(430 ValType::Obj,430 ValType::Obj,431 ValType::Str,431 ValType::Str,432 n.value_type()?,432 n.value_type()?,433 ))?,433 ))?,434434435 (Val::Arr(v), Val::Num(n)) => {435 (Val::Arr(v), Val::Num(n)) => {436 if n.fract() > f64::EPSILON {436 if n.fract() > f64::EPSILON {437 create_error(crate::Error::FractionalIndex)?437 create_error_result(crate::Error::FractionalIndex)?438 }438 }439 v.get(n as usize)439 v.get(n as usize)440 .unwrap_or_else(|| panic!("out of bounds"))440 .ok_or_else(|| {441 create_error(crate::Error::ArrayBoundsError(n as usize, v.len()))442 })?441 .clone()443 .clone()442 .unwrap_if_lazy()?444 .unwrap_if_lazy()?443 }445 }444 (Val::Arr(_), Val::Str(n)) => {446 (Val::Arr(_), Val::Str(n)) => {445 create_error(crate::Error::AttemptedIndexAnArrayWithString(n))?447 create_error_result(crate::Error::AttemptedIndexAnArrayWithString(n))?446 }448 }447 (Val::Arr(_), n) => create_error(crate::Error::ValueIndexMustBeTypeGot(449 (Val::Arr(_), n) => create_error_result(crate::Error::ValueIndexMustBeTypeGot(448 ValType::Arr,450 ValType::Arr,449 ValType::Num,451 ValType::Num,450 n.value_type()?,452 n.value_type()?,457 .collect::<String>()459 .collect::<String>()458 .into(),460 .into(),459 ),461 ),460 (Val::Str(_), n) => create_error(crate::Error::ValueIndexMustBeTypeGot(462 (Val::Str(_), n) => create_error_result(crate::Error::ValueIndexMustBeTypeGot(461 ValType::Str,463 ValType::Str,462 ValType::Num,464 ValType::Num,463 n.value_type()?,465 n.value_type()?,464 ))?,466 ))?,465467466 (v, _) => create_error(crate::Error::CantIndexInto(v.value_type()?))?,468 (v, _) => create_error_result(crate::Error::CantIndexInto(v.value_type()?))?,467 }469 }468 }470 }469 LocalExpr(bindings, returned) => {471 LocalExpr(bindings, returned) => {623 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];625 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];624 ], {626 ], {625 with_state(|s| s.0.ext_vars.borrow().get(&x).cloned()).ok_or_else(627 with_state(|s| s.0.ext_vars.borrow().get(&x).cloned()).ok_or_else(626 || {628 || create_error(crate::Error::UndefinedExternalVariable(x)),627 create_error::<()>(crate::Error::UndefinedExternalVariable(x))628 .err()629 .unwrap()630 },631 )?629 )?632 }),630 }),633 ("std", "filter") => parse_args!(context, "std.filter", args, 2, [631 ("std", "filter") => parse_args!(context, "std.filter", args, 2, [728 Val::Str(manifest_json_ex(&value, &indent)?.into())726 Val::Str(manifest_json_ex(&value, &indent)?.into())729 })727 })730 }728 }731 (ns, name) => create_error(crate::error::Error::IntristicNotFound(729 (ns, name) => create_error_result(crate::Error::IntristicNotFound(732 ns.into(),730 ns.into(),733 name.into(),731 name.into(),734 ))?,732 ))?,741 push(loc, "function call", body)?739 push(loc, "function call", body)?742 }740 }743 }741 }744 v => create_error(crate::error::Error::OnlyFunctionsCanBeCalledGot(742 v => create_error_result(crate::Error::OnlyFunctionsCanBeCalledGot(745 v.value_type()?,743 v.value_type()?,746 ))?,744 ))?,747 }745 }764 panic!("assertion failed ({:?}): no message", value);762 panic!("assertion failed ({:?}): no message", value);765 }763 }766 }764 }767 Error(e) => create_error(crate::Error::RuntimeError(765 Error(e) => create_error_result(crate::Error::RuntimeError(768 evaluate(context, e)?.try_cast_str("error text should be string")?,766 evaluate(context, e)?.try_cast_str("error text should be string")?,769 ))?,767 ))?,770 IfElse {768 IfElse {801 import_location.pop();799 import_location.pop();802 Val::Str(with_state(|s| s.import_file_str(&import_location, path))?)800 Val::Str(with_state(|s| s.import_file_str(&import_location, path))?)803 }801 }804 Literal(LiteralType::Super) => return create_error(crate::error::Error::StandaloneSuper),802 Literal(LiteralType::Super) => {803 return create_error_result(crate::Error::StandaloneSuper)804 }805 })805 })806}806}807807crates/jsonnet-evaluator/src/function.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/function.rs
+++ b/crates/jsonnet-evaluator/src/function.rs
@@ -1,4 +1,7 @@
-use crate::{create_error, evaluate, lazy_val, resolved_lazy_val, Context, Error, Result, Val};
+use crate::{
+ create_error, create_error_result, evaluate, lazy_val, resolved_lazy_val, Context, Error,
+ Result, Val,
+};
use closure::closure;
use jsonnet_parser::{ArgsDesc, ParamsDesc};
use std::collections::HashMap;
@@ -21,20 +24,19 @@
let mut positioned_args = vec![None; params.0.len()];
for (id, arg) in args.iter().enumerate() {
let idx = if let Some(name) = &arg.0 {
- params.iter().position(|p| *p.0 == *name).ok_or_else(|| {
- create_error::<()>(Error::UnknownFunctionParameter(name.clone()))
- .err()
- .unwrap()
- })?
+ params
+ .iter()
+ .position(|p| *p.0 == *name)
+ .ok_or_else(|| create_error(Error::UnknownFunctionParameter(name.clone())))?
} else {
id
};
if idx >= params.len() {
- create_error(Error::TooManyArgsFunctionHas(params.len()))?;
+ create_error_result(Error::TooManyArgsFunctionHas(params.len()))?;
}
if positioned_args[idx].is_some() {
- create_error(Error::BindingParameterASecondTime(params[idx].0.clone()))?;
+ create_error_result(Error::BindingParameterASecondTime(params[idx].0.clone()))?;
}
positioned_args[idx] = Some(arg.1.clone());
}
@@ -50,7 +52,7 @@
default,
)
} else {
- create_error(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;
+ create_error_result(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;
unreachable!()
};
let val = if tailstrict {
@@ -74,7 +76,7 @@
let mut positioned_args = vec![None; params.0.len()];
for (id, arg) in args.iter().enumerate() {
if id >= params.len() {
- create_error(Error::TooManyArgsFunctionHas(params.len()))?;
+ create_error_result(Error::TooManyArgsFunctionHas(params.len()))?;
}
positioned_args[id] = Some(arg);
}
@@ -85,7 +87,7 @@
} else if let Some(default) = &p.1 {
evaluate(ctx.clone(), default)?
} else {
- create_error(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;
+ create_error_result(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;
unreachable!()
};
out.insert(p.0.clone(), resolved_lazy_val!(val));
@@ -99,31 +101,31 @@
($ctx: expr, $fn_name: expr, $args: expr, $total_args: expr, [
$($id: expr, $name: ident $(: [$($p: path)|+] $(!! $a: path)?)?, $nt: expr);+ $(;)?
], $handler:block) => {{
- use crate::error::Error;
+ use crate::Error;
let args = $args;
if args.len() > $total_args {
- create_error(Error::TooManyArgsFunctionHas($total_args))?;
+ create_error_result(Error::TooManyArgsFunctionHas($total_args))?;
}
$(
if args.len() <= $id {
- create_error(Error::FunctionParameterNotBoundInCall(stringify!($name).into()))?;
+ create_error_result(Error::FunctionParameterNotBoundInCall(stringify!($name).into()))?;
}
let $name = &args[$id];
if $name.0.is_some() {
if $name.0.as_ref().unwrap() != stringify!($name) {
- create_error(Error::IntristicArgumentReorderingIsNotSupportedYet)?;
+ create_error_result(Error::IntristicArgumentReorderingIsNotSupportedYet)?;
}
}
let $name = evaluate($ctx.clone(), &$name.1)?;
$(
match $name {
$($p(_))|+ => {},
- _ => create_error(Error::TypeMismatch(concat!($fn_name, " ", stringify!($id), "nd argument"), $nt, $name.value_type()?))?,
+ _ => create_error_result(Error::TypeMismatch(concat!($fn_name, " ", stringify!($id), "nd argument"), $nt, $name.value_type()?))?,
};
$(
let $name = match $name {
$a(v) => v,
- _ => create_error(Error::TypeMismatch(concat!($fn_name, " ", stringify!($id), "nd argument"), $nt, $name.value_type()?))?,
+ _ => create_error_result(Error::TypeMismatch(concat!($fn_name, " ", stringify!($id), "nd argument"), $nt, $name.value_type()?))?,
};
)*
)*
crates/jsonnet-evaluator/src/import.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/import.rs
+++ b/crates/jsonnet-evaluator/src/import.rs
@@ -1,5 +1,8 @@
-use crate::create_error;
-use crate::error::{Error, Result};
+use crate::create_error_result;
+use crate::{
+ create_error,
+ error::{Error, Result},
+};
use fs::File;
use std::fs;
use std::io::Read;
@@ -13,7 +16,7 @@
pub struct DummyImportResolver;
impl ImportResolver for DummyImportResolver {
fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {
- create_error(Error::ImportNotSupported(from.clone(), path.clone()))
+ create_error_result(Error::ImportNotSupported(from.clone(), path.clone()))
}
fn load_file_contents(&self, _resolved: &PathBuf) -> Result<Rc<str>> {
// Can be only caused by library direct consumer, not by supplied jsonnet
@@ -43,21 +46,15 @@
return Ok(Rc::new(cloned));
}
}
- create_error(Error::ImportFileNotFound(from.clone(), path.clone()))
+ create_error_result(Error::ImportFileNotFound(from.clone(), path.clone()))
}
}
fn load_file_contents(&self, id: &PathBuf) -> Result<Rc<str>> {
- let mut file = File::open(id).map_err(|_e| {
- create_error::<()>(Error::ResolvedFileNotFound(id.clone()))
- .err()
- .unwrap()
- })?;
+ let mut file =
+ File::open(id).map_err(|_e| create_error(Error::ResolvedFileNotFound(id.clone())))?;
let mut out = String::new();
- file.read_to_string(&mut out).map_err(|_e| {
- create_error::<()>(Error::ImportBadFileUtf8(id.clone()))
- .err()
- .unwrap()
- })?;
+ file.read_to_string(&mut out)
+ .map_err(|_e| create_error(Error::ImportBadFileUtf8(id.clone())))?;
Ok(out.into())
}
}
crates/jsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/lib.rs
+++ b/crates/jsonnet-evaluator/src/lib.rs
@@ -87,9 +87,12 @@
pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {
EVAL_STATE.with(|s| f(s.borrow().as_ref().unwrap()))
}
-pub(crate) fn create_error<T>(err: Error) -> Result<T> {
+pub(crate) fn create_error(err: Error) -> LocError {
with_state(|s| s.error(err))
}
+pub(crate) fn create_error_result<T>(err: Error) -> Result<T> {
+ Err(with_state(|s| s.error(err)))
+}
pub(crate) fn push<T>(
e: &Option<ExprLocation>,
comment: &str,
@@ -187,9 +190,7 @@
}
let contents = self.0.import_resolver.load_file_contents(&file_path)?;
self.add_file(file_path.clone(), contents).map_err(|e| {
- create_error::<()>(Error::ImportSyntaxError(e))
- .err()
- .unwrap()
+ create_error(Error::ImportSyntaxError(e))
})?;
self.evaluate_file(&file_path)
}
@@ -292,7 +293,7 @@
let mut stack = self.0.stack.borrow_mut();
if stack.len() > self.0.settings.max_stack_frames {
drop(stack);
- return self.error(Error::StackOverflow);
+ return Err(self.error(Error::StackOverflow));
} else {
stack.push(StackTraceElement(e, comment));
}
@@ -318,8 +319,8 @@
.collect(),
)
}
- pub fn error<T>(&self, err: Error) -> Result<T> {
- Err(LocError(err, self.stack_trace()))
+ pub fn error(&self, err: Error) -> LocError {
+ LocError(err, self.stack_trace())
}
pub fn run_in_state<T>(&self, f: impl FnOnce() -> T) -> T {
crates/jsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/val.rs
+++ b/crates/jsonnet-evaluator/src/val.rs
@@ -1,5 +1,5 @@
use crate::{
- create_error, evaluate,
+ create_error_result, evaluate,
function::{parse_function_call, place_args},
Context, Error, ObjValue, Result,
};
@@ -137,7 +137,7 @@
pub fn assert_type(&self, context: &'static str, val_type: ValType) -> Result<()> {
let this_type = self.value_type()?;
if this_type != val_type {
- create_error(Error::TypeMismatch(context, vec![val_type], this_type))
+ create_error_result(Error::TypeMismatch(context, vec![val_type], this_type))
} else {
Ok(())
}