difftreelog
feat unwrap_type macro
in: master
4 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -205,6 +205,9 @@
[[package]]
name = "jrsonnet-types"
version = "0.3.3"
+dependencies = [
+ "peg",
+]
[[package]]
name = "jsonnet"
crates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -1,8 +1,7 @@
use crate::{
equals,
error::{Error::*, Result},
- evaluate, parse_args, primitive_equals, push, throw,
- typed::CheckType,
+ parse_args, primitive_equals, push, throw,
with_state, ArrValue, Context, FuncVal, LazyVal, Val,
};
use format::{format_arr, format_obj};
crates/jrsonnet-evaluator/src/function.rsdiffbeforeafterboth1use crate::{error::Error::*, evaluate, lazy_val, resolved_lazy_val, throw, Context, Result, Val};2use closure::closure;3use jrsonnet_interner::IStr;4use jrsonnet_parser::{ArgsDesc, ParamsDesc};5use rustc_hash::FxHashMap;6use std::{collections::HashMap, hash::BuildHasherDefault};78const NO_DEFAULT_CONTEXT: &str =9 "no default context set for call with defined default parameter value";1011/// Creates correct [context](Context) for function body evaluation returning error on invalid call.12///13/// ## Parameters14/// * `ctx`: used for passed argument expressions' execution and for body execution (if `body_ctx` is not set)15/// * `body_ctx`: used for default parameter values' execution and for body execution (if set)16/// * `params`: function parameters' definition17/// * `args`: passed function arguments18/// * `tailstrict`: if set to `true` function arguments are eagerly executed, otherwise - lazily19pub fn parse_function_call(20 ctx: Context,21 body_ctx: Option<Context>,22 params: &ParamsDesc,23 args: &ArgsDesc,24 tailstrict: bool,25) -> Result<Context> {26 let mut out = HashMap::with_capacity_and_hasher(params.len(), BuildHasherDefault::default());27 let mut positioned_args = vec![None; params.0.len()];28 for (id, arg) in args.iter().enumerate() {29 let idx = if let Some(name) = &arg.0 {30 params31 .iter()32 .position(|p| *p.0 == *name)33 .ok_or_else(|| UnknownFunctionParameter(name.clone()))?34 } else {35 id36 };3738 if idx >= params.len() {39 throw!(TooManyArgsFunctionHas(params.len()));40 }41 if positioned_args[idx].is_some() {42 throw!(BindingParameterASecondTime(params[idx].0.clone()));43 }44 positioned_args[idx] = Some(arg.1.clone());45 }46 // Fill defaults47 for (id, p) in params.iter().enumerate() {48 let (ctx, expr) = if let Some(arg) = &positioned_args[id] {49 (ctx.clone(), arg)50 } else if let Some(default) = &p.1 {51 (body_ctx.clone().expect(NO_DEFAULT_CONTEXT), default)52 } else {53 throw!(FunctionParameterNotBoundInCall(p.0.clone()));54 };55 let val = if tailstrict {56 resolved_lazy_val!(evaluate(ctx, expr)?)57 } else {58 lazy_val!(closure!(clone ctx, clone expr, ||evaluate(ctx.clone(), &expr)))59 };60 out.insert(p.0.clone(), val);61 }6263 Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None))64}6566pub fn parse_function_call_map(67 ctx: Context,68 body_ctx: Option<Context>,69 params: &ParamsDesc,70 args: &HashMap<IStr, Val>,71 tailstrict: bool,72) -> Result<Context> {73 let mut out = FxHashMap::with_capacity_and_hasher(params.len(), BuildHasherDefault::default());74 let mut positioned_args = vec![None; params.0.len()];75 for (name, val) in args.iter() {76 let idx = params77 .iter()78 .position(|p| *p.0 == **name)79 .ok_or_else(|| UnknownFunctionParameter((name as &str).to_owned()))?;8081 if idx >= params.len() {82 throw!(TooManyArgsFunctionHas(params.len()));83 }84 if positioned_args[idx].is_some() {85 throw!(BindingParameterASecondTime(params[idx].0.clone()));86 }87 positioned_args[idx] = Some(val.clone());88 }89 // Fill defaults90 for (id, p) in params.iter().enumerate() {91 let val = if let Some(arg) = positioned_args[id].take() {92 resolved_lazy_val!(arg)93 } else if let Some(default) = &p.1 {94 if tailstrict {95 resolved_lazy_val!(evaluate(96 body_ctx.clone().expect(NO_DEFAULT_CONTEXT),97 default98 )?)99 } else {100 let body_ctx = body_ctx.clone();101 let default = default.clone();102 lazy_val!(move || {103 evaluate(body_ctx.clone().expect(NO_DEFAULT_CONTEXT), &default)104 })105 }106 } else {107 throw!(FunctionParameterNotBoundInCall(p.0.clone()));108 };109 out.insert(p.0.clone(), val);110 }111112 Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None))113}114115pub fn place_args(116 ctx: Context,117 body_ctx: Option<Context>,118 params: &ParamsDesc,119 args: &[Val],120) -> Result<Context> {121 let mut out = FxHashMap::with_capacity_and_hasher(params.len(), BuildHasherDefault::default());122 let mut positioned_args = vec![None; params.0.len()];123 for (id, arg) in args.iter().enumerate() {124 if id >= params.len() {125 throw!(TooManyArgsFunctionHas(params.len()));126 }127 positioned_args[id] = Some(arg);128 }129 // Fill defaults130 for (id, p) in params.iter().enumerate() {131 let val = if let Some(arg) = &positioned_args[id] {132 (*arg).clone()133 } else if let Some(default) = &p.1 {134 evaluate(ctx.clone(), default)?135 } else {136 throw!(FunctionParameterNotBoundInCall(p.0.clone()));137 };138 out.insert(p.0.clone(), resolved_lazy_val!(val));139 }140141 Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None))142}143144#[macro_export]145macro_rules! parse_args {146 ($ctx: expr, $fn_name: expr, $args: expr, $total_args: expr, [147 $($id: expr, $name: ident: $ty: expr $(=>$match: path)?);+ $(;)?148 ], $handler:block) => {{149 let args = $args;150 if args.len() > $total_args {151 throw!(TooManyArgsFunctionHas($total_args));152 }153 $(154 if args.len() <= $id {155 throw!(FunctionParameterNotBoundInCall(stringify!($name).into()));156 }157 let $name = &args[$id];158 if $name.0.is_some() {159 if $name.0.as_ref().unwrap() != stringify!($name) {160 throw!(IntrinsicArgumentReorderingIsNotSupportedYet);161 }162 }163 let $name = push(None, || format!("evaluating argument"), || {164 let value = evaluate($ctx.clone(), &$name.1)?;165 $ty.check(&value)?;166 Ok(value)167 })?;168 $(169 let $name = if let $match(v) = $name {170 v171 } else {172 unreachable!();173 };174 )?175 )+176 ($handler as crate::Result<_>)177 }};178}crates/jrsonnet-evaluator/src/typed.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/typed.rs
+++ b/crates/jrsonnet-evaluator/src/typed.rs
@@ -8,6 +8,18 @@
use jrsonnet_types::{ComplexValType, ValType};
use thiserror::Error;
+#[macro_export]
+macro_rules! unwrap_type {
+ ($desc: expr, $value: expr, $typ: expr => $match: path) => {{
+ use $crate::{push, typed::CheckType};
+ push(None, $desc, || Ok($typ.check(&$value)?))?;
+ match $value {
+ $match(v) => v,
+ _ => unreachable!(),
+ }
+ }}
+}
+
#[derive(Debug, Error, Clone)]
pub enum TypeError {
#[error("expected {0}, got {1}")]