difftreelog
refactor(evaluator) remove inline variant of argument parsing
in: master
2 files changed
crates/jsonnet-evaluator/src/function.rsdiffbeforeafterboth1use crate::{create_error, evaluate, lazy_val, resolved_lazy_val, Context, Error, Result, Val};2use closure::closure;3use jsonnet_parser::{ArgsDesc, ParamsDesc};4use std::collections::HashMap;56/// Creates correct [context](Context) for function body evaluation, returning error on invalid call7///8/// * `ctx` used for passed argument expressions execution, and for body execution (if `body_ctx` is not set)9/// * `body_ctx` used for default parameter values execution, and for body execution (if set)10/// * `params` function parameters definition11/// * `args` passed function arguments12/// * `tailstruct` if true - function arguments is eager executed, otherwise - lazy13pub fn parse_function_call(14 ctx: Context,15 body_ctx: Option<Context>,16 params: &ParamsDesc,17 args: &ArgsDesc,18 tailstrict: bool,19) -> Result<Context> {20 inline_parse_function_call(ctx, body_ctx, params, args, tailstrict)21}2223/// See [parse_function_call](parse_function_call)24///25/// ## Notes26/// This function is always inlined for tailstrict27pub(crate) fn inline_parse_function_call(28 ctx: Context,29 body_ctx: Option<Context>,30 params: &ParamsDesc,31 args: &ArgsDesc,32 tailstrict: bool,33) -> Result<Context> {34 let mut out = HashMap::new();35 let mut positioned_args = vec![None; params.0.len()];36 for (id, arg) in args.iter().enumerate() {37 let idx = if let Some(name) = &arg.0 {38 params.iter().position(|p| *p.0 == *name).ok_or_else(|| {39 create_error::<()>(Error::UnknownFunctionParameter(name.clone()))40 .err()41 .unwrap()42 })?43 } else {44 id45 };4647 if idx >= params.len() {48 create_error(Error::TooManyArgsFunctionHas(params.len()))?;49 }50 if positioned_args[idx].is_some() {51 create_error(Error::BindingParameterASecondTime(params[idx].0.clone()))?;52 }53 positioned_args[idx] = Some(arg.1.clone());54 }55 // Fill defaults56 for (id, p) in params.iter().enumerate() {57 let (ctx, expr) = if let Some(arg) = &positioned_args[id] {58 (ctx.clone(), arg)59 } else if let Some(default) = &p.1 {60 (61 body_ctx62 .clone()63 .expect("no default context set for call with defined default parameter value"),64 default,65 )66 } else {67 create_error(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;68 unreachable!()69 };70 let val = if tailstrict {71 resolved_lazy_val!(evaluate(ctx, expr)?)72 } else {73 lazy_val!(closure!(clone ctx, clone expr, ||evaluate(ctx.clone(), &expr)))74 };75 out.insert(p.0.clone(), val);76 }7778 Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None)?)79}8081pub(crate) fn place_args(82 ctx: Context,83 body_ctx: Option<Context>,84 params: &ParamsDesc,85 args: &[Val],86) -> Result<Context> {87 let mut out = HashMap::new();88 let mut positioned_args = vec![None; params.0.len()];89 for (id, arg) in args.iter().enumerate() {90 if id >= params.len() {91 create_error(Error::TooManyArgsFunctionHas(params.len()))?;92 }93 positioned_args[id] = Some(arg);94 }95 // Fill defaults96 for (id, p) in params.iter().enumerate() {97 let val = if let Some(arg) = &positioned_args[id] {98 (*arg).clone()99 } else if let Some(default) = &p.1 {100 evaluate(ctx.clone(), default)?101 } else {102 create_error(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;103 unreachable!()104 };105 out.insert(p.0.clone(), resolved_lazy_val!(val));106 }107108 Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None)?)109}1use crate::{create_error, evaluate, lazy_val, resolved_lazy_val, Context, Error, Result, Val};2use closure::closure;3use jsonnet_parser::{ArgsDesc, ParamsDesc};4use std::collections::HashMap;56/// Creates correct [context](Context) for function body evaluation, returning error on invalid call7///8/// * `ctx` used for passed argument expressions execution, and for body execution (if `body_ctx` is not set)9/// * `body_ctx` used for default parameter values execution, and for body execution (if set)10/// * `params` function parameters definition11/// * `args` passed function arguments12/// * `tailstruct` if true - function arguments is eager executed, otherwise - lazy13pub fn parse_function_call(14 ctx: Context,15 body_ctx: Option<Context>,16 params: &ParamsDesc,17 args: &ArgsDesc,18 tailstrict: bool,19) -> Result<Context> {20 let mut out = HashMap::new();21 let mut positioned_args = vec![None; params.0.len()];22 for (id, arg) in args.iter().enumerate() {23 let idx = if let Some(name) = &arg.0 {24 params.iter().position(|p| *p.0 == *name).ok_or_else(|| {25 create_error::<()>(Error::UnknownFunctionParameter(name.clone()))26 .err()27 .unwrap()28 })?29 } else {30 id31 };3233 if idx >= params.len() {34 create_error(Error::TooManyArgsFunctionHas(params.len()))?;35 }36 if positioned_args[idx].is_some() {37 create_error(Error::BindingParameterASecondTime(params[idx].0.clone()))?;38 }39 positioned_args[idx] = Some(arg.1.clone());40 }41 // Fill defaults42 for (id, p) in params.iter().enumerate() {43 let (ctx, expr) = if let Some(arg) = &positioned_args[id] {44 (ctx.clone(), arg)45 } else if let Some(default) = &p.1 {46 (47 body_ctx48 .clone()49 .expect("no default context set for call with defined default parameter value"),50 default,51 )52 } else {53 create_error(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;54 unreachable!()55 };56 let val = if tailstrict {57 resolved_lazy_val!(evaluate(ctx, expr)?)58 } else {59 lazy_val!(closure!(clone ctx, clone expr, ||evaluate(ctx.clone(), &expr)))60 };61 out.insert(p.0.clone(), val);62 }6364 Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None)?)65}6667pub(crate) fn place_args(68 ctx: Context,69 body_ctx: Option<Context>,70 params: &ParamsDesc,71 args: &[Val],72) -> Result<Context> {73 let mut out = HashMap::new();74 let mut positioned_args = vec![None; params.0.len()];75 for (id, arg) in args.iter().enumerate() {76 if id >= params.len() {77 create_error(Error::TooManyArgsFunctionHas(params.len()))?;78 }79 positioned_args[id] = Some(arg);80 }81 // Fill defaults82 for (id, p) in params.iter().enumerate() {83 let val = if let Some(arg) = &positioned_args[id] {84 (*arg).clone()85 } else if let Some(default) = &p.1 {86 evaluate(ctx.clone(), default)?87 } else {88 create_error(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;89 unreachable!()90 };91 out.insert(p.0.clone(), resolved_lazy_val!(val));92 }9394 Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None)?)95}crates/jsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/val.rs
+++ b/crates/jsonnet-evaluator/src/val.rs
@@ -1,6 +1,6 @@
use crate::{
create_error, evaluate,
- function::{inline_parse_function_call, place_args},
+ function::{parse_function_call, place_args},
Context, Error, ObjValue, Result,
};
use jsonnet_parser::{ArgsDesc, LocExpr, ParamsDesc};
@@ -65,7 +65,7 @@
impl FuncDesc {
/// This function is always inlined to make tailstrict work
pub fn evaluate(&self, call_ctx: Context, args: &ArgsDesc, tailstrict: bool) -> Result<Val> {
- let ctx = inline_parse_function_call(
+ let ctx = parse_function_call(
call_ctx,
Some(self.ctx.clone()),
&self.params,