difftreelog
refact: simplify error management
in: master
18 files changed
bindings/jsonnet/src/import.rsdiffbeforeafterboth--- a/bindings/jsonnet/src/import.rs
+++ b/bindings/jsonnet/src/import.rs
@@ -1,7 +1,8 @@
//! Import resolution manipulation utilities
use jrsonnet_evaluator::{
- create_error, create_error_result, Error, EvaluationState, ImportResolver, Result,
+ error::{Error::*, Result},
+ throw, EvaluationState, ImportResolver,
};
use std::{
any::Any,
@@ -55,10 +56,9 @@
let result_str = result_raw.to_str().unwrap();
assert!(success == 0 || success == 1);
if success == 0 {
+ unsafe { CString::from_raw(result_ptr) };
let result = result_str.to_owned();
- let err = Err(create_error(Error::ImportCallbackError(result)));
- unsafe { CString::from_raw(result_ptr) };
- return err;
+ throw!(ImportCallbackError(result));
}
let found_here_raw = unsafe { CStr::from_ptr(found_here) };
@@ -121,15 +121,14 @@
return Ok(Rc::new(cloned));
}
}
- create_error_result(Error::ImportFileNotFound(from.clone(), path.clone()))
+ throw!(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())))?;
+ let mut file = File::open(id).map_err(|_e| ResolvedFileNotFound(id.clone()))?;
let mut out = String::new();
file.read_to_string(&mut out)
- .map_err(|_e| create_error(Error::ImportBadFileUtf8(id.clone())))?;
+ .map_err(|_e| ImportBadFileUtf8(id.clone()))?;
Ok(out.into())
}
unsafe fn as_any(&self) -> &dyn Any {
cmds/jrsonnet/src/main.rsdiffbeforeafterboth--- a/cmds/jrsonnet/src/main.rs
+++ b/cmds/jrsonnet/src/main.rs
@@ -1,6 +1,6 @@
use clap::Clap;
use jrsonnet_cli::{ConfigureState, GeneralOpts, InputOpts, ManifestOpts};
-use jrsonnet_evaluator::{EvaluationState, Result};
+use jrsonnet_evaluator::{error::Result, EvaluationState};
use std::{path::PathBuf, rc::Rc};
#[global_allocator]
crates/jrsonnet-cli/src/ext.rsdiffbeforeafterboth--- a/crates/jrsonnet-cli/src/ext.rs
+++ b/crates/jrsonnet-cli/src/ext.rs
@@ -1,6 +1,6 @@
use crate::ConfigureState;
use clap::Clap;
-use jrsonnet_evaluator::{EvaluationState, Result};
+use jrsonnet_evaluator::{error::Result, EvaluationState};
use std::str::FromStr;
#[derive(Clone)]
crates/jrsonnet-cli/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-cli/src/lib.rs
+++ b/crates/jrsonnet-cli/src/lib.rs
@@ -9,7 +9,7 @@
pub use trace::*;
use clap::Clap;
-use jrsonnet_evaluator::{EvaluationState, FileImportResolver, Result};
+use jrsonnet_evaluator::{error::Result, EvaluationState, FileImportResolver};
use std::path::PathBuf;
pub trait ConfigureState {
crates/jrsonnet-cli/src/manifest.rsdiffbeforeafterboth--- a/crates/jrsonnet-cli/src/manifest.rs
+++ b/crates/jrsonnet-cli/src/manifest.rs
@@ -1,6 +1,6 @@
use crate::ConfigureState;
use clap::Clap;
-use jrsonnet_evaluator::{EvaluationState, ManifestFormat, Result};
+use jrsonnet_evaluator::{error::Result, EvaluationState, ManifestFormat};
use std::str::FromStr;
pub enum ManifestFormatName {
crates/jrsonnet-cli/src/tla.rsdiffbeforeafterboth--- a/crates/jrsonnet-cli/src/tla.rs
+++ b/crates/jrsonnet-cli/src/tla.rs
@@ -1,6 +1,6 @@
use crate::{ConfigureState, ExtStr};
use clap::Clap;
-use jrsonnet_evaluator::{EvaluationState, Result};
+use jrsonnet_evaluator::{error::Result, EvaluationState};
#[derive(Clap)]
// #[clap(help_heading = "TOP LEVEL ARGUMENTS")]
crates/jrsonnet-cli/src/trace.rsdiffbeforeafterboth--- a/crates/jrsonnet-cli/src/trace.rs
+++ b/crates/jrsonnet-cli/src/trace.rs
@@ -1,8 +1,9 @@
use crate::ConfigureState;
use clap::Clap;
use jrsonnet_evaluator::{
+ error::Result,
trace::{CompactFormat, ExplainingFormat, PathResolver},
- EvaluationState, Result,
+ EvaluationState,
};
use std::str::FromStr;
crates/jrsonnet-evaluator/src/builtin/format.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/format.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/format.rs
@@ -1,31 +1,32 @@
//! faster std.format impl
#![allow(clippy::too_many_arguments)]
-use crate::{
- create_error, create_error_result, to_string, Error, LocError, ObjValue, Val, ValType,
-};
+use crate::{error::Error::*, throw, to_string, LocError, ObjValue, Result, Val, ValType};
-#[derive(Debug)]
+#[derive(Debug, Clone)]
pub enum FormatError {
TruncatedFormatCode,
UnrecognizedConversionType(char),
- ValueError(LocError),
NotEnoughValues,
CannotUseStarWidthWithObject,
MappingKeysRequired,
- NoSuchField(Rc<str>),
+ NoSuchFormatField(Rc<str>),
}
-impl From<LocError> for FormatError {
- fn from(e: LocError) -> Self {
- Self::ValueError(e)
+
+impl From<FormatError> for LocError {
+ fn from(e: FormatError) -> Self {
+ Self::new(Format(e))
}
}
+
use std::rc::Rc;
use FormatError::*;
-pub fn try_parse_mapping_key(str: &str) -> Result<(&str, &str), FormatError> {
+type ParseResult<'t, T> = std::result::Result<(T, &'t str), FormatError>;
+
+pub fn try_parse_mapping_key(str: &str) -> ParseResult<&str> {
if str.is_empty() {
return Err(TruncatedFormatCode);
}
@@ -84,7 +85,7 @@
pub sign: bool,
}
-pub fn try_parse_cflags(str: &str) -> Result<(CFlags, &str), FormatError> {
+pub fn try_parse_cflags(str: &str) -> ParseResult<CFlags> {
if str.is_empty() {
return Err(TruncatedFormatCode);
}
@@ -113,7 +114,7 @@
Star,
Fixed(usize),
}
-pub fn try_parse_field_width(str: &str) -> Result<(Width, &str), FormatError> {
+pub fn try_parse_field_width(str: &str) -> ParseResult<Width> {
if str.is_empty() {
return Err(TruncatedFormatCode);
}
@@ -134,7 +135,7 @@
Ok((Width::Fixed(out), &str[digits..]))
}
-pub fn try_parse_precision(str: &str) -> Result<(Option<Width>, &str), FormatError> {
+pub fn try_parse_precision(str: &str) -> ParseResult<Option<Width>> {
if str.is_empty() {
return Err(TruncatedFormatCode);
}
@@ -147,7 +148,7 @@
}
// Only skips
-pub fn try_parse_length_modifier(str: &str) -> Result<&str, FormatError> {
+pub fn try_parse_length_modifier(str: &str) -> ParseResult<()> {
if str.is_empty() {
return Err(TruncatedFormatCode);
}
@@ -159,10 +160,10 @@
return Err(TruncatedFormatCode);
}
}
- Ok(&str[idx..])
+ Ok(((), &str[idx..]))
}
-#[derive(Debug)]
+#[derive(Debug, PartialEq)]
pub enum ConvTypeV {
Decimal,
Octal,
@@ -179,7 +180,7 @@
caps: bool,
}
-pub fn parse_conversion_type(str: &str) -> Result<(ConvType, &str), FormatError> {
+pub fn parse_conversion_type(str: &str) -> ParseResult<ConvType> {
if str.is_empty() {
return Err(TruncatedFormatCode);
}
@@ -214,7 +215,7 @@
convtype: ConvTypeV,
caps: bool,
}
-pub fn parse_code(str: &str) -> Result<(Code, &str), FormatError> {
+pub fn parse_code(str: &str) -> ParseResult<Code> {
if str.is_empty() {
return Err(TruncatedFormatCode);
}
@@ -222,7 +223,7 @@
let (cflags, str) = try_parse_cflags(str)?;
let (width, str) = try_parse_field_width(str)?;
let (precision, str) = try_parse_precision(str)?;
- let str = try_parse_length_modifier(str)?;
+ let (_, str) = try_parse_length_modifier(str)?;
let (convtype, str) = parse_conversion_type(str)?;
Ok((
@@ -243,7 +244,7 @@
String(&'s str),
Code(Code<'s>),
}
-pub fn parse_codes(mut str: &str) -> Result<Vec<Element>, FormatError> {
+pub fn parse_codes(mut str: &str) -> Result<Vec<Element>> {
let mut bytes = str.as_bytes();
let mut out = vec![];
let mut offset = 0;
@@ -453,7 +454,7 @@
code: &Code,
width: usize,
precision: Option<usize>,
-) -> Result<(), FormatError> {
+) -> Result<()> {
let clfags = &code.cflags;
let (fpprec, iprec) = match precision {
Some(v) => (v, v),
@@ -565,22 +566,22 @@
ConvTypeV::Char => match value.clone().unwrap_if_lazy()? {
Val::Num(n) => tmp_out.push(
std::char::from_u32(n as u32)
- .ok_or_else(|| create_error(Error::InvalidUnicodeCodepointGot(n as u32)))?,
+ .ok_or_else(|| InvalidUnicodeCodepointGot(n as u32))?,
),
Val::Str(s) => {
if s.chars().count() != 1 {
- create_error_result(Error::RuntimeError(
+ throw!(RuntimeError(
format!("%c expected 1 char string, got {}", s.chars().count()).into(),
- ))?;
+ ));
}
tmp_out.push_str(&s);
}
_ => {
- create_error_result(Error::TypeMismatch(
+ throw!(TypeMismatch(
"%c requires number/string",
vec![ValType::Num, ValType::Str],
value.value_type()?,
- ))?;
+ ));
}
},
ConvTypeV::Percent => tmp_out.push('%'),
@@ -603,7 +604,7 @@
Ok(())
}
-pub fn format_arr(str: &str, mut values: &[Val]) -> Result<String, FormatError> {
+pub fn format_arr(str: &str, mut values: &[Val]) -> Result<String> {
let codes = parse_codes(&str)?;
let mut out = String::new();
@@ -616,7 +617,7 @@
let width = match c.width {
Width::Star => {
if values.is_empty() {
- return Err(FormatError::NotEnoughValues);
+ throw!(NotEnoughValues);
}
let value = &values[0];
values = &values[1..];
@@ -627,7 +628,7 @@
let precision = match c.precision {
Some(Width::Star) => {
if values.is_empty() {
- return Err(FormatError::NotEnoughValues);
+ throw!(NotEnoughValues);
}
let value = &values[0];
values = &values[1..];
@@ -642,7 +643,7 @@
&Val::Null
} else {
if values.is_empty() {
- return Err(FormatError::NotEnoughValues);
+ throw!(NotEnoughValues);
}
let value = &values[0];
values = &values[1..];
@@ -657,7 +658,7 @@
Ok(out)
}
-pub fn format_obj(str: &str, values: &ObjValue) -> Result<String, FormatError> {
+pub fn format_obj(str: &str, values: &ObjValue) -> Result<String> {
let codes = parse_codes(&str)?;
let mut out = String::new();
@@ -670,17 +671,17 @@
// TODO: Operate on ref
let f: Rc<str> = c.mkey.into();
if f.is_empty() {
- return Err(FormatError::MappingKeysRequired);
+ throw!(MappingKeysRequired);
}
let width = match c.width {
Width::Star => {
- return Err(FormatError::CannotUseStarWidthWithObject);
+ throw!(CannotUseStarWidthWithObject);
}
Width::Fixed(n) => n,
};
let precision = match c.precision {
Some(Width::Star) => {
- return Err(FormatError::CannotUseStarWidthWithObject);
+ throw!(CannotUseStarWidthWithObject);
}
Some(Width::Fixed(n)) => Some(n),
None => None,
@@ -688,7 +689,7 @@
let value = if let Some(v) = values.get(f.clone())? {
v
} else {
- return Err(FormatError::NoSuchField(f));
+ throw!(NoSuchFormatField(f));
};
format_code(&mut out, &value, &c, width, precision)?;
crates/jrsonnet-evaluator/src/ctx.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/ctx.rs
+++ b/crates/jrsonnet-evaluator/src/ctx.rs
@@ -1,5 +1,5 @@
use crate::{
- create_error, future_wrapper, map::LayeredHashMap, rc_fn_helper, resolved_lazy_val, Error,
+ error::Error::*, future_wrapper, map::LayeredHashMap, rc_fn_helper, resolved_lazy_val,
LazyBinding, LazyVal, ObjValue, Result, Val,
};
use std::{
@@ -61,11 +61,12 @@
}
pub fn binding(&self, name: Rc<str>) -> Result<LazyVal> {
- self.0
+ Ok(self
+ .0
.bindings
.get(&name)
.cloned()
- .ok_or_else(|| create_error(Error::UnknownVariable(name)))
+ .ok_or_else(|| UnknownVariable(name))?)
}
pub fn into_future(self, ctx: FutureContext) -> Context {
{
crates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -1,4 +1,4 @@
-use crate::{Val, ValType};
+use crate::{builtin::format::FormatError, Val, ValType};
use jrsonnet_parser::{BinaryOpType, ExprLocation, UnaryOpType};
use std::{path::PathBuf, rc::Rc};
@@ -61,7 +61,14 @@
ImportCallbackError(String),
InvalidUnicodeCodepointGot(u32),
+
+ Format(FormatError),
}
+impl From<Error> for LocError {
+ fn from(e: Error) -> Self {
+ Self(e, StackTrace(vec![]))
+ }
+}
#[derive(Clone, Debug)]
pub struct StackTraceElement {
@@ -73,4 +80,17 @@
#[derive(Debug, Clone)]
pub struct LocError(pub Error, pub StackTrace);
+impl LocError {
+ pub fn new(e: Error) -> Self {
+ Self(e, StackTrace(vec![]))
+ }
+}
+
pub type Result<V> = std::result::Result<V, LocError>;
+
+#[macro_export]
+macro_rules! throw {
+ ($e: expr) => {
+ return Err($e.into());
+ };
+}
crates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth1use crate::{2 builtin::format::{format_arr, format_obj},3 context_creator, create_error, create_error_result, equals, escape_string_json, future_wrapper,4 lazy_val, manifest_json_ex, parse_args, primitive_equals, push, with_state, Context,5 ContextCreator, Error, FuncDesc, LazyBinding, LazyVal, ObjMember, ObjValue, Result, Val,6 ValType,7};8use closure::closure;9use jrsonnet_parser::{10 ArgsDesc, AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, ExprLocation, FieldMember,11 ForSpecData, IfSpecData, LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType,12 Visibility,13};14use std::{cmp::Ordering, collections::HashMap, rc::Rc};1516pub fn evaluate_binding(b: &BindSpec, context_creator: ContextCreator) -> (Rc<str>, LazyBinding) {17 let b = b.clone();18 if let Some(params) = &b.params {19 let params = params.clone();20 (21 b.name.clone(),22 LazyBinding::Bindable(Rc::new(move |this, super_obj| {23 Ok(lazy_val!(24 closure!(clone b, clone params, clone context_creator, || Ok(evaluate_method(25 context_creator.0(this.clone(), super_obj.clone())?,26 b.name.clone(),27 params.clone(),28 b.value.clone(),29 )))30 ))31 })),32 )33 } else {34 (35 b.name.clone(),36 LazyBinding::Bindable(Rc::new(move |this, super_obj| {37 Ok(lazy_val!(closure!(clone context_creator, clone b, ||38 evaluate_named(39 context_creator.0(this.clone(), super_obj.clone())?,40 &b.value,41 b.name.clone()42 )43 )))44 })),45 )46 }47}4849pub fn evaluate_method(ctx: Context, name: Rc<str>, params: ParamsDesc, body: LocExpr) -> Val {50 Val::Func(Rc::new(FuncDesc {51 name,52 ctx,53 params,54 body,55 }))56}5758pub fn evaluate_field_name(59 context: Context,60 field_name: &jrsonnet_parser::FieldName,61) -> Result<Option<Rc<str>>> {62 Ok(match field_name {63 jrsonnet_parser::FieldName::Fixed(n) => Some(n.clone()),64 jrsonnet_parser::FieldName::Dyn(expr) => {65 let lazy = evaluate(context, expr)?;66 let value = lazy.unwrap_if_lazy()?;67 if matches!(value, Val::Null) {68 None69 } else {70 Some(value.try_cast_str("dynamic field name")?)71 }72 }73 })74}7576pub fn evaluate_unary_op(op: UnaryOpType, b: &Val) -> Result<Val> {77 Ok(match (op, b) {78 (o, Val::Lazy(l)) => evaluate_unary_op(o, &l.evaluate()?)?,79 (UnaryOpType::Not, Val::Bool(v)) => Val::Bool(!v),80 (UnaryOpType::Minus, Val::Num(n)) => Val::Num(-*n),81 (UnaryOpType::BitNot, Val::Num(n)) => Val::Num(!(*n as i32) as f64),82 (op, o) => create_error_result(Error::UnaryOperatorDoesNotOperateOnType(83 op,84 o.value_type()?,85 ))?,86 })87}8889pub(crate) fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {90 Ok(match (a, b) {91 (Val::Str(v1), Val::Str(v2)) => Val::Str(((**v1).to_owned() + &v2).into()),9293 // Can't use generic json serialization way, because it depends on number to string concatenation (std.jsonnet:890)94 (Val::Num(n), Val::Str(o)) => Val::Str(format!("{}{}", n, o).into()),95 (Val::Str(o), Val::Num(n)) => Val::Str(format!("{}{}", o, n).into()),9697 (Val::Str(s), o) => Val::Str(format!("{}{}", s, o.clone().into_json(0)?).into()),98 (o, Val::Str(s)) => Val::Str(format!("{}{}", o.clone().into_json(0)?, s).into()),99100 (Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),101 (Val::Arr(a), Val::Arr(b)) => Val::Arr(Rc::new([&a[..], &b[..]].concat())),102 (Val::Num(v1), Val::Num(v2)) => Val::new_checked_num(v1 + v2)?,103 _ => create_error_result(Error::BinaryOperatorDoesNotOperateOnValues(104 BinaryOpType::Add,105 a.value_type()?,106 b.value_type()?,107 ))?,108 })109}110111pub fn evaluate_binary_op_special(112 context: Context,113 a: &LocExpr,114 op: BinaryOpType,115 b: &LocExpr,116) -> Result<Val> {117 Ok(118 match (evaluate(context.clone(), &a)?.unwrap_if_lazy()?, op, b) {119 (Val::Bool(true), BinaryOpType::Or, _o) => Val::Bool(true),120 (Val::Bool(false), BinaryOpType::And, _o) => Val::Bool(false),121 (a, op, eb) => {122 evaluate_binary_op_normal(&a, op, &evaluate(context, eb)?.unwrap_if_lazy()?)?123 }124 },125 )126}127128pub fn evaluate_binary_op_normal(a: &Val, op: BinaryOpType, b: &Val) -> Result<Val> {129 Ok(match (a, op, b) {130 (a, BinaryOpType::Add, b) => evaluate_add_op(a, b)?,131132 (Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize).into()),133134 // Bool X Bool135 (Val::Bool(a), BinaryOpType::And, Val::Bool(b)) => Val::Bool(*a && *b),136 (Val::Bool(a), BinaryOpType::Or, Val::Bool(b)) => Val::Bool(*a || *b),137138 // Str X Str139 (Val::Str(v1), BinaryOpType::Lt, Val::Str(v2)) => Val::Bool(v1 < v2),140 (Val::Str(v1), BinaryOpType::Gt, Val::Str(v2)) => Val::Bool(v1 > v2),141 (Val::Str(v1), BinaryOpType::Lte, Val::Str(v2)) => Val::Bool(v1 <= v2),142 (Val::Str(v1), BinaryOpType::Gte, Val::Str(v2)) => Val::Bool(v1 >= v2),143144 // Num X Num145 (Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::new_checked_num(v1 * v2)?,146 (Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => {147 if *v2 <= f64::EPSILON {148 create_error_result(crate::Error::DivisionByZero)?149 }150 Val::new_checked_num(v1 / v2)?151 }152153 (Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::new_checked_num(v1 - v2)?,154155 (Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => Val::Bool(v1 < v2),156 (Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => Val::Bool(v1 > v2),157 (Val::Num(v1), BinaryOpType::Lte, Val::Num(v2)) => Val::Bool(v1 <= v2),158 (Val::Num(v1), BinaryOpType::Gte, Val::Num(v2)) => Val::Bool(v1 >= v2),159160 (Val::Num(v1), BinaryOpType::BitAnd, Val::Num(v2)) => {161 Val::Num(((*v1 as i32) & (*v2 as i32)) as f64)162 }163 (Val::Num(v1), BinaryOpType::BitOr, Val::Num(v2)) => {164 Val::Num(((*v1 as i32) | (*v2 as i32)) as f64)165 }166 (Val::Num(v1), BinaryOpType::BitXor, Val::Num(v2)) => {167 Val::Num(((*v1 as i32) ^ (*v2 as i32)) as f64)168 }169 (Val::Num(v1), BinaryOpType::Lhs, Val::Num(v2)) => {170 if *v2 < 0.0 {171 create_error_result(Error::RuntimeError("shift by negative exponent".into()))?172 }173 Val::Num(((*v1 as i32) << (*v2 as i32)) as f64)174 }175 (Val::Num(v1), BinaryOpType::Rhs, Val::Num(v2)) => {176 if *v2 < 0.0 {177 create_error_result(Error::RuntimeError("shift by negative exponent".into()))?178 }179 Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)180 }181182 _ => create_error_result(Error::BinaryOperatorDoesNotOperateOnValues(183 op,184 a.value_type()?,185 b.value_type()?,186 ))?,187 })188}189190future_wrapper!(HashMap<Rc<str>, LazyBinding>, FutureNewBindings);191future_wrapper!(ObjValue, FutureObjValue);192193pub fn evaluate_comp<T>(194 context: Context,195 value: &impl Fn(Context) -> Result<T>,196 specs: &[CompSpec],197) -> Result<Option<Vec<T>>> {198 Ok(match specs.get(0) {199 None => Some(vec![value(context)?]),200 Some(CompSpec::IfSpec(IfSpecData(cond))) => {201 if evaluate(context.clone(), &cond)?.try_cast_bool("if spec")? {202 evaluate_comp(context, value, &specs[1..])?203 } else {204 None205 }206 }207 Some(CompSpec::ForSpec(ForSpecData(var, expr))) => {208 match evaluate(context.clone(), &expr)?.unwrap_if_lazy()? {209 Val::Arr(list) => {210 let mut out = Vec::new();211 for item in list.iter() {212 let item = item.unwrap_if_lazy()?;213 out.push(evaluate_comp(214 context.with_var(var.clone(), item.clone())?,215 value,216 &specs[1..],217 )?);218 }219 Some(out.into_iter().flatten().flatten().collect())220 }221 _ => create_error_result(Error::InComprehensionCanOnlyIterateOverArray)?,222 }223 }224 })225}226227pub fn evaluate_member_list_object(context: Context, members: &[Member]) -> Result<ObjValue> {228 let new_bindings = FutureNewBindings::new();229 let future_this = FutureObjValue::new();230 let context_creator = context_creator!(231 closure!(clone context, clone new_bindings, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {232 Ok(context.extend_unbound(233 new_bindings.clone().unwrap(),234 context.dollar().clone().or_else(||this.clone()),235 Some(this.unwrap()),236 super_obj237 )?)238 })239 );240 {241 let mut bindings: HashMap<Rc<str>, LazyBinding> = HashMap::new();242 for (n, b) in members243 .iter()244 .filter_map(|m| match m {245 Member::BindStmt(b) => Some(b.clone()),246 _ => None,247 })248 .map(|b| evaluate_binding(&b, context_creator.clone()))249 {250 bindings.insert(n, b);251 }252 new_bindings.fill(bindings);253 }254255 let mut new_members = HashMap::new();256 for member in members.iter() {257 match member {258 Member::Field(FieldMember {259 name,260 plus,261 params: None,262 visibility,263 value,264 }) => {265 let name = evaluate_field_name(context.clone(), &name)?;266 if name.is_none() {267 continue;268 }269 let name = name.unwrap();270 new_members.insert(271 name.clone(),272 ObjMember {273 add: *plus,274 visibility: *visibility,275 invoke: LazyBinding::Bindable(Rc::new(276 closure!(clone name, clone value, clone context_creator, |this, super_obj| {277 Ok(LazyVal::new_resolved(evaluate(278 context_creator.0(this, super_obj)?,279 &value,280 )?))281 }),282 )),283 location: value.1.clone(),284 },285 );286 }287 Member::Field(FieldMember {288 name,289 params: Some(params),290 value,291 ..292 }) => {293 let name = evaluate_field_name(context.clone(), &name)?;294 if name.is_none() {295 continue;296 }297 let name = name.unwrap();298 new_members.insert(299 name.clone(),300 ObjMember {301 add: false,302 visibility: Visibility::Hidden,303 invoke: LazyBinding::Bindable(Rc::new(304 closure!(clone value, clone context_creator, clone params, clone name, |this, super_obj| {305 // TODO: Assert306 Ok(LazyVal::new_resolved(evaluate_method(307 context_creator.0(this, super_obj)?,308 name.clone(),309 params.clone(),310 value.clone(),311 )))312 }),313 )),314 location: value.1.clone(),315 },316 );317 }318 Member::BindStmt(_) => {}319 Member::AssertStmt(_) => {}320 }321 }322 Ok(future_this.fill(ObjValue::new(None, Rc::new(new_members))))323}324325pub fn evaluate_object(context: Context, object: &ObjBody) -> Result<ObjValue> {326 Ok(match object {327 ObjBody::MemberList(members) => evaluate_member_list_object(context, &members)?,328 ObjBody::ObjComp(obj) => {329 let future_this = FutureObjValue::new();330 let mut new_members = HashMap::new();331 for (k, v) in evaluate_comp(332 context.clone(),333 &|ctx| {334 let new_bindings = FutureNewBindings::new();335 let context_creator = context_creator!(336 closure!(clone context, clone new_bindings, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {337 Ok(context.extend_unbound(338 new_bindings.clone().unwrap(),339 context.dollar().clone().or_else(||this.clone()),340 None,341 super_obj342 )?)343 })344 );345 let mut bindings: HashMap<Rc<str>, LazyBinding> = HashMap::new();346 for (n, b) in obj347 .pre_locals348 .iter()349 .chain(obj.post_locals.iter())350 .map(|b| evaluate_binding(b, context_creator.clone()))351 {352 bindings.insert(n, b);353 }354 let bindings = new_bindings.fill(bindings);355 let ctx = ctx.extend_unbound(bindings, None, None, None)?;356 let key = evaluate(ctx.clone(), &obj.key)?;357 let value = LazyBinding::Bindable(Rc::new(358 closure!(clone ctx, clone obj.value, |this, _super_obj| {359 Ok(LazyVal::new_resolved(evaluate(ctx.extend(HashMap::new(), None, this, None)?, &value)?))360 }),361 ));362363 Ok((key, value))364 },365 &obj.compspecs,366 )?367 .unwrap()368 {369 match k {370 Val::Null => {}371 Val::Str(n) => {372 new_members.insert(373 n,374 ObjMember {375 add: false,376 visibility: Visibility::Normal,377 invoke: v,378 location: obj.value.1.clone(),379 },380 );381 }382 v => create_error_result(Error::FieldMustBeStringGot(v.value_type()?))?,383 }384 }385386 future_this.fill(ObjValue::new(None, Rc::new(new_members)))387 }388 })389}390391/// Extracts code block and disables inlining for them392/// Fixes WASM to java bytecode compilation failing because of very large method393macro_rules! noinline {394 ($e:expr) => {395 (#[inline(never)]396 move || $e)()397 };398}399400pub fn evaluate_apply(401 context: Context,402 value: &LocExpr,403 args: &ArgsDesc,404 loc: &Option<ExprLocation>,405 tailstrict: bool,406) -> Result<Val> {407 let lazy = evaluate(context.clone(), value)?;408 let value = lazy.unwrap_if_lazy()?;409 Ok(match value {410 Val::Intristic(ns, name) => match (&ns as &str, &name as &str) {411 // arr/string/function412 ("std", "length") => noinline!(parse_args!(context, "std.length", args, 1, [413 0, x: [Val::Str|Val::Arr|Val::Obj], vec![ValType::Str, ValType::Arr, ValType::Obj];414 ], {415 Ok(match x {416 Val::Str(n) => Val::Num(n.chars().count() as f64),417 Val::Arr(i) => Val::Num(i.len() as f64),418 Val::Obj(o) => Val::Num(419 o.fields_visibility()420 .into_iter()421 .filter(|(_k, v)| *v)422 .count() as f64,423 ),424 _ => unreachable!(),425 })426 }))?,427 // any428 ("std", "type") => parse_args!(context, "std.type", args, 1, [429 0, x, vec![];430 ], {431 Val::Str(x.value_type()?.name().into())432 }),433 // length, idx=>any434 ("std", "makeArray") => noinline!(parse_args!(context, "std.makeArray", args, 2, [435 0, sz: [Val::Num]!!Val::Num, vec![ValType::Num];436 1, func: [Val::Func]!!Val::Func, vec![ValType::Func];437 ], {438 if sz < 0.0 {439 create_error_result(crate::error::Error::RuntimeError(format!("makeArray requires size >= 0, got {}", sz).into()))?;440 }441 let mut out = Vec::with_capacity(sz as usize);442 for i in 0..sz as usize {443 out.push(func.evaluate_values(444 Context::new(),445 &[Val::Num(i as f64)]446 )?)447 }448 Ok(Val::Arr(Rc::new(out)))449 }))?,450 // string451 ("std", "codepoint") => parse_args!(context, "std.codepoint", args, 1, [452 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];453 ], {454 assert!(455 str.chars().count() == 1,456 "std.codepoint should receive single char string"457 );458 Val::Num(str.chars().take(1).next().unwrap() as u32 as f64)459 }),460 // object, includeHidden461 ("std", "objectFieldsEx") => {462 noinline!(parse_args!(context, "std.objectFieldsEx",args, 2, [463 0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];464 1, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];465 ], {466 let mut out = obj.fields_visibility()467 .into_iter()468 .filter(|(_k, v)| *v || inc_hidden)469 .map(|(k, _v)|k)470 .collect::<Vec<_>>();471 out.sort();472 Ok(Val::Arr(Rc::new(out.into_iter().map(Val::Str).collect())))473 }))?474 }475 // object, field, includeHidden476 ("std", "objectHasEx") => parse_args!(context, "std.objectHasEx", args, 3, [477 0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];478 1, f: [Val::Str]!!Val::Str, vec![ValType::Str];479 2, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];480 ], {481 Val::Bool(482 obj.fields_visibility()483 .into_iter()484 .filter(|(_k, v)| *v || inc_hidden)485 .any(|(k, _v)| *k == *f),486 )487 }),488 ("std", "primitiveEquals") => parse_args!(context, "std.primitiveEquals", args, 2, [489 0, a, vec![];490 1, b, vec![];491 ], {492 Val::Bool(primitive_equals(&a, &b)?)493 }),494 // faster495 ("std", "equals") => parse_args!(context, "std.equals", args, 2, [496 0, a, vec![];497 1, b, vec![];498 ], {499 Val::Bool(equals(&a, &b)?)500 }),501 ("std", "modulo") => parse_args!(context, "std.modulo", args, 2, [502 0, a: [Val::Num]!!Val::Num, vec![ValType::Num];503 1, b: [Val::Num]!!Val::Num, vec![ValType::Num];504 ], {505 Val::Num(a % b)506 }),507 ("std", "floor") => parse_args!(context, "std.floor", args, 1, [508 0, x: [Val::Num]!!Val::Num, vec![ValType::Num];509 ], {510 Val::Num(x.floor())511 }),512 ("std", "log") => parse_args!(context, "std.log", args, 2, [513 0, n: [Val::Num]!!Val::Num, vec![ValType::Num];514 ], {515 Val::Num(n.ln())516 }),517 ("std", "trace") => parse_args!(context, "std.trace", args, 2, [518 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];519 1, rest, vec![];520 ], {521 eprint!("TRACE:");522 if let Some(loc) = loc {523 with_state(|s|{524 let locs = s.map_source_locations(&loc.0, &[loc.1]);525 eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);526 });527 }528 eprintln!(" {}", str);529 rest530 }),531 ("std", "pow") => parse_args!(context, "std.modulo", args, 2, [532 0, x: [Val::Num]!!Val::Num, vec![ValType::Num];533 1, n: [Val::Num]!!Val::Num, vec![ValType::Num];534 ], {535 Val::Num(x.powf(n))536 }),537 ("std", "extVar") => parse_args!(context, "std.extVar", args, 2, [538 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];539 ], {540 with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or_else(541 || create_error(crate::Error::UndefinedExternalVariable(x)),542 )?543 }),544 ("std", "filter") => noinline!(parse_args!(context, "std.filter", args, 2, [545 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];546 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];547 ], {548 Ok(Val::Arr(Rc::new(549 arr.iter()550 .cloned()551 .filter(|e| {552 func553 .evaluate_values(context.clone(), &[e.clone()])554 .unwrap()555 .try_cast_bool("filter predicate")556 .unwrap()557 })558 .collect(),559 )))560 }))?,561 // faster562 ("std", "foldl") => noinline!(parse_args!(context, "std.foldl", args, 3, [563 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];564 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];565 2, init, vec![];566 ], {567 let mut acc = init;568 for i in arr.iter().cloned() {569 acc = func.evaluate_values(context.clone(), &[acc, i])?;570 }571 Ok(acc)572 }))?,573 // faster574 ("std", "foldr") => noinline!(parse_args!(context, "std.foldr", args, 3, [575 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];576 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];577 2, init, vec![];578 ], {579 let mut acc = init;580 for i in arr.iter().rev().cloned() {581 acc = func.evaluate_values(context.clone(), &[acc, i])?;582 }583 Ok(acc)584 }))?,585 // faster586 ("std", "sortImpl") => noinline!(parse_args!(context, "std.sort", args, 2, [587 0, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];588 1, keyF: [Val::Func]!!Val::Func, vec![ValType::Func];589 ], {590 if arr.len() <= 1 {591 return Ok(Val::Arr(arr))592 }593 let mut new_arr = arr.iter().cloned().collect::<Vec<_>>();594 match keyF.evaluate_values(context.clone(), &[new_arr[0].clone()])? {595 Val::Str(_) => {596 let mut err = None;597 new_arr.sort_by_cached_key(|k| {598 match keyF.evaluate_values(context.clone(), &[k.clone()]) {599 Ok(Val::Str(v)) => v,600 Ok(_) => {601 err = Some(create_error(crate::error::Error::RuntimeError("types of all array elements should equal".into())));602 "".into()603 }604 Err(e) => {605 err = Some(e);606 "".into()607 }608 }609 });610 if let Some(e) = err {611 return Err(e);612 }613 },614 Val::Num(_) => {615 let mut err = None;616 new_arr.sort_unstable_by(|a, b| {617 match (keyF.evaluate_values(context.clone(), &[a.clone()]), keyF.evaluate_values(context.clone(), &[b.clone()])) {618 (Ok(Val::Num(a)), Ok(Val::Num(b))) => a.partial_cmp(&b).unwrap(),619 (Ok(_a), Ok(_b)) => {620 err = Some(create_error(crate::error::Error::RuntimeError("types of all array elements should equal".into())));621 Ordering::Equal622 }623 (Err(e), _) | (_, Err(e)) => {624 err = Some(e);625 Ordering::Equal626 }627 }628 });629 if let Some(e) = err {630 return Err(e);631 }632 },633 _ => return Err(create_error(crate::error::Error::RuntimeError("keys should be number or string".into())))634 }635 Ok(Val::Arr(Rc::new(new_arr)))636 }))?,637 // faster638 ("std", "format") => parse_args!(context, "std.format", args, 2, [639 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];640 1, vals: [Val::Arr|Val::Obj], vec![ValType::Arr, ValType::Obj];641 ], {642 match vals {643 Val::Arr(vals) => Val::Str(format_arr(&str, &vals).unwrap().into()),644 Val::Obj(obj) => Val::Str(format_obj(&str, &obj).unwrap().into()),645 _ => unreachable!()646 }647 }),648 // faster649 ("std", "range") => parse_args!(context, "std.range", args, 2, [650 0, from: [Val::Num]!!Val::Num, vec![ValType::Num];651 0, to: [Val::Num]!!Val::Num, vec![ValType::Num];652 ], {653 let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));654 for i in from as usize..=to as usize {655 out.push(Val::Num(i as f64));656 }657 Val::Arr(Rc::new(out))658 }),659 ("std", "char") => parse_args!(context, "std.char", args, 1, [660 0, n: [Val::Num]!!Val::Num, vec![ValType::Num];661 ], {662 let mut out = String::new();663 out.push(std::char::from_u32(n as u32).ok_or_else(||664 create_error(crate::error::Error::InvalidUnicodeCodepointGot(n as u32))665 )?);666 Ok(Val::Str(out.into()))667 })?,668 ("std", "encodeUTF8") => parse_args!(context, "std.encodeUtf8", args, 1, [669 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];670 ], {671 Val::Arr(Rc::new(str.bytes().map(|b| Val::Num(b as f64)).collect()))672 }),673 ("std", "md5") => noinline!(parse_args!(context, "std.md5", args, 1, [674 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];675 ], {676 Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))677 }))?,678 // faster679 ("std", "base64") => parse_args!(context, "std.base64", args, 1, [680 0, input: [Val::Str | Val::Arr], vec![ValType::Arr, ValType::Str];681 ], {682 Val::Str(match input {683 Val::Str(s) => {684 base64::encode(s.bytes().collect::<Vec<_>>()).into()685 },686 Val::Arr(a) => {687 base64::encode(a.iter().map(|v| {688 Ok(v.clone().try_cast_num("base64 array")? as u8)689 }).collect::<Result<Vec<_>>>()?).into()690 },691 _ => unreachable!()692 })693 }),694 // faster695 ("std", "join") => noinline!(parse_args!(context, "std.join", args, 2, [696 0, sep: [Val::Str|Val::Arr], vec![ValType::Str, ValType::Arr];697 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];698 ], {699 Ok(match sep {700 Val::Arr(joiner_items) => {701 let mut out = Vec::new();702703 let mut first = true;704 for item in arr.iter().cloned() {705 if let Val::Arr(items) = item.unwrap_if_lazy()? {706 if !first {707 out.reserve(joiner_items.len());708 out.extend(joiner_items.iter().cloned());709 }710 first = false;711 out.reserve(items.len());712 out.extend(items.iter().cloned());713 } else {714 create_error_result(crate::Error::RuntimeError("in std.join all items should be arrays".into()))?;715 }716 }717718 Val::Arr(Rc::new(out))719 },720 Val::Str(sep) => {721 let mut out = String::new();722723 let mut first = true;724 for item in arr.iter().cloned() {725 if let Val::Str(item) = item.unwrap_if_lazy()? {726 if !first {727 out += &sep;728 }729 first = false;730 out += &item;731 } else {732 create_error_result(crate::Error::RuntimeError("in std.join all items should be strings".into()))?;733 }734 }735736 Val::Str(out.into())737 },738 _ => unreachable!()739 })740 }))?,741 // Faster742 ("std", "escapeStringJson") => parse_args!(context, "std.escapeStringJson", args, 1, [743 0, str_: [Val::Str]!!Val::Str, vec![ValType::Str];744 ], {745 Val::Str(escape_string_json(&str_).into())746 }),747 // Faster748 ("std", "manifestJsonEx") => parse_args!(context, "std.manifestJsonEx", args, 2, [749 0, value, vec![];750 1, indent: [Val::Str]!!Val::Str, vec![ValType::Str];751 ], {752 Val::Str(manifest_json_ex(&value, &indent)?.into())753 }),754 (ns, name) => {755 create_error_result(crate::Error::IntristicNotFound(ns.into(), name.into()))?756 }757 },758 Val::Func(f) => {759 let body = || f.evaluate(context, args, tailstrict);760 if tailstrict {761 body()?762 } else {763 push(loc, || format!("function <{}> call", f.name), body)?764 }765 }766 v => create_error_result(crate::Error::OnlyFunctionsCanBeCalledGot(v.value_type()?))?,767 })768}769770pub fn evaluate_named(context: Context, lexpr: &LocExpr, name: Rc<str>) -> Result<Val> {771 use Expr::*;772 let LocExpr(expr, _loc) = lexpr;773 Ok(match &**expr {774 Function(params, body) => evaluate_method(context, name, params.clone(), body.clone()),775 _ => evaluate(context, lexpr)?,776 })777}778779pub fn evaluate(context: Context, expr: &LocExpr) -> Result<Val> {780 use Expr::*;781 let LocExpr(expr, loc) = expr;782 Ok(match &**expr {783 Literal(LiteralType::This) => Val::Obj(784 context785 .this()786 .clone()787 .ok_or_else(|| create_error(crate::Error::CantUseSelfOutsideOfObject))?,788 ),789 Literal(LiteralType::Dollar) => Val::Obj(790 context791 .dollar()792 .clone()793 .ok_or_else(|| create_error(crate::Error::NoTopLevelObjectFound))?,794 ),795 Literal(LiteralType::True) => Val::Bool(true),796 Literal(LiteralType::False) => Val::Bool(false),797 Literal(LiteralType::Null) => Val::Null,798 Parened(e) => evaluate(context, e)?,799 Str(v) => Val::Str(v.clone()),800 Num(v) => Val::new_checked_num(*v)?,801 BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,802 UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,803 Var(name) => push(804 loc,805 || format!("variable <{}>", name),806 || Ok(Val::Lazy(context.binding(name.clone())?).unwrap_if_lazy()?),807 )?,808 Index(LocExpr(v, _), index) if matches!(&**v, Expr::Literal(LiteralType::Super)) => {809 let name = evaluate(context.clone(), index)?.try_cast_str("object index")?;810 context811 .super_obj()812 .clone()813 .expect("no super found")814 .get_raw(name, &context.this().clone().expect("no this found"))?815 .expect("value not found")816 }817 Index(value, index) => {818 match (819 evaluate(context.clone(), value)?.unwrap_if_lazy()?,820 evaluate(context, index)?,821 ) {822 (Val::Obj(v), Val::Str(s)) => {823 if let Some(v) = v.get(s.clone())? {824 v.unwrap_if_lazy()?825 } else if let Some(Val::Str(n)) = v.get("__intristic_namespace__".into())? {826 Val::Intristic(n, s)827 } else {828 create_error_result(crate::Error::NoSuchField(s))?829 }830 }831 (Val::Obj(_), n) => create_error_result(crate::Error::ValueIndexMustBeTypeGot(832 ValType::Obj,833 ValType::Str,834 n.value_type()?,835 ))?,836837 (Val::Arr(v), Val::Num(n)) => {838 if n.fract() > f64::EPSILON {839 create_error_result(crate::Error::FractionalIndex)?840 }841 v.get(n as usize)842 .ok_or_else(|| {843 create_error(crate::Error::ArrayBoundsError(n as usize, v.len()))844 })?845 .clone()846 .unwrap_if_lazy()?847 }848 (Val::Arr(_), Val::Str(n)) => {849 create_error_result(crate::Error::AttemptedIndexAnArrayWithString(n))?850 }851 (Val::Arr(_), n) => create_error_result(crate::Error::ValueIndexMustBeTypeGot(852 ValType::Arr,853 ValType::Num,854 n.value_type()?,855 ))?,856857 (Val::Str(s), Val::Num(n)) => Val::Str(858 s.chars()859 .skip(n as usize)860 .take(1)861 .collect::<String>()862 .into(),863 ),864 (Val::Str(_), n) => create_error_result(crate::Error::ValueIndexMustBeTypeGot(865 ValType::Str,866 ValType::Num,867 n.value_type()?,868 ))?,869870 (v, _) => create_error_result(crate::Error::CantIndexInto(v.value_type()?))?,871 }872 }873 LocalExpr(bindings, returned) => {874 let mut new_bindings: HashMap<Rc<str>, LazyBinding> = HashMap::new();875 let future_context = Context::new_future();876877 let context_creator = context_creator!(878 closure!(clone future_context, |_, _| Ok(future_context.clone().unwrap()))879 );880881 for (k, v) in bindings882 .iter()883 .map(|b| evaluate_binding(b, context_creator.clone()))884 {885 new_bindings.insert(k, v);886 }887888 let context = context889 .extend_unbound(new_bindings, None, None, None)?890 .into_future(future_context);891 evaluate(context, &returned.clone())?892 }893 Arr(items) => {894 let mut out = Vec::with_capacity(items.len());895 for item in items {896 out.push(Val::Lazy(lazy_val!(897 closure!(clone context, clone item, || {898 evaluate(context.clone(), &item)899 })900 )));901 }902 Val::Arr(Rc::new(out))903 }904 ArrComp(expr, compspecs) => Val::Arr(905 // First compspec should be forspec, so no "None" possible here906 Rc::new(evaluate_comp(context, &|ctx| evaluate(ctx, expr), compspecs)?.unwrap()),907 ),908 Obj(body) => Val::Obj(evaluate_object(context, body)?),909 ObjExtend(s, t) => evaluate_add_op(910 &evaluate(context.clone(), s)?,911 &Val::Obj(evaluate_object(context, t)?),912 )?,913 Apply(value, args, tailstrict) => evaluate_apply(context, value, args, loc, *tailstrict)?,914 Function(params, body) => {915 evaluate_method(context, "anonymous".into(), params.clone(), body.clone())916 }917 AssertExpr(AssertStmt(value, msg), returned) => {918 let assertion_result = push(919 &value.1,920 || "assertion condition".to_owned(),921 || {922 evaluate(context.clone(), &value)?923 .try_cast_bool("assertion condition should be boolean")924 },925 )?;926 if assertion_result {927 evaluate(context, returned)?928 } else if let Some(msg) = msg {929 create_error_result(crate::Error::AssertionFailed(evaluate(context, msg)?))?930 } else {931 create_error_result(crate::Error::AssertionFailed(Val::Null))?932 }933 }934 Error(e) => push(935 &loc,936 || "error statement".to_owned(),937 || {938 create_error_result(crate::Error::RuntimeError(939 evaluate(context, e)?.try_cast_str("error text should be string")?,940 ))?941 },942 )?,943 IfElse {944 cond,945 cond_then,946 cond_else,947 } => {948 if evaluate(context.clone(), &cond.0)?949 .try_cast_bool("if condition should be boolean")?950 {951 evaluate(context, cond_then)?952 } else {953 match cond_else {954 Some(v) => evaluate(context, v)?,955 None => Val::Null,956 }957 }958 }959 Import(path) => {960 let mut tmp = loc961 .clone()962 .expect("imports can't be used without loc_data")963 .0;964 let import_location = Rc::make_mut(&mut tmp);965 import_location.pop();966 push(967 loc,968 || format!("import {:?}", path),969 || with_state(|s| s.import_file(&import_location, path)),970 )?971 }972 ImportStr(path) => {973 let mut tmp = loc974 .clone()975 .expect("imports can't be used without loc_data")976 .0;977 let import_location = Rc::make_mut(&mut tmp);978 import_location.pop();979 Val::Str(with_state(|s| s.import_file_str(&import_location, path))?)980 }981 Literal(LiteralType::Super) => return create_error_result(crate::Error::StandaloneSuper),982 })983}1use crate::{2 builtin::format::{format_arr, format_obj},3 context_creator, equals,4 error::Error::*,5 escape_string_json, future_wrapper, lazy_val, manifest_json_ex, parse_args, primitive_equals,6 push, throw, with_state, Context, ContextCreator, FuncDesc, LazyBinding, LazyVal, LocError,7 ObjMember, ObjValue, Result, Val, ValType,8};9use closure::closure;10use jrsonnet_parser::{11 ArgsDesc, AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, ExprLocation, FieldMember,12 ForSpecData, IfSpecData, LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType,13 Visibility,14};15use std::{cmp::Ordering, collections::HashMap, path::PathBuf, rc::Rc};1617pub fn evaluate_binding(b: &BindSpec, context_creator: ContextCreator) -> (Rc<str>, LazyBinding) {18 let b = b.clone();19 if let Some(params) = &b.params {20 let params = params.clone();21 (22 b.name.clone(),23 LazyBinding::Bindable(Rc::new(move |this, super_obj| {24 Ok(lazy_val!(25 closure!(clone b, clone params, clone context_creator, || Ok(evaluate_method(26 context_creator.0(this.clone(), super_obj.clone())?,27 b.name.clone(),28 params.clone(),29 b.value.clone(),30 )))31 ))32 })),33 )34 } else {35 (36 b.name.clone(),37 LazyBinding::Bindable(Rc::new(move |this, super_obj| {38 Ok(lazy_val!(closure!(clone context_creator, clone b, ||39 evaluate_named(40 context_creator.0(this.clone(), super_obj.clone())?,41 &b.value,42 b.name.clone()43 )44 )))45 })),46 )47 }48}4950pub fn evaluate_method(ctx: Context, name: Rc<str>, params: ParamsDesc, body: LocExpr) -> Val {51 Val::Func(Rc::new(FuncDesc {52 name,53 ctx,54 params,55 body,56 }))57}5859pub fn evaluate_field_name(60 context: Context,61 field_name: &jrsonnet_parser::FieldName,62) -> Result<Option<Rc<str>>> {63 Ok(match field_name {64 jrsonnet_parser::FieldName::Fixed(n) => Some(n.clone()),65 jrsonnet_parser::FieldName::Dyn(expr) => {66 let lazy = evaluate(context, expr)?;67 let value = lazy.unwrap_if_lazy()?;68 if matches!(value, Val::Null) {69 None70 } else {71 Some(value.try_cast_str("dynamic field name")?)72 }73 }74 })75}7677pub fn evaluate_unary_op(op: UnaryOpType, b: &Val) -> Result<Val> {78 Ok(match (op, b) {79 (o, Val::Lazy(l)) => evaluate_unary_op(o, &l.evaluate()?)?,80 (UnaryOpType::Not, Val::Bool(v)) => Val::Bool(!v),81 (UnaryOpType::Minus, Val::Num(n)) => Val::Num(-*n),82 (UnaryOpType::BitNot, Val::Num(n)) => Val::Num(!(*n as i32) as f64),83 (op, o) => throw!(UnaryOperatorDoesNotOperateOnType(op, o.value_type()?)),84 })85}8687pub(crate) fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {88 Ok(match (a, b) {89 (Val::Str(v1), Val::Str(v2)) => Val::Str(((**v1).to_owned() + &v2).into()),9091 // Can't use generic json serialization way, because it depends on number to string concatenation (std.jsonnet:890)92 (Val::Num(n), Val::Str(o)) => Val::Str(format!("{}{}", n, o).into()),93 (Val::Str(o), Val::Num(n)) => Val::Str(format!("{}{}", o, n).into()),9495 (Val::Str(s), o) => Val::Str(format!("{}{}", s, o.clone().into_json(0)?).into()),96 (o, Val::Str(s)) => Val::Str(format!("{}{}", o.clone().into_json(0)?, s).into()),9798 (Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),99 (Val::Arr(a), Val::Arr(b)) => Val::Arr(Rc::new([&a[..], &b[..]].concat())),100 (Val::Num(v1), Val::Num(v2)) => Val::new_checked_num(v1 + v2)?,101 _ => throw!(BinaryOperatorDoesNotOperateOnValues(102 BinaryOpType::Add,103 a.value_type()?,104 b.value_type()?,105 )),106 })107}108109pub fn evaluate_binary_op_special(110 context: Context,111 a: &LocExpr,112 op: BinaryOpType,113 b: &LocExpr,114) -> Result<Val> {115 Ok(116 match (evaluate(context.clone(), &a)?.unwrap_if_lazy()?, op, b) {117 (Val::Bool(true), BinaryOpType::Or, _o) => Val::Bool(true),118 (Val::Bool(false), BinaryOpType::And, _o) => Val::Bool(false),119 (a, op, eb) => {120 evaluate_binary_op_normal(&a, op, &evaluate(context, eb)?.unwrap_if_lazy()?)?121 }122 },123 )124}125126pub fn evaluate_binary_op_normal(a: &Val, op: BinaryOpType, b: &Val) -> Result<Val> {127 Ok(match (a, op, b) {128 (a, BinaryOpType::Add, b) => evaluate_add_op(a, b)?,129130 (Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize).into()),131132 // Bool X Bool133 (Val::Bool(a), BinaryOpType::And, Val::Bool(b)) => Val::Bool(*a && *b),134 (Val::Bool(a), BinaryOpType::Or, Val::Bool(b)) => Val::Bool(*a || *b),135136 // Str X Str137 (Val::Str(v1), BinaryOpType::Lt, Val::Str(v2)) => Val::Bool(v1 < v2),138 (Val::Str(v1), BinaryOpType::Gt, Val::Str(v2)) => Val::Bool(v1 > v2),139 (Val::Str(v1), BinaryOpType::Lte, Val::Str(v2)) => Val::Bool(v1 <= v2),140 (Val::Str(v1), BinaryOpType::Gte, Val::Str(v2)) => Val::Bool(v1 >= v2),141142 // Num X Num143 (Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::new_checked_num(v1 * v2)?,144 (Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => {145 if *v2 <= f64::EPSILON {146 throw!(DivisionByZero)147 }148 Val::new_checked_num(v1 / v2)?149 }150151 (Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::new_checked_num(v1 - v2)?,152153 (Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => Val::Bool(v1 < v2),154 (Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => Val::Bool(v1 > v2),155 (Val::Num(v1), BinaryOpType::Lte, Val::Num(v2)) => Val::Bool(v1 <= v2),156 (Val::Num(v1), BinaryOpType::Gte, Val::Num(v2)) => Val::Bool(v1 >= v2),157158 (Val::Num(v1), BinaryOpType::BitAnd, Val::Num(v2)) => {159 Val::Num(((*v1 as i32) & (*v2 as i32)) as f64)160 }161 (Val::Num(v1), BinaryOpType::BitOr, Val::Num(v2)) => {162 Val::Num(((*v1 as i32) | (*v2 as i32)) as f64)163 }164 (Val::Num(v1), BinaryOpType::BitXor, Val::Num(v2)) => {165 Val::Num(((*v1 as i32) ^ (*v2 as i32)) as f64)166 }167 (Val::Num(v1), BinaryOpType::Lhs, Val::Num(v2)) => {168 if *v2 < 0.0 {169 throw!(RuntimeError("shift by negative exponent".into()))170 }171 Val::Num(((*v1 as i32) << (*v2 as i32)) as f64)172 }173 (Val::Num(v1), BinaryOpType::Rhs, Val::Num(v2)) => {174 if *v2 < 0.0 {175 throw!(RuntimeError("shift by negative exponent".into()))176 }177 Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)178 }179180 _ => throw!(BinaryOperatorDoesNotOperateOnValues(181 op,182 a.value_type()?,183 b.value_type()?,184 )),185 })186}187188future_wrapper!(HashMap<Rc<str>, LazyBinding>, FutureNewBindings);189future_wrapper!(ObjValue, FutureObjValue);190191pub fn evaluate_comp<T>(192 context: Context,193 value: &impl Fn(Context) -> Result<T>,194 specs: &[CompSpec],195) -> Result<Option<Vec<T>>> {196 Ok(match specs.get(0) {197 None => Some(vec![value(context)?]),198 Some(CompSpec::IfSpec(IfSpecData(cond))) => {199 if evaluate(context.clone(), &cond)?.try_cast_bool("if spec")? {200 evaluate_comp(context, value, &specs[1..])?201 } else {202 None203 }204 }205 Some(CompSpec::ForSpec(ForSpecData(var, expr))) => {206 match evaluate(context.clone(), &expr)?.unwrap_if_lazy()? {207 Val::Arr(list) => {208 let mut out = Vec::new();209 for item in list.iter() {210 let item = item.unwrap_if_lazy()?;211 out.push(evaluate_comp(212 context.with_var(var.clone(), item.clone())?,213 value,214 &specs[1..],215 )?);216 }217 Some(out.into_iter().flatten().flatten().collect())218 }219 _ => throw!(InComprehensionCanOnlyIterateOverArray),220 }221 }222 })223}224225pub fn evaluate_member_list_object(context: Context, members: &[Member]) -> Result<ObjValue> {226 let new_bindings = FutureNewBindings::new();227 let future_this = FutureObjValue::new();228 let context_creator = context_creator!(229 closure!(clone context, clone new_bindings, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {230 Ok(context.extend_unbound(231 new_bindings.clone().unwrap(),232 context.dollar().clone().or_else(||this.clone()),233 Some(this.unwrap()),234 super_obj235 )?)236 })237 );238 {239 let mut bindings: HashMap<Rc<str>, LazyBinding> = HashMap::new();240 for (n, b) in members241 .iter()242 .filter_map(|m| match m {243 Member::BindStmt(b) => Some(b.clone()),244 _ => None,245 })246 .map(|b| evaluate_binding(&b, context_creator.clone()))247 {248 bindings.insert(n, b);249 }250 new_bindings.fill(bindings);251 }252253 let mut new_members = HashMap::new();254 for member in members.iter() {255 match member {256 Member::Field(FieldMember {257 name,258 plus,259 params: None,260 visibility,261 value,262 }) => {263 let name = evaluate_field_name(context.clone(), &name)?;264 if name.is_none() {265 continue;266 }267 let name = name.unwrap();268 new_members.insert(269 name.clone(),270 ObjMember {271 add: *plus,272 visibility: *visibility,273 invoke: LazyBinding::Bindable(Rc::new(274 closure!(clone name, clone value, clone context_creator, |this, super_obj| {275 Ok(LazyVal::new_resolved(evaluate(276 context_creator.0(this, super_obj)?,277 &value,278 )?))279 }),280 )),281 location: value.1.clone(),282 },283 );284 }285 Member::Field(FieldMember {286 name,287 params: Some(params),288 value,289 ..290 }) => {291 let name = evaluate_field_name(context.clone(), &name)?;292 if name.is_none() {293 continue;294 }295 let name = name.unwrap();296 new_members.insert(297 name.clone(),298 ObjMember {299 add: false,300 visibility: Visibility::Hidden,301 invoke: LazyBinding::Bindable(Rc::new(302 closure!(clone value, clone context_creator, clone params, clone name, |this, super_obj| {303 // TODO: Assert304 Ok(LazyVal::new_resolved(evaluate_method(305 context_creator.0(this, super_obj)?,306 name.clone(),307 params.clone(),308 value.clone(),309 )))310 }),311 )),312 location: value.1.clone(),313 },314 );315 }316 Member::BindStmt(_) => {}317 Member::AssertStmt(_) => {}318 }319 }320 Ok(future_this.fill(ObjValue::new(None, Rc::new(new_members))))321}322323pub fn evaluate_object(context: Context, object: &ObjBody) -> Result<ObjValue> {324 Ok(match object {325 ObjBody::MemberList(members) => evaluate_member_list_object(context, &members)?,326 ObjBody::ObjComp(obj) => {327 let future_this = FutureObjValue::new();328 let mut new_members = HashMap::new();329 for (k, v) in evaluate_comp(330 context.clone(),331 &|ctx| {332 let new_bindings = FutureNewBindings::new();333 let context_creator = context_creator!(334 closure!(clone context, clone new_bindings, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {335 Ok(context.extend_unbound(336 new_bindings.clone().unwrap(),337 context.dollar().clone().or_else(||this.clone()),338 None,339 super_obj340 )?)341 })342 );343 let mut bindings: HashMap<Rc<str>, LazyBinding> = HashMap::new();344 for (n, b) in obj345 .pre_locals346 .iter()347 .chain(obj.post_locals.iter())348 .map(|b| evaluate_binding(b, context_creator.clone()))349 {350 bindings.insert(n, b);351 }352 let bindings = new_bindings.fill(bindings);353 let ctx = ctx.extend_unbound(bindings, None, None, None)?;354 let key = evaluate(ctx.clone(), &obj.key)?;355 let value = LazyBinding::Bindable(Rc::new(356 closure!(clone ctx, clone obj.value, |this, _super_obj| {357 Ok(LazyVal::new_resolved(evaluate(ctx.extend(HashMap::new(), None, this, None)?, &value)?))358 }),359 ));360361 Ok((key, value))362 },363 &obj.compspecs,364 )?365 .unwrap()366 {367 match k {368 Val::Null => {}369 Val::Str(n) => {370 new_members.insert(371 n,372 ObjMember {373 add: false,374 visibility: Visibility::Normal,375 invoke: v,376 location: obj.value.1.clone(),377 },378 );379 }380 v => throw!(FieldMustBeStringGot(v.value_type()?)),381 }382 }383384 future_this.fill(ObjValue::new(None, Rc::new(new_members)))385 }386 })387}388389/// Extracts code block and disables inlining for them390/// Fixes WASM to java bytecode compilation failing because of very large method391macro_rules! noinline {392 ($e:expr) => {393 (#[inline(never)]394 move || $e)()395 };396}397398pub fn evaluate_apply(399 context: Context,400 value: &LocExpr,401 args: &ArgsDesc,402 loc: &Option<ExprLocation>,403 tailstrict: bool,404) -> Result<Val> {405 let lazy = evaluate(context.clone(), value)?;406 let value = lazy.unwrap_if_lazy()?;407 Ok(match value {408 Val::Intristic(ns, name) => match (&ns as &str, &name as &str) {409 // arr/string/function410 ("std", "length") => parse_args!(context, "std.length", args, 1, [411 0, x: [Val::Str|Val::Arr|Val::Obj], vec![ValType::Str, ValType::Arr, ValType::Obj];412 ], {413 Ok(match x {414 Val::Str(n) => Val::Num(n.chars().count() as f64),415 Val::Arr(i) => Val::Num(i.len() as f64),416 Val::Obj(o) => Val::Num(417 o.fields_visibility()418 .into_iter()419 .filter(|(_k, v)| *v)420 .count() as f64,421 ),422 _ => unreachable!(),423 })424 })?,425 // any426 ("std", "type") => parse_args!(context, "std.type", args, 1, [427 0, x, vec![];428 ], {429 Ok(Val::Str(x.value_type()?.name().into()))430 })?,431 // length, idx=>any432 ("std", "makeArray") => noinline!(parse_args!(context, "std.makeArray", args, 2, [433 0, sz: [Val::Num]!!Val::Num, vec![ValType::Num];434 1, func: [Val::Func]!!Val::Func, vec![ValType::Func];435 ], {436 if sz < 0.0 {437 throw!(RuntimeError(format!("makeArray requires size >= 0, got {}", sz).into()));438 }439 let mut out = Vec::with_capacity(sz as usize);440 for i in 0..sz as usize {441 out.push(func.evaluate_values(442 Context::new(),443 &[Val::Num(i as f64)]444 )?)445 }446 Ok(Val::Arr(Rc::new(out)))447 }))?,448 // string449 ("std", "codepoint") => parse_args!(context, "std.codepoint", args, 1, [450 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];451 ], {452 assert!(453 str.chars().count() == 1,454 "std.codepoint should receive single char string"455 );456 Ok(Val::Num(str.chars().take(1).next().unwrap() as u32 as f64))457 })?,458 // object, includeHidden459 ("std", "objectFieldsEx") => {460 noinline!(parse_args!(context, "std.objectFieldsEx",args, 2, [461 0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];462 1, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];463 ], {464 let mut out = obj.fields_visibility()465 .into_iter()466 .filter(|(_k, v)| *v || inc_hidden)467 .map(|(k, _v)|k)468 .collect::<Vec<_>>();469 out.sort();470 Ok(Val::Arr(Rc::new(out.into_iter().map(Val::Str).collect())))471 }))?472 }473 // object, field, includeHidden474 ("std", "objectHasEx") => parse_args!(context, "std.objectHasEx", args, 3, [475 0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];476 1, f: [Val::Str]!!Val::Str, vec![ValType::Str];477 2, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];478 ], {479 Ok(Val::Bool(480 obj.fields_visibility()481 .into_iter()482 .filter(|(_k, v)| *v || inc_hidden)483 .any(|(k, _v)| *k == *f),484 ))485 })?,486 ("std", "primitiveEquals") => parse_args!(context, "std.primitiveEquals", args, 2, [487 0, a, vec![];488 1, b, vec![];489 ], {490 Ok(Val::Bool(primitive_equals(&a, &b)?))491 })?,492 // faster493 ("std", "equals") => parse_args!(context, "std.equals", args, 2, [494 0, a, vec![];495 1, b, vec![];496 ], {497 Ok(Val::Bool(equals(&a, &b)?))498 })?,499 ("std", "modulo") => parse_args!(context, "std.modulo", args, 2, [500 0, a: [Val::Num]!!Val::Num, vec![ValType::Num];501 1, b: [Val::Num]!!Val::Num, vec![ValType::Num];502 ], {503 Ok(Val::Num(a % b))504 })?,505 ("std", "floor") => parse_args!(context, "std.floor", args, 1, [506 0, x: [Val::Num]!!Val::Num, vec![ValType::Num];507 ], {508 Ok(Val::Num(x.floor()))509 })?,510 ("std", "log") => parse_args!(context, "std.log", args, 2, [511 0, n: [Val::Num]!!Val::Num, vec![ValType::Num];512 ], {513 Ok(Val::Num(n.ln()))514 })?,515 ("std", "trace") => parse_args!(context, "std.trace", args, 2, [516 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];517 1, rest, vec![];518 ], {519 eprint!("TRACE:");520 if let Some(loc) = loc {521 with_state(|s|{522 let locs = s.map_source_locations(&loc.0, &[loc.1]);523 eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);524 });525 }526 eprintln!(" {}", str);527 Ok(rest)528 })?,529 ("std", "pow") => parse_args!(context, "std.modulo", args, 2, [530 0, x: [Val::Num]!!Val::Num, vec![ValType::Num];531 1, n: [Val::Num]!!Val::Num, vec![ValType::Num];532 ], {533 Ok(Val::Num(x.powf(n)))534 })?,535 ("std", "extVar") => parse_args!(context, "std.extVar", args, 2, [536 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];537 ], {538 Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or_else(539 || UndefinedExternalVariable(x),540 )?)541 })?,542 ("std", "filter") => noinline!(parse_args!(context, "std.filter", args, 2, [543 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];544 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];545 ], {546 Ok(Val::Arr(Rc::new(547 arr.iter()548 .cloned()549 .filter(|e| {550 func551 .evaluate_values(context.clone(), &[e.clone()])552 .unwrap()553 .try_cast_bool("filter predicate")554 .unwrap()555 })556 .collect(),557 )))558 }))?,559 // faster560 ("std", "foldl") => noinline!(parse_args!(context, "std.foldl", args, 3, [561 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];562 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];563 2, init, vec![];564 ], {565 let mut acc = init;566 for i in arr.iter().cloned() {567 acc = func.evaluate_values(context.clone(), &[acc, i])?;568 }569 Ok(acc)570 }))?,571 // faster572 ("std", "foldr") => noinline!(parse_args!(context, "std.foldr", args, 3, [573 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];574 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];575 2, init, vec![];576 ], {577 let mut acc = init;578 for i in arr.iter().rev().cloned() {579 acc = func.evaluate_values(context.clone(), &[acc, i])?;580 }581 Ok(acc)582 }))?,583 // faster584 #[allow(non_snake_case)]585 ("std", "sortImpl") => noinline!(parse_args!(context, "std.sort", args, 2, [586 0, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];587 1, keyF: [Val::Func]!!Val::Func, vec![ValType::Func];588 ], {589 if arr.len() <= 1 {590 return Ok(Val::Arr(arr))591 }592 let mut new_arr = arr.iter().cloned().collect::<Vec<_>>();593 match keyF.evaluate_values(context.clone(), &[new_arr[0].clone()])? {594 Val::Str(_) => {595 let mut err = None;596 new_arr.sort_by_cached_key(|k| {597 match keyF.evaluate_values(context.clone(), &[k.clone()]) {598 Ok(Val::Str(v)) => v,599 Ok(_) => {600 err = Some(LocError::new(RuntimeError("types of all array elements should equal".into())));601 "".into()602 }603 Err(e) => {604 err = Some(e);605 "".into()606 }607 }608 });609 if let Some(e) = err {610 return Err(e);611 }612 },613 Val::Num(_) => {614 let mut err = None;615 new_arr.sort_unstable_by(|a, b| {616 match (keyF.evaluate_values(context.clone(), &[a.clone()]), keyF.evaluate_values(context.clone(), &[b.clone()])) {617 (Ok(Val::Num(a)), Ok(Val::Num(b))) => a.partial_cmp(&b).unwrap(),618 (Ok(_a), Ok(_b)) => {619 err = Some(RuntimeError("types of all array elements should equal".into()).into());620 Ordering::Equal621 }622 (Err(e), _) | (_, Err(e)) => {623 err = Some(e);624 Ordering::Equal625 }626 }627 });628 if let Some(e) = err {629 return Err(e);630 }631 },632 _ => throw!(RuntimeError("keys should be number or string".into()))633 }634 Ok(Val::Arr(Rc::new(new_arr)))635 }))?,636 // faster637 ("std", "format") => parse_args!(context, "std.format", args, 2, [638 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];639 1, vals, vec![]640 ], {641 push(&Some(ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)), ||format!("std.format of {}", str), ||{642 Ok(match vals {643 Val::Arr(vals) => Val::Str(format_arr(&str, &vals)?.into()),644 Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),645 o => Val::Str(format_arr(&str, &[o])?.into()),646 })647 })648 })?,649 // faster650 ("std", "range") => parse_args!(context, "std.range", args, 2, [651 0, from: [Val::Num]!!Val::Num, vec![ValType::Num];652 0, to: [Val::Num]!!Val::Num, vec![ValType::Num];653 ], {654 let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));655 for i in from as usize..=to as usize {656 out.push(Val::Num(i as f64));657 }658 Ok(Val::Arr(Rc::new(out)))659 })?,660 ("std", "char") => parse_args!(context, "std.char", args, 1, [661 0, n: [Val::Num]!!Val::Num, vec![ValType::Num];662 ], {663 let mut out = String::new();664 out.push(std::char::from_u32(n as u32).ok_or_else(||665 InvalidUnicodeCodepointGot(n as u32)666 )?);667 Ok(Val::Str(out.into()))668 })?,669 ("std", "encodeUTF8") => parse_args!(context, "std.encodeUtf8", args, 1, [670 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];671 ], {672 Ok(Val::Arr(Rc::new(str.bytes().map(|b| Val::Num(b as f64)).collect())))673 })?,674 ("std", "md5") => noinline!(parse_args!(context, "std.md5", args, 1, [675 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];676 ], {677 Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))678 }))?,679 // faster680 ("std", "base64") => parse_args!(context, "std.base64", args, 1, [681 0, input: [Val::Str | Val::Arr], vec![ValType::Arr, ValType::Str];682 ], {683 Ok(Val::Str(match input {684 Val::Str(s) => {685 base64::encode(s.bytes().collect::<Vec<_>>()).into()686 },687 Val::Arr(a) => {688 base64::encode(a.iter().map(|v| {689 Ok(v.clone().try_cast_num("base64 array")? as u8)690 }).collect::<Result<Vec<_>>>()?).into()691 },692 _ => unreachable!()693 }))694 })?,695 // faster696 ("std", "join") => noinline!(parse_args!(context, "std.join", args, 2, [697 0, sep: [Val::Str|Val::Arr], vec![ValType::Str, ValType::Arr];698 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];699 ], {700 Ok(match sep {701 Val::Arr(joiner_items) => {702 let mut out = Vec::new();703704 let mut first = true;705 for item in arr.iter().cloned() {706 if let Val::Arr(items) = item.unwrap_if_lazy()? {707 if !first {708 out.reserve(joiner_items.len());709 out.extend(joiner_items.iter().cloned());710 }711 first = false;712 out.reserve(items.len());713 out.extend(items.iter().cloned());714 } else {715 throw!(RuntimeError("in std.join all items should be arrays".into()));716 }717 }718719 Val::Arr(Rc::new(out))720 },721 Val::Str(sep) => {722 let mut out = String::new();723724 let mut first = true;725 for item in arr.iter().cloned() {726 if let Val::Str(item) = item.unwrap_if_lazy()? {727 if !first {728 out += &sep;729 }730 first = false;731 out += &item;732 } else {733 throw!(RuntimeError("in std.join all items should be strings".into()));734 }735 }736737 Val::Str(out.into())738 },739 _ => unreachable!()740 })741 }))?,742 // Faster743 ("std", "escapeStringJson") => parse_args!(context, "std.escapeStringJson", args, 1, [744 0, str_: [Val::Str]!!Val::Str, vec![ValType::Str];745 ], {746 Ok(Val::Str(escape_string_json(&str_).into()))747 })?,748 // Faster749 ("std", "manifestJsonEx") => parse_args!(context, "std.manifestJsonEx", args, 2, [750 0, value, vec![];751 1, indent: [Val::Str]!!Val::Str, vec![ValType::Str];752 ], {753 Ok(Val::Str(manifest_json_ex(&value, &indent)?.into()))754 })?,755 (ns, name) => throw!(IntristicNotFound(ns.into(), name.into())),756 },757 Val::Func(f) => {758 let body = || f.evaluate(context, args, tailstrict);759 if tailstrict {760 body()?761 } else {762 push(loc, || format!("function <{}> call", f.name), body)?763 }764 }765 v => throw!(OnlyFunctionsCanBeCalledGot(v.value_type()?)),766 })767}768769pub fn evaluate_named(context: Context, lexpr: &LocExpr, name: Rc<str>) -> Result<Val> {770 use Expr::*;771 let LocExpr(expr, _loc) = lexpr;772 Ok(match &**expr {773 Function(params, body) => evaluate_method(context, name, params.clone(), body.clone()),774 _ => evaluate(context, lexpr)?,775 })776}777778pub fn evaluate(context: Context, expr: &LocExpr) -> Result<Val> {779 use Expr::*;780 let LocExpr(expr, loc) = expr;781 Ok(match &**expr {782 Literal(LiteralType::This) => Val::Obj(783 context784 .this()785 .clone()786 .ok_or_else(|| CantUseSelfOutsideOfObject)?,787 ),788 Literal(LiteralType::Dollar) => Val::Obj(789 context790 .dollar()791 .clone()792 .ok_or_else(|| NoTopLevelObjectFound)?,793 ),794 Literal(LiteralType::True) => Val::Bool(true),795 Literal(LiteralType::False) => Val::Bool(false),796 Literal(LiteralType::Null) => Val::Null,797 Parened(e) => evaluate(context, e)?,798 Str(v) => Val::Str(v.clone()),799 Num(v) => Val::new_checked_num(*v)?,800 BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,801 UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,802 Var(name) => push(803 loc,804 || format!("variable <{}>", name),805 || Ok(Val::Lazy(context.binding(name.clone())?).unwrap_if_lazy()?),806 )?,807 Index(LocExpr(v, _), index) if matches!(&**v, Expr::Literal(LiteralType::Super)) => {808 let name = evaluate(context.clone(), index)?.try_cast_str("object index")?;809 context810 .super_obj()811 .clone()812 .expect("no super found")813 .get_raw(name, &context.this().clone().expect("no this found"))?814 .expect("value not found")815 }816 Index(value, index) => {817 match (818 evaluate(context.clone(), value)?.unwrap_if_lazy()?,819 evaluate(context, index)?,820 ) {821 (Val::Obj(v), Val::Str(s)) => {822 if let Some(v) = v.get(s.clone())? {823 v.unwrap_if_lazy()?824 } else if let Some(Val::Str(n)) = v.get("__intristic_namespace__".into())? {825 Val::Intristic(n, s)826 } else {827 throw!(NoSuchField(s))828 }829 }830 (Val::Obj(_), n) => throw!(ValueIndexMustBeTypeGot(831 ValType::Obj,832 ValType::Str,833 n.value_type()?,834 )),835836 (Val::Arr(v), Val::Num(n)) => {837 if n.fract() > f64::EPSILON {838 throw!(FractionalIndex)839 }840 v.get(n as usize)841 .ok_or_else(|| ArrayBoundsError(n as usize, v.len()))?842 .clone()843 .unwrap_if_lazy()?844 }845 (Val::Arr(_), Val::Str(n)) => throw!(AttemptedIndexAnArrayWithString(n)),846 (Val::Arr(_), n) => throw!(ValueIndexMustBeTypeGot(847 ValType::Arr,848 ValType::Num,849 n.value_type()?,850 )),851852 (Val::Str(s), Val::Num(n)) => Val::Str(853 s.chars()854 .skip(n as usize)855 .take(1)856 .collect::<String>()857 .into(),858 ),859 (Val::Str(_), n) => throw!(ValueIndexMustBeTypeGot(860 ValType::Str,861 ValType::Num,862 n.value_type()?,863 )),864865 (v, _) => throw!(CantIndexInto(v.value_type()?)),866 }867 }868 LocalExpr(bindings, returned) => {869 let mut new_bindings: HashMap<Rc<str>, LazyBinding> = HashMap::new();870 let future_context = Context::new_future();871872 let context_creator = context_creator!(873 closure!(clone future_context, |_, _| Ok(future_context.clone().unwrap()))874 );875876 for (k, v) in bindings877 .iter()878 .map(|b| evaluate_binding(b, context_creator.clone()))879 {880 new_bindings.insert(k, v);881 }882883 let context = context884 .extend_unbound(new_bindings, None, None, None)?885 .into_future(future_context);886 evaluate(context, &returned.clone())?887 }888 Arr(items) => {889 let mut out = Vec::with_capacity(items.len());890 for item in items {891 out.push(Val::Lazy(lazy_val!(892 closure!(clone context, clone item, || {893 evaluate(context.clone(), &item)894 })895 )));896 }897 Val::Arr(Rc::new(out))898 }899 ArrComp(expr, compspecs) => Val::Arr(900 // First compspec should be forspec, so no "None" possible here901 Rc::new(evaluate_comp(context, &|ctx| evaluate(ctx, expr), compspecs)?.unwrap()),902 ),903 Obj(body) => Val::Obj(evaluate_object(context, body)?),904 ObjExtend(s, t) => evaluate_add_op(905 &evaluate(context.clone(), s)?,906 &Val::Obj(evaluate_object(context, t)?),907 )?,908 Apply(value, args, tailstrict) => evaluate_apply(context, value, args, loc, *tailstrict)?,909 Function(params, body) => {910 evaluate_method(context, "anonymous".into(), params.clone(), body.clone())911 }912 AssertExpr(AssertStmt(value, msg), returned) => {913 let assertion_result = push(914 &value.1,915 || "assertion condition".to_owned(),916 || {917 evaluate(context.clone(), &value)?918 .try_cast_bool("assertion condition should be boolean")919 },920 )?;921 if assertion_result {922 evaluate(context, returned)?923 } else if let Some(msg) = msg {924 throw!(AssertionFailed(evaluate(context, msg)?));925 } else {926 throw!(AssertionFailed(Val::Null));927 }928 }929 ErrorStmt(e) => push(930 &loc,931 || "error statement".to_owned(),932 || {933 throw!(RuntimeError(934 evaluate(context, e)?.try_cast_str("error text should be string")?,935 ))936 },937 )?,938 IfElse {939 cond,940 cond_then,941 cond_else,942 } => {943 if evaluate(context.clone(), &cond.0)?944 .try_cast_bool("if condition should be boolean")?945 {946 evaluate(context, cond_then)?947 } else {948 match cond_else {949 Some(v) => evaluate(context, v)?,950 None => Val::Null,951 }952 }953 }954 Import(path) => {955 let mut tmp = loc956 .clone()957 .expect("imports can't be used without loc_data")958 .0;959 let import_location = Rc::make_mut(&mut tmp);960 import_location.pop();961 push(962 loc,963 || format!("import {:?}", path),964 || with_state(|s| s.import_file(&import_location, path)),965 )?966 }967 ImportStr(path) => {968 let mut tmp = loc969 .clone()970 .expect("imports can't be used without loc_data")971 .0;972 let import_location = Rc::make_mut(&mut tmp);973 import_location.pop();974 Val::Str(with_state(|s| s.import_file_str(&import_location, path))?)975 }976 Literal(LiteralType::Super) => throw!(StandaloneSuper),977 })978}crates/jrsonnet-evaluator/src/function.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/function.rs
+++ b/crates/jrsonnet-evaluator/src/function.rs
@@ -1,7 +1,4 @@
-use crate::{
- create_error, create_error_result, evaluate, lazy_val, resolved_lazy_val, Context, Error,
- Result, Val,
-};
+use crate::{error::Error::*, evaluate, lazy_val, resolved_lazy_val, throw, Context, Result, Val};
use closure::closure;
use jrsonnet_parser::{ArgsDesc, ParamsDesc};
use std::{collections::HashMap, rc::Rc};
@@ -30,16 +27,16 @@
params
.iter()
.position(|p| *p.0 == *name)
- .ok_or_else(|| create_error(Error::UnknownFunctionParameter(name.clone())))?
+ .ok_or_else(|| UnknownFunctionParameter(name.clone()))?
} else {
id
};
if idx >= params.len() {
- create_error_result(Error::TooManyArgsFunctionHas(params.len()))?;
+ throw!(TooManyArgsFunctionHas(params.len()));
}
if positioned_args[idx].is_some() {
- create_error_result(Error::BindingParameterASecondTime(params[idx].0.clone()))?;
+ throw!(BindingParameterASecondTime(params[idx].0.clone()));
}
positioned_args[idx] = Some(arg.1.clone());
}
@@ -50,8 +47,7 @@
} else if let Some(default) = &p.1 {
(body_ctx.clone().expect(NO_DEFAULT_CONTEXT), default)
} else {
- create_error_result(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;
- unreachable!()
+ throw!(FunctionParameterNotBoundInCall(p.0.clone()));
};
let val = if tailstrict {
resolved_lazy_val!(evaluate(ctx, expr)?)
@@ -74,15 +70,16 @@
let mut out = HashMap::new();
let mut positioned_args = vec![None; params.0.len()];
for (name, val) in args.iter() {
- let idx = params.iter().position(|p| *p.0 == **name).ok_or_else(|| {
- create_error(Error::UnknownFunctionParameter((&name as &str).to_owned()))
- })?;
+ let idx = params
+ .iter()
+ .position(|p| *p.0 == **name)
+ .ok_or_else(|| UnknownFunctionParameter((&name as &str).to_owned()))?;
if idx >= params.len() {
- create_error_result(Error::TooManyArgsFunctionHas(params.len()))?;
+ throw!(TooManyArgsFunctionHas(params.len()));
}
if positioned_args[idx].is_some() {
- create_error_result(Error::BindingParameterASecondTime(params[idx].0.clone()))?;
+ throw!(BindingParameterASecondTime(params[idx].0.clone()));
}
positioned_args[idx] = Some(val.clone());
}
@@ -104,8 +101,7 @@
})
}
} else {
- create_error_result(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;
- unreachable!()
+ throw!(FunctionParameterNotBoundInCall(p.0.clone()));
};
out.insert(p.0.clone(), val);
}
@@ -123,7 +119,7 @@
let mut positioned_args = vec![None; params.0.len()];
for (id, arg) in args.iter().enumerate() {
if id >= params.len() {
- create_error_result(Error::TooManyArgsFunctionHas(params.len()))?;
+ throw!(TooManyArgsFunctionHas(params.len()));
}
positioned_args[id] = Some(arg);
}
@@ -134,8 +130,7 @@
} else if let Some(default) = &p.1 {
evaluate(ctx.clone(), default)?
} else {
- create_error_result(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;
- unreachable!()
+ throw!(FunctionParameterNotBoundInCall(p.0.clone()));
};
out.insert(p.0.clone(), resolved_lazy_val!(val));
}
@@ -148,36 +143,39 @@
($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;
+ use crate::{throw, error::Error::*};
let args = $args;
if args.len() > $total_args {
- create_error_result(Error::TooManyArgsFunctionHas($total_args))?;
+ throw!(TooManyArgsFunctionHas($total_args));
}
$(
if args.len() <= $id {
- create_error_result(Error::FunctionParameterNotBoundInCall(stringify!($name).into()))?;
+ throw!(FunctionParameterNotBoundInCall(stringify!($name).into()));
}
let $name = &args[$id];
if $name.0.is_some() {
if $name.0.as_ref().unwrap() != stringify!($name) {
- create_error_result(Error::IntristicArgumentReorderingIsNotSupportedYet)?;
+ throw!(IntristicArgumentReorderingIsNotSupportedYet);
}
}
let $name = evaluate($ctx.clone(), &$name.1)?;
$(
match $name {
$($p(_))|+ => {},
- _ => create_error_result(Error::TypeMismatch(concat!($fn_name, " ", stringify!($id), "nd (", stringify!($name), ") argument"), $nt, $name.value_type()?))?,
+ _ => throw!(TypeMismatch(
+ concat!($fn_name, " ", stringify!($id), "nd (", stringify!($name), ") argument"),
+ $nt, $name.value_type()?
+ )),
};
$(
let $name = match $name {
$a(v) => v,
- _ => create_error_result(Error::TypeMismatch(concat!($fn_name, " ", stringify!($id), "nd (", stringify!($name), ") argument"), $nt, $name.value_type()?))?,
+ _ =>throw!(TypeMismatch(concat!($fn_name, " ", stringify!($id), "nd (", stringify!($name), ") argument"), $nt, $name.value_type()?)),
};
)*
)*
)+
- $handler
+ ($handler as crate::Result<_>)
}};
}
@@ -198,7 +196,9 @@
], {
assert!((a - 2.0).abs() <= f64::EPSILON);
assert!((b - 1.0).abs() <= f64::EPSILON);
- });
+ Ok(())
+ })
+ .unwrap();
Ok(())
})
}
crates/jrsonnet-evaluator/src/import.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/import.rs
+++ b/crates/jrsonnet-evaluator/src/import.rs
@@ -1,7 +1,6 @@
-use crate::create_error_result;
use crate::{
- create_error,
- error::{Error, Result},
+ error::{Error::*, Result},
+ throw,
};
use fs::File;
use std::fs;
@@ -28,7 +27,7 @@
pub struct DummyImportResolver;
impl ImportResolver for DummyImportResolver {
fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {
- create_error_result(Error::ImportNotSupported(from.clone(), path.clone()))
+ throw!(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
@@ -65,15 +64,14 @@
return Ok(Rc::new(cloned));
}
}
- create_error_result(Error::ImportFileNotFound(from.clone(), path.clone()))
+ throw!(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())))?;
+ let mut file = File::open(id).map_err(|_e| ResolvedFileNotFound(id.clone()))?;
let mut out = String::new();
file.read_to_string(&mut out)
- .map_err(|_e| create_error(Error::ImportBadFileUtf8(id.clone())))?;
+ .map_err(|_e| ImportBadFileUtf8(id.clone()))?;
Ok(out.into())
}
unsafe fn as_any(&self) -> &dyn Any {
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -10,7 +10,7 @@
mod builtin;
mod ctx;
mod dynamic;
-mod error;
+pub mod error;
mod evaluate;
mod function;
mod import;
@@ -21,7 +21,7 @@
pub use ctx::*;
pub use dynamic::*;
-pub use error::*;
+use error::{Error::*, LocError, Result, StackTraceElement};
pub use evaluate::*;
pub use function::parse_function_call;
pub use import::*;
@@ -131,13 +131,7 @@
}
pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {
EVAL_STATE.with(|s| f(s.borrow().as_ref().unwrap()))
-}
-pub fn create_error(err: Error) -> LocError {
- LocError(err, StackTrace(vec![]))
}
-pub fn create_error_result<T>(err: Error) -> Result<T> {
- Err(LocError(err, StackTrace(vec![])))
-}
pub(crate) fn push<T>(
e: &Option<ExprLocation>,
frame_desc: impl FnOnce() -> String,
@@ -167,12 +161,10 @@
loc_data: true,
},
)
- .map_err(|error| {
- create_error(Error::ImportSyntaxError {
- error,
- path,
- source_code,
- })
+ .map_err(|error| ImportSyntaxError {
+ error,
+ path,
+ source_code,
})?,
)?;
@@ -292,7 +284,7 @@
if *stack_depth > self.max_stack() {
// Error creation uses data, so i drop guard here
drop(data);
- return Err(create_error(Error::StackOverflow));
+ throw!(StackOverflow);
} else {
*stack_depth += 1;
}
@@ -340,7 +332,7 @@
ManifestFormat::Json(padding) => val.into_json(padding)?,
ManifestFormat::None => match val {
Val::Str(s) => s,
- _ => return Err(create_error(Error::StringManifestOutputIsNotAString)),
+ _ => throw!(StringManifestOutputIsNotAString),
},
})
})
@@ -476,7 +468,7 @@
#[cfg(test)]
pub mod tests {
use super::Val;
- use crate::{create_error, primitive_equals, EvaluationState};
+ use crate::{error::Error::*, primitive_equals, EvaluationState};
use jrsonnet_parser::*;
use std::{path::PathBuf, rc::Rc};
@@ -493,7 +485,7 @@
state.push(
&ExprLocation(Rc::new(PathBuf::from("test2.jsonnet")), 30, 40),
|| "inner".to_owned(),
- || Err(create_error(crate::error::Error::RuntimeError("".into()))),
+ || Err(RuntimeError("".into()).into()),
)?;
Ok(())
},
crates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -11,11 +11,13 @@
pub location: Option<ExprLocation>,
}
+// Field => This
+type CacheKey = (Rc<str>, usize);
#[derive(Debug)]
pub struct ObjValueInternals {
super_obj: Option<ObjValue>,
this_entries: Rc<HashMap<Rc<str>, ObjMember>>,
- value_cache: RefCell<HashMap<(Rc<str>, usize), Option<Val>>>,
+ value_cache: RefCell<HashMap<CacheKey, Option<Val>>>,
}
#[derive(Clone)]
pub struct ObjValue(pub(crate) Rc<ObjValueInternals>);
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -1,7 +1,8 @@
use crate::{
- create_error_result, evaluate,
+ error::Error::*,
+ evaluate,
function::{parse_function_call, parse_function_call_map, place_args},
- with_state, Context, Error, ObjValue, Result,
+ throw, with_state, Context, ObjValue, Result,
};
use jrsonnet_parser::{el, Arg, ArgsDesc, Expr, LocExpr, ParamsDesc};
use std::{
@@ -157,14 +158,14 @@
if num.is_finite() {
Ok(Val::Num(num))
} else {
- create_error_result(Error::RuntimeError("overflow".into()))
+ throw!(RuntimeError("overflow".into()))
}
}
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_result(Error::TypeMismatch(context, vec![val_type], this_type))
+ throw!(TypeMismatch(context, vec![val_type], this_type))
} else {
Ok(())
}
@@ -263,15 +264,15 @@
(Val::Null, Val::Null) => true,
(Val::Str(a), Val::Str(b)) => a == b,
(Val::Num(a), Val::Num(b)) => (a - b).abs() <= f64::EPSILON,
- (Val::Arr(_), Val::Arr(_)) => create_error_result(Error::RuntimeError(
+ (Val::Arr(_), Val::Arr(_)) => throw!(RuntimeError(
"primitiveEquals operates on primitive types, got array".into(),
- ))?,
- (Val::Obj(_), Val::Obj(_)) => create_error_result(Error::RuntimeError(
+ )),
+ (Val::Obj(_), Val::Obj(_)) => throw!(RuntimeError(
"primitiveEquals operates on primitive types, got object".into(),
- ))?,
- (a, b) if is_function_like(&a) && is_function_like(&b) => create_error_result(
- Error::RuntimeError("cannot test equality of functions".into()),
- )?,
+ )),
+ (a, b) if is_function_like(&a) && is_function_like(&b) => {
+ throw!(RuntimeError("cannot test equality of functions".into()))
+ }
(_, _) => false,
})
}
@@ -376,7 +377,7 @@
buf.push('}');
}
Val::Func(_) | Val::Intristic(_, _) => {
- create_error_result(Error::RuntimeError("tried to manifest function".into()))?
+ throw!(RuntimeError("tried to manifest function".into()))
}
Val::Lazy(_) => unreachable!(),
};
crates/jrsonnet-parser/src/expr.rsdiffbeforeafterboth--- a/crates/jrsonnet-parser/src/expr.rs
+++ b/crates/jrsonnet-parser/src/expr.rs
@@ -258,7 +258,7 @@
/// importStr "file.txt"
ImportStr(PathBuf),
/// error "I'm broken"
- Error(LocExpr),
+ ErrorStmt(LocExpr),
/// a(b, c)
Apply(LocExpr, ArgsDesc, bool),
/// a[b]
crates/jrsonnet-parser/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-parser/src/lib.rs
+++ b/crates/jrsonnet-parser/src/lib.rs
@@ -197,7 +197,7 @@
/ l(s,<keyword("function") _ "(" _ params:params(s) _ ")" _ expr:expr(s) {Expr::Function(params, expr)}>)
/ l(s,<assertion:assertion(s) _ ";" _ expr:expr(s) { Expr::AssertExpr(assertion, expr) }>)
- / l(s,<keyword("error") _ expr:expr(s) { Expr::Error(expr) }>)
+ / l(s,<keyword("error") _ expr:expr(s) { Expr::ErrorStmt(expr) }>)
rule slice_part(s: &ParserSettings) -> Option<LocExpr>
= e:(_ e:expr(s) _{e})? {e}