git.delta.rocks / jrsonnet / refs/commits / b14023b0be60

difftreelog

feat argument map function call

Лач2020-07-19parent: #be66091.patch.diff
in: master

2 files changed

modifiedcrates/jrsonnet-evaluator/src/function.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/function.rs
1use crate::{2	create_error, create_error_result, evaluate, lazy_val, resolved_lazy_val, Context, Error,3	Result, Val,4};5use closure::closure;6use jrsonnet_parser::{ArgsDesc, ParamsDesc};7use std::collections::HashMap;89/// Creates correct [context](Context) for function body evaluation, returning error on invalid call10///11/// * `ctx` used for passed argument expressions execution, and for body execution (if `body_ctx` is not set)12/// * `body_ctx` used for default parameter values execution, and for body execution (if set)13/// * `params` function parameters definition14/// * `args` passed function arguments15/// * `tailstruct` if true - function arguments is eager executed, otherwise - lazy16pub fn parse_function_call(17	ctx: Context,18	body_ctx: Option<Context>,19	params: &ParamsDesc,20	args: &ArgsDesc,21	tailstrict: bool,22) -> Result<Context> {23	let mut out = HashMap::new();24	let mut positioned_args = vec![None; params.0.len()];25	for (id, arg) in args.iter().enumerate() {26		let idx = if let Some(name) = &arg.0 {27			params28				.iter()29				.position(|p| *p.0 == *name)30				.ok_or_else(|| create_error(Error::UnknownFunctionParameter(name.clone())))?31		} else {32			id33		};3435		if idx >= params.len() {36			create_error_result(Error::TooManyArgsFunctionHas(params.len()))?;37		}38		if positioned_args[idx].is_some() {39			create_error_result(Error::BindingParameterASecondTime(params[idx].0.clone()))?;40		}41		positioned_args[idx] = Some(arg.1.clone());42	}43	// Fill defaults44	for (id, p) in params.iter().enumerate() {45		let (ctx, expr) = if let Some(arg) = &positioned_args[id] {46			(ctx.clone(), arg)47		} else if let Some(default) = &p.1 {48			(49				body_ctx50					.clone()51					.expect("no default context set for call with defined default parameter value"),52				default,53			)54		} else {55			create_error_result(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;56			unreachable!()57		};58		let val = if tailstrict {59			resolved_lazy_val!(evaluate(ctx, expr)?)60		} else {61			lazy_val!(closure!(clone ctx, clone expr, ||evaluate(ctx.clone(), &expr)))62		};63		out.insert(p.0.clone(), val);64	}6566	Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None)?)67}6869pub(crate) fn place_args(70	ctx: Context,71	body_ctx: Option<Context>,72	params: &ParamsDesc,73	args: &[Val],74) -> Result<Context> {75	let mut out = HashMap::new();76	let mut positioned_args = vec![None; params.0.len()];77	for (id, arg) in args.iter().enumerate() {78		if id >= params.len() {79			create_error_result(Error::TooManyArgsFunctionHas(params.len()))?;80		}81		positioned_args[id] = Some(arg);82	}83	// Fill defaults84	for (id, p) in params.iter().enumerate() {85		let val = if let Some(arg) = &positioned_args[id] {86			(*arg).clone()87		} else if let Some(default) = &p.1 {88			evaluate(ctx.clone(), default)?89		} else {90			create_error_result(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;91			unreachable!()92		};93		out.insert(p.0.clone(), resolved_lazy_val!(val));94	}9596	Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None)?)97}9899#[macro_export]100macro_rules! parse_args {101	($ctx: expr, $fn_name: expr, $args: expr, $total_args: expr, [102		$($id: expr, $name: ident $(: [$($p: path)|+] $(!! $a: path)?)?, $nt: expr);+ $(;)?103	], $handler:block) => {{104		use crate::Error;105		let args = $args;106		if args.len() > $total_args {107			create_error_result(Error::TooManyArgsFunctionHas($total_args))?;108		}109		$(110			if args.len() <= $id {111				create_error_result(Error::FunctionParameterNotBoundInCall(stringify!($name).into()))?;112			}113			let $name = &args[$id];114			if $name.0.is_some() {115				if $name.0.as_ref().unwrap() != stringify!($name) {116					create_error_result(Error::IntristicArgumentReorderingIsNotSupportedYet)?;117				}118			}119			let $name = evaluate($ctx.clone(), &$name.1)?;120			$(121				match $name {122					$($p(_))|+ => {},123					_ => create_error_result(Error::TypeMismatch(concat!($fn_name, " ", stringify!($id), "nd argument"), $nt, $name.value_type()?))?,124				};125				$(126					let $name = match $name {127						$a(v) => v,128						_ => create_error_result(Error::TypeMismatch(concat!($fn_name, " ", stringify!($id), "nd argument"), $nt, $name.value_type()?))?,129					};130				)*131			)*132		)+133		$handler134	}};135}136137#[test]138fn test() -> Result<()> {139	use crate::val::ValType;140	use jrsonnet_parser::*;141	let state = crate::EvaluationState::default();142	let evaluator = state.with_stdlib();143	let ctx = evaluator.create_default_context()?;144	evaluator.run_in_state(|| {145		parse_args!(ctx, "test", ArgsDesc(vec![146			Arg(None, el!(Expr::Num(2.0))),147			Arg(Some("b".into()), el!(Expr::Num(1.0))),148		]), 2, [149			0, a: [Val::Num]!!Val::Num, vec![ValType::Num];150			1, b: [Val::Num]!!Val::Num, vec![ValType::Num];151		], {152			assert!((a - 2.0).abs() <= f64::EPSILON);153			assert!((b - 1.0).abs() <= f64::EPSILON);154		});155		Ok(())156	})157}
after · crates/jrsonnet-evaluator/src/function.rs
1use crate::{2	create_error, create_error_result, evaluate, lazy_val, resolved_lazy_val, Context, Error,3	Result, Val,4};5use closure::closure;6use jrsonnet_parser::{ArgsDesc, ParamsDesc};7use std::{collections::HashMap, rc::Rc};89const NO_DEFAULT_CONTEXT: &str =10	"no default context set for call with defined default parameter value";1112/// Creates correct [context](Context) for function body evaluation, returning error on invalid call13///14/// * `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/// * `tailstruct` if true - function arguments is eager executed, otherwise - lazy19pub 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::new();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(|| create_error(Error::UnknownFunctionParameter(name.clone())))?34		} else {35			id36		};3738		if idx >= params.len() {39			create_error_result(Error::TooManyArgsFunctionHas(params.len()))?;40		}41		if positioned_args[idx].is_some() {42			create_error_result(Error::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			create_error_result(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 fn parse_function_call_map(68	ctx: Context,69	body_ctx: Option<Context>,70	params: &ParamsDesc,71	args: &HashMap<Rc<str>, Val>,72	tailstrict: bool,73) -> Result<Context> {74	let mut out = HashMap::new();75	let mut positioned_args = vec![None; params.0.len()];76	for (name, val) in args.iter() {77		let idx = params.iter().position(|p| *p.0 == **name).ok_or_else(|| {78			create_error(Error::UnknownFunctionParameter((&name as &str).to_owned()))79		})?;8081		if idx >= params.len() {82			create_error_result(Error::TooManyArgsFunctionHas(params.len()))?;83		}84		if positioned_args[idx].is_some() {85			create_error_result(Error::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			create_error_result(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;108			unreachable!()109		};110		out.insert(p.0.clone(), val);111	}112113	Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None)?)114}115116pub(crate) fn place_args(117	ctx: Context,118	body_ctx: Option<Context>,119	params: &ParamsDesc,120	args: &[Val],121) -> Result<Context> {122	let mut out = HashMap::new();123	let mut positioned_args = vec![None; params.0.len()];124	for (id, arg) in args.iter().enumerate() {125		if id >= params.len() {126			create_error_result(Error::TooManyArgsFunctionHas(params.len()))?;127		}128		positioned_args[id] = Some(arg);129	}130	// Fill defaults131	for (id, p) in params.iter().enumerate() {132		let val = if let Some(arg) = &positioned_args[id] {133			(*arg).clone()134		} else if let Some(default) = &p.1 {135			evaluate(ctx.clone(), default)?136		} else {137			create_error_result(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;138			unreachable!()139		};140		out.insert(p.0.clone(), resolved_lazy_val!(val));141	}142143	Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None)?)144}145146#[macro_export]147macro_rules! parse_args {148	($ctx: expr, $fn_name: expr, $args: expr, $total_args: expr, [149		$($id: expr, $name: ident $(: [$($p: path)|+] $(!! $a: path)?)?, $nt: expr);+ $(;)?150	], $handler:block) => {{151		use crate::Error;152		let args = $args;153		if args.len() > $total_args {154			create_error_result(Error::TooManyArgsFunctionHas($total_args))?;155		}156		$(157			if args.len() <= $id {158				create_error_result(Error::FunctionParameterNotBoundInCall(stringify!($name).into()))?;159			}160			let $name = &args[$id];161			if $name.0.is_some() {162				if $name.0.as_ref().unwrap() != stringify!($name) {163					create_error_result(Error::IntristicArgumentReorderingIsNotSupportedYet)?;164				}165			}166			let $name = evaluate($ctx.clone(), &$name.1)?;167			$(168				match $name {169					$($p(_))|+ => {},170					_ => create_error_result(Error::TypeMismatch(concat!($fn_name, " ", stringify!($id), "nd argument"), $nt, $name.value_type()?))?,171				};172				$(173					let $name = match $name {174						$a(v) => v,175						_ => create_error_result(Error::TypeMismatch(concat!($fn_name, " ", stringify!($id), "nd argument"), $nt, $name.value_type()?))?,176					};177				)*178			)*179		)+180		$handler181	}};182}183184#[test]185fn test() -> Result<()> {186	use crate::val::ValType;187	use jrsonnet_parser::*;188	let state = crate::EvaluationState::default();189	let evaluator = state.with_stdlib();190	let ctx = evaluator.create_default_context()?;191	evaluator.run_in_state(|| {192		parse_args!(ctx, "test", ArgsDesc(vec![193			Arg(None, el!(Expr::Num(2.0))),194			Arg(Some("b".into()), el!(Expr::Num(1.0))),195		]), 2, [196			0, a: [Val::Num]!!Val::Num, vec![ValType::Num];197			1, b: [Val::Num]!!Val::Num, vec![ValType::Num];198		], {199			assert!((a - 2.0).abs() <= f64::EPSILON);200			assert!((b - 1.0).abs() <= f64::EPSILON);201		});202		Ok(())203	})204}
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -1,11 +1,12 @@
 use crate::{
 	create_error_result, evaluate,
-	function::{parse_function_call, place_args},
+	function::{parse_function_call, parse_function_call_map, place_args},
 	with_state, Context, Error, ObjValue, Result,
 };
 use jrsonnet_parser::{el, Arg, ArgsDesc, Expr, LocExpr, ParamsDesc};
 use std::{
 	cell::RefCell,
+	collections::HashMap,
 	fmt::{Debug, Display},
 	rc::Rc,
 };
@@ -76,6 +77,22 @@
 		evaluate(ctx, &self.body)
 	}
 
+	pub fn evaluate_map(
+		&self,
+		call_ctx: Context,
+		args: &HashMap<Rc<str>, Val>,
+		tailstrict: bool,
+	) -> Result<Val> {
+		let ctx = parse_function_call_map(
+			call_ctx,
+			Some(self.ctx.clone()),
+			&self.params,
+			args,
+			tailstrict,
+		)?;
+		evaluate(ctx, &self.body)
+	}
+
 	pub fn evaluate_values(&self, call_ctx: Context, args: &[Val]) -> Result<Val> {
 		let ctx = place_args(call_ctx, Some(self.ctx.clone()), &self.params, args)?;
 		evaluate(ctx, &self.body)