git.delta.rocks / jrsonnet / refs/commits / 6db420cedf84

difftreelog

refactor(evaluator) remove inline variant of argument parsing

Лач2020-06-26parent: #9e9c937.patch.diff
in: master

2 files changed

modifiedcrates/jsonnet-evaluator/src/function.rsdiffbeforeafterboth
16 params: &ParamsDesc,16 params: &ParamsDesc,
17 args: &ArgsDesc,17 args: &ArgsDesc,
18 tailstrict: bool,18 tailstrict: bool,
19) -> Result<Context> {19) -> Result<Context> {
20 inline_parse_function_call(ctx, body_ctx, params, args, tailstrict)
21}
22
23/// See [parse_function_call](parse_function_call)
24///
25/// ## Notes
26/// This function is always inlined for tailstrict
27pub(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();20 let mut out = HashMap::new();
35 let mut positioned_args = vec![None; params.0.len()];21 let mut positioned_args = vec![None; params.0.len()];
36 for (id, arg) in args.iter().enumerate() {22 for (id, arg) in args.iter().enumerate() {
modifiedcrates/jsonnet-evaluator/src/val.rsdiffbeforeafterboth
1use crate::{1use crate::{
2 create_error, evaluate,2 create_error, evaluate,
3 function::{inline_parse_function_call, place_args},3 function::{parse_function_call, place_args},
4 Context, Error, ObjValue, Result,4 Context, Error, ObjValue, Result,
5};5};
6use jsonnet_parser::{ArgsDesc, LocExpr, ParamsDesc};6use jsonnet_parser::{ArgsDesc, LocExpr, ParamsDesc};
65impl FuncDesc {65impl FuncDesc {
66 /// This function is always inlined to make tailstrict work66 /// This function is always inlined to make tailstrict work
67 pub fn evaluate(&self, call_ctx: Context, args: &ArgsDesc, tailstrict: bool) -> Result<Val> {67 pub fn evaluate(&self, call_ctx: Context, args: &ArgsDesc, tailstrict: bool) -> Result<Val> {
68 let ctx = inline_parse_function_call(68 let ctx = parse_function_call(
69 call_ctx,69 call_ctx,
70 Some(self.ctx.clone()),70 Some(self.ctx.clone()),
71 &self.params,71 &self.params,