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.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/evaluate.rs
+++ b/crates/jsonnet-evaluator/src/evaluate.rs
@@ -1,7 +1,7 @@
use crate::{
- context_creator, create_error, escape_string_json, future_wrapper, lazy_val, manifest_json_ex,
- parse_args, push, with_state, Context, ContextCreator, Error, FuncDesc, LazyBinding, LazyVal,
- ObjMember, ObjValue, Result, Val, ValType,
+ context_creator, create_error, create_error_result, escape_string_json, future_wrapper,
+ lazy_val, manifest_json_ex, parse_args, push, with_state, Context, ContextCreator, Error,
+ FuncDesc, LazyBinding, LazyVal, ObjMember, ObjValue, Result, Val, ValType,
};
use closure::closure;
use jsonnet_parser::{
@@ -74,7 +74,7 @@
(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) => create_error(Error::UnaryOperatorDoesNotOperateOnType(
+ (op, o) => create_error_result(Error::UnaryOperatorDoesNotOperateOnType(
op,
o.value_type()?,
))?,
@@ -95,7 +95,7 @@
(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),
- _ => create_error(Error::BinaryOperatorDoesNotOperateOnValues(
+ _ => create_error_result(Error::BinaryOperatorDoesNotOperateOnValues(
BinaryOpType::Add,
a.value_type()?,
b.value_type()?,
@@ -140,7 +140,7 @@
(Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),
(Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => {
if *v2 <= f64::EPSILON {
- create_error(crate::Error::DivisionByZero)?
+ create_error_result(crate::Error::DivisionByZero)?
}
Val::Num(v1 / v2)
}
@@ -168,7 +168,7 @@
Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)
}
- _ => create_error(Error::BinaryOperatorDoesNotOperateOnValues(
+ _ => create_error_result(Error::BinaryOperatorDoesNotOperateOnValues(
op,
a.value_type()?,
b.value_type()?,
@@ -367,7 +367,7 @@
},
);
}
- v => create_error(Error::FieldMustBeStringGot(v.value_type()?))?,
+ v => create_error_result(Error::FieldMustBeStringGot(v.value_type()?))?,
}
}
@@ -423,10 +423,10 @@
} else if let Some(Val::Str(n)) = v.get("__intristic_namespace__".into())? {
Val::Intristic(n, s)
} else {
- create_error(crate::Error::NoSuchField(s))?
+ create_error_result(crate::Error::NoSuchField(s))?
}
}
- (Val::Obj(_), n) => create_error(crate::Error::ValueIndexMustBeTypeGot(
+ (Val::Obj(_), n) => create_error_result(crate::Error::ValueIndexMustBeTypeGot(
ValType::Obj,
ValType::Str,
n.value_type()?,
@@ -434,17 +434,19 @@
(Val::Arr(v), Val::Num(n)) => {
if n.fract() > f64::EPSILON {
- create_error(crate::Error::FractionalIndex)?
+ create_error_result(crate::Error::FractionalIndex)?
}
v.get(n as usize)
- .unwrap_or_else(|| panic!("out of bounds"))
+ .ok_or_else(|| {
+ create_error(crate::Error::ArrayBoundsError(n as usize, v.len()))
+ })?
.clone()
.unwrap_if_lazy()?
}
(Val::Arr(_), Val::Str(n)) => {
- create_error(crate::Error::AttemptedIndexAnArrayWithString(n))?
+ create_error_result(crate::Error::AttemptedIndexAnArrayWithString(n))?
}
- (Val::Arr(_), n) => create_error(crate::Error::ValueIndexMustBeTypeGot(
+ (Val::Arr(_), n) => create_error_result(crate::Error::ValueIndexMustBeTypeGot(
ValType::Arr,
ValType::Num,
n.value_type()?,
@@ -457,13 +459,13 @@
.collect::<String>()
.into(),
),
- (Val::Str(_), n) => create_error(crate::Error::ValueIndexMustBeTypeGot(
+ (Val::Str(_), n) => create_error_result(crate::Error::ValueIndexMustBeTypeGot(
ValType::Str,
ValType::Num,
n.value_type()?,
))?,
- (v, _) => create_error(crate::Error::CantIndexInto(v.value_type()?))?,
+ (v, _) => create_error_result(crate::Error::CantIndexInto(v.value_type()?))?,
}
}
LocalExpr(bindings, returned) => {
@@ -623,11 +625,7 @@
0, x: [Val::Str]!!Val::Str, vec![ValType::Str];
], {
with_state(|s| s.0.ext_vars.borrow().get(&x).cloned()).ok_or_else(
- || {
- create_error::<()>(crate::Error::UndefinedExternalVariable(x))
- .err()
- .unwrap()
- },
+ || create_error(crate::Error::UndefinedExternalVariable(x)),
)?
}),
("std", "filter") => parse_args!(context, "std.filter", args, 2, [
@@ -728,7 +726,7 @@
Val::Str(manifest_json_ex(&value, &indent)?.into())
})
}
- (ns, name) => create_error(crate::error::Error::IntristicNotFound(
+ (ns, name) => create_error_result(crate::Error::IntristicNotFound(
ns.into(),
name.into(),
))?,
@@ -741,7 +739,7 @@
push(loc, "function call", body)?
}
}
- v => create_error(crate::error::Error::OnlyFunctionsCanBeCalledGot(
+ v => create_error_result(crate::Error::OnlyFunctionsCanBeCalledGot(
v.value_type()?,
))?,
}
@@ -764,7 +762,7 @@
panic!("assertion failed ({:?}): no message", value);
}
}
- Error(e) => create_error(crate::Error::RuntimeError(
+ Error(e) => create_error_result(crate::Error::RuntimeError(
evaluate(context, e)?.try_cast_str("error text should be string")?,
))?,
IfElse {
@@ -801,6 +799,8 @@
import_location.pop();
Val::Str(with_state(|s| s.import_file_str(&import_location, path))?)
}
- Literal(LiteralType::Super) => return create_error(crate::error::Error::StandaloneSuper),
+ Literal(LiteralType::Super) => {
+ return create_error_result(crate::Error::StandaloneSuper)
+ }
})
}
crates/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.rsdiffbeforeafterboth1use crate::create_error;2use crate::error::{Error, Result};3use fs::File;4use std::fs;5use std::io::Read;6use std::{cell::RefCell, collections::HashMap, path::PathBuf, rc::Rc};78pub trait ImportResolver {9 fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>>;10 fn load_file_contents(&self, resolved: &PathBuf) -> Result<Rc<str>>;11}1213pub struct DummyImportResolver;14impl ImportResolver for DummyImportResolver {15 fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {16 create_error(Error::ImportNotSupported(from.clone(), path.clone()))17 }18 fn load_file_contents(&self, _resolved: &PathBuf) -> Result<Rc<str>> {19 // Can be only caused by library direct consumer, not by supplied jsonnet20 panic!("dummy resolver can't load any file")21 }22}23impl Default for Box<dyn ImportResolver> {24 fn default() -> Self {25 Box::new(DummyImportResolver)26 }27}2829pub struct FileImportResolver {30 pub library_paths: Vec<PathBuf>,31}32impl ImportResolver for FileImportResolver {33 fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {34 let mut new_path = from.clone();35 new_path.push(path);36 if new_path.exists() {37 Ok(Rc::new(new_path))38 } else {39 for library_path in self.library_paths.iter() {40 let mut cloned = library_path.clone();41 cloned.push(path);42 if cloned.exists() {43 return Ok(Rc::new(cloned));44 }45 }46 create_error(Error::ImportFileNotFound(from.clone(), path.clone()))47 }48 }49 fn load_file_contents(&self, id: &PathBuf) -> Result<Rc<str>> {50 let mut file = File::open(id).map_err(|_e| {51 create_error::<()>(Error::ResolvedFileNotFound(id.clone()))52 .err()53 .unwrap()54 })?;55 let mut out = String::new();56 file.read_to_string(&mut out).map_err(|_e| {57 create_error::<()>(Error::ImportBadFileUtf8(id.clone()))58 .err()59 .unwrap()60 })?;61 Ok(out.into())62 }63}6465type ResolutionData = (PathBuf, PathBuf);66pub struct CachingImportResolver {67 resolution_cache: RefCell<HashMap<ResolutionData, Result<Rc<PathBuf>>>>,68 loading_cache: RefCell<HashMap<PathBuf, Result<Rc<str>>>>,69 inner: Box<dyn ImportResolver>,70}71impl ImportResolver for CachingImportResolver {72 fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {73 self.resolution_cache74 .borrow_mut()75 .entry((from.clone(), path.clone()))76 .or_insert_with(|| self.inner.resolve_file(from, path))77 .clone()78 }79 fn load_file_contents(&self, resolved: &PathBuf) -> Result<Rc<str>> {80 self.loading_cache81 .borrow_mut()82 .entry(resolved.clone())83 .or_insert_with(|| self.inner.load_file_contents(resolved))84 .clone()85 }86}1use crate::create_error_result;2use crate::{3 create_error,4 error::{Error, Result},5};6use fs::File;7use std::fs;8use std::io::Read;9use std::{cell::RefCell, collections::HashMap, path::PathBuf, rc::Rc};1011pub trait ImportResolver {12 fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>>;13 fn load_file_contents(&self, resolved: &PathBuf) -> Result<Rc<str>>;14}1516pub struct DummyImportResolver;17impl ImportResolver for DummyImportResolver {18 fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {19 create_error_result(Error::ImportNotSupported(from.clone(), path.clone()))20 }21 fn load_file_contents(&self, _resolved: &PathBuf) -> Result<Rc<str>> {22 // Can be only caused by library direct consumer, not by supplied jsonnet23 panic!("dummy resolver can't load any file")24 }25}26impl Default for Box<dyn ImportResolver> {27 fn default() -> Self {28 Box::new(DummyImportResolver)29 }30}3132pub struct FileImportResolver {33 pub library_paths: Vec<PathBuf>,34}35impl ImportResolver for FileImportResolver {36 fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {37 let mut new_path = from.clone();38 new_path.push(path);39 if new_path.exists() {40 Ok(Rc::new(new_path))41 } else {42 for library_path in self.library_paths.iter() {43 let mut cloned = library_path.clone();44 cloned.push(path);45 if cloned.exists() {46 return Ok(Rc::new(cloned));47 }48 }49 create_error_result(Error::ImportFileNotFound(from.clone(), path.clone()))50 }51 }52 fn load_file_contents(&self, id: &PathBuf) -> Result<Rc<str>> {53 let mut file =54 File::open(id).map_err(|_e| create_error(Error::ResolvedFileNotFound(id.clone())))?;55 let mut out = String::new();56 file.read_to_string(&mut out)57 .map_err(|_e| create_error(Error::ImportBadFileUtf8(id.clone())))?;58 Ok(out.into())59 }60}6162type ResolutionData = (PathBuf, PathBuf);63pub struct CachingImportResolver {64 resolution_cache: RefCell<HashMap<ResolutionData, Result<Rc<PathBuf>>>>,65 loading_cache: RefCell<HashMap<PathBuf, Result<Rc<str>>>>,66 inner: Box<dyn ImportResolver>,67}68impl ImportResolver for CachingImportResolver {69 fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {70 self.resolution_cache71 .borrow_mut()72 .entry((from.clone(), path.clone()))73 .or_insert_with(|| self.inner.resolve_file(from, path))74 .clone()75 }76 fn load_file_contents(&self, resolved: &PathBuf) -> Result<Rc<str>> {77 self.loading_cache78 .borrow_mut()79 .entry(resolved.clone())80 .or_insert_with(|| self.inner.load_file_contents(resolved))81 .clone()82 }83}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(())
}