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

difftreelog

feat std.extVar support

Лач2020-06-10parent: #7420435.patch.diff
in: master

4 files changed

modifiedcmds/jrsonnet/src/main.rsdiffbeforeafterboth
--- a/cmds/jrsonnet/src/main.rs
+++ b/cmds/jrsonnet/src/main.rs
@@ -42,19 +42,42 @@
 	}
 }
 
+#[derive(Clone)]
+struct ExtStr {
+	name: String,
+	value: String,
+}
+impl FromStr for ExtStr {
+	type Err = &'static str;
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		let out: Vec<_> = s.split('=').collect();
+		match out.len() {
+			1 => Ok(ExtStr {
+				name: out[0].to_owned(),
+				value: std::env::var(out[0]).or(Err("missing env var"))?,
+			}),
+			2 => Ok(ExtStr {
+				name: out[0].to_owned(),
+				value: out[1].to_owned(),
+			}),
+			_ => Err("bad ext-str syntax"),
+		}
+	}
+}
+
 #[derive(Clap)]
 #[clap(version = "0.1.0", author = "Lach <iam@lach.pw>")]
 struct Opts {
 	#[clap(long, about = "Disable global std variable")]
 	no_stdlib: bool,
 	#[clap(long, about = "Add external string")]
-	ext_str: Option<Vec<String>>,
+	ext_str: Vec<ExtStr>,
 	#[clap(long, about = "Add external string from code")]
-	ext_code: Option<Vec<String>>,
+	ext_code: Vec<ExtStr>,
 	#[clap(long, about = "Add TLA")]
-	tla_str: Option<Vec<String>>,
+	tla_str: Vec<ExtStr>,
 	#[clap(long, about = "Add TLA from code")]
-	tla_code: Option<Vec<String>>,
+	tla_code: Vec<ExtStr>,
 	#[clap(long, short = "f", default_value = "json", possible_values = &["none", "json", "yaml"], about = "Output format, wraps resulting value to corresponding std.manifest call")]
 	format: Format,
 	#[clap(long, default_value = "default", possible_values = &["cpp", "go", "default"], about = "Emulated needed stacktrace display")]
@@ -92,6 +115,12 @@
 	if !opts.no_stdlib {
 		evaluator.with_stdlib();
 	}
+	for ExtStr { name, value } in opts.ext_str.iter().cloned() {
+		evaluator.add_ext_var(name, Val::Str(value));
+	}
+	for ExtStr { name, value } in opts.ext_code.iter().cloned() {
+		evaluator.add_ext_var(name, evaluator.parse_evaluate_raw(&value).unwrap());
+	}
 	let mut input = current_dir().unwrap();
 	input.push(opts.input.clone());
 	let code_string = String::from_utf8(std::fs::read(opts.input.clone()).unwrap()).unwrap();
modifiedcrates/jsonnet-evaluator/src/error.rsdiffbeforeafterboth
--- a/crates/jsonnet-evaluator/src/error.rs
+++ b/crates/jsonnet-evaluator/src/error.rs
@@ -12,6 +12,8 @@
 	TooManyArgsFunctionHas(usize),
 	FunctionParameterNotBoundInCall(String),
 
+	UndefinedExternalVariable(String),
+
 	RuntimeError(String),
 	StackOverflow,
 	FractionalIndex,
modifiedcrates/jsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth
before · crates/jsonnet-evaluator/src/evaluate.rs
1use crate::{2	binding, context_creator, create_error, future_wrapper, lazy_val, push, Context,3	ContextCreator, FuncDesc, LazyBinding, ObjMember, ObjValue, Result, Val,4};5use closure::closure;6use jsonnet_parser::{7	el, Arg, ArgsDesc, AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, FieldMember,8	ForSpecData, IfSpecData, LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType,9	Visibility,10};11use std::{12	collections::{BTreeMap, HashMap},13	rc::Rc,14};1516pub fn evaluate_binding(b: &BindSpec, context_creator: ContextCreator) -> (String, 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						params.clone(),27						b.value.clone(),28					)))29				))30			})),31		)32	} else {33		(34			b.name.clone(),35			LazyBinding::Bindable(Rc::new(move |this, super_obj| {36				Ok(lazy_val!(closure!(clone context_creator, clone b, ||37					push(b.value.clone(), "thunk".to_owned(), ||{38						evaluate(39							context_creator.0(this.clone(), super_obj.clone())?,40							&b.value41						)42					})43				)))44			})),45		)46	}47}4849pub fn evaluate_method(ctx: Context, params: ParamsDesc, body: LocExpr) -> Val {50	Val::Func(FuncDesc { ctx, params, body })51}5253pub fn evaluate_field_name(54	context: Context,55	field_name: &jsonnet_parser::FieldName,56) -> Result<Option<String>> {57	Ok(match field_name {58		jsonnet_parser::FieldName::Fixed(n) => Some(n.clone()),59		jsonnet_parser::FieldName::Dyn(expr) => {60			let value = evaluate(context, expr)?.unwrap_if_lazy()?;61			if matches!(value, Val::Null) {62				None63			} else {64				Some(value.try_cast_str("dynamic field name")?)65			}66		}67	})68}6970pub fn evaluate_unary_op(op: UnaryOpType, b: &Val) -> Result<Val> {71	Ok(match (op, b) {72		(o, Val::Lazy(l)) => evaluate_unary_op(o, &l.evaluate()?)?,73		(UnaryOpType::Not, Val::Bool(v)) => Val::Bool(!v),74		(UnaryOpType::Minus, Val::Num(n)) => Val::Num(-*n),75		(UnaryOpType::BitNot, Val::Num(n)) => Val::Num(!(*n as i32) as f64),76		(op, o) => panic!("unary op not implemented: {:?} {:?}", op, o),77	})78}7980pub(crate) fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {81	Ok(match (a, b) {82		(Val::Str(v1), Val::Str(v2)) => Val::Str(v1.to_owned() + &v2),8384		(Val::Str(v1), Val::Num(v2)) => Val::Str(format!("{}{}", v1, v2)),85		(Val::Num(v1), Val::Str(v2)) => Val::Str(format!("{}{}", v1, v2)),86		(Val::Str(v1), Val::Bool(v2)) => Val::Str(format!("{}{}", v1, v2)),87		(Val::Bool(v1), Val::Str(v2)) => Val::Str(format!("{}{}", v1, v2)),88		(Val::Str(v1), Val::Null) => Val::Str(format!("{}null", v1)),89		(Val::Null, Val::Str(v2)) => Val::Str(format!("null{}", v2)),9091		(Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),92		(Val::Arr(a), Val::Arr(b)) => Val::Arr([&a[..], &b[..]].concat()),93		(Val::Num(v1), Val::Num(v2)) => Val::Num(v1 + v2),94		_ => panic!("can't add: {:?} and {:?}", a, b),95	})96}9798pub fn evaluate_binary_op_special(99	context: Context,100	a: &LocExpr,101	op: BinaryOpType,102	b: &LocExpr,103) -> Result<Val> {104	Ok(105		match (evaluate(context.clone(), &a)?.unwrap_if_lazy()?, op, b) {106			(Val::Bool(true), BinaryOpType::Or, _o) => Val::Bool(true),107			(Val::Bool(false), BinaryOpType::And, _o) => Val::Bool(false),108			(a, op, eb) => {109				evaluate_binary_op_normal(&a, op, &evaluate(context, eb)?.unwrap_if_lazy()?)?110			}111		},112	)113}114115pub fn evaluate_binary_op_normal(a: &Val, op: BinaryOpType, b: &Val) -> Result<Val> {116	Ok(match (a, op, b) {117		(a, BinaryOpType::Add, b) => evaluate_add_op(a, b)?,118119		(Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize)),120121		// Bool X Bool122		(Val::Bool(a), BinaryOpType::And, Val::Bool(b)) => Val::Bool(*a && *b),123		(Val::Bool(a), BinaryOpType::Or, Val::Bool(b)) => Val::Bool(*a || *b),124125		// Str X Str126		(Val::Str(v1), BinaryOpType::Lt, Val::Str(v2)) => Val::Bool(v1 < v2),127		(Val::Str(v1), BinaryOpType::Gt, Val::Str(v2)) => Val::Bool(v1 > v2),128		(Val::Str(v1), BinaryOpType::Lte, Val::Str(v2)) => Val::Bool(v1 <= v2),129		(Val::Str(v1), BinaryOpType::Gte, Val::Str(v2)) => Val::Bool(v1 >= v2),130131		// Num X Num132		(Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),133		(Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => {134			if *v2 <= f64::EPSILON {135				create_error(crate::Error::DivisionByZero)?136			}137			Val::Num(v1 / v2)138		}139140		(Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::Num(v1 - v2),141142		(Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => Val::Bool(v1 < v2),143		(Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => Val::Bool(v1 > v2),144		(Val::Num(v1), BinaryOpType::Lte, Val::Num(v2)) => Val::Bool(v1 <= v2),145		(Val::Num(v1), BinaryOpType::Gte, Val::Num(v2)) => Val::Bool(v1 >= v2),146147		(Val::Num(v1), BinaryOpType::BitAnd, Val::Num(v2)) => {148			Val::Num(((*v1 as i32) & (*v2 as i32)) as f64)149		}150		(Val::Num(v1), BinaryOpType::BitOr, Val::Num(v2)) => {151			Val::Num(((*v1 as i32) | (*v2 as i32)) as f64)152		}153		(Val::Num(v1), BinaryOpType::BitXor, Val::Num(v2)) => {154			Val::Num(((*v1 as i32) ^ (*v2 as i32)) as f64)155		}156		(Val::Num(v1), BinaryOpType::Lhs, Val::Num(v2)) => {157			Val::Num(((*v1 as i32) << (*v2 as i32)) as f64)158		}159		(Val::Num(v1), BinaryOpType::Rhs, Val::Num(v2)) => {160			Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)161		}162163		_ => panic!("no rules for binary operation: {:?} {:?} {:?}", a, op, b),164	})165}166167future_wrapper!(HashMap<String, LazyBinding>, FutureNewBindings);168future_wrapper!(ObjValue, FutureObjValue);169170pub fn evaluate_comp(171	context: Context,172	value: &LocExpr,173	specs: &[CompSpec],174) -> Result<Option<Vec<Val>>> {175	Ok(match specs.get(0) {176		None => Some(vec![evaluate(context, &value)?]),177		Some(CompSpec::IfSpec(IfSpecData(cond))) => {178			if evaluate(context.clone(), &cond)?.try_cast_bool("if spec")? {179				evaluate_comp(context, value, &specs[1..])?180			} else {181				None182			}183		}184		Some(CompSpec::ForSpec(ForSpecData(var, expr))) => {185			match evaluate(context.clone(), &expr)?.unwrap_if_lazy()? {186				Val::Arr(list) => {187					let mut out = Vec::new();188					for item in list {189						let item = item.clone().unwrap_if_lazy()?;190						out.push(evaluate_comp(191							context.with_var(var.clone(), item)?,192							value,193							&specs[1..],194						)?);195					}196					Some(out.iter().flatten().flatten().cloned().collect())197				}198				_ => panic!("for expression evaluated to non-iterable value"),199			}200		}201	})202}203204// TODO: Asserts205pub fn evaluate_object(context: Context, object: ObjBody) -> Result<ObjValue> {206	Ok(match object {207		ObjBody::MemberList(members) => {208			let new_bindings = FutureNewBindings::new();209			let future_this = FutureObjValue::new();210			let context_creator = context_creator!(211				closure!(clone context, clone new_bindings, clone future_this, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {212					Ok(context.clone().extend_unbound(213						new_bindings.clone().unwrap(),214						context.clone().dollar().clone().or_else(||this.clone()),215						Some(this.unwrap()),216						super_obj217					)?)218				})219			);220			{221				let mut bindings: HashMap<String, LazyBinding> = HashMap::new();222				for (n, b) in members223					.iter()224					.filter_map(|m| match m {225						Member::BindStmt(b) => Some(b.clone()),226						_ => None,227					})228					.map(|b| evaluate_binding(&b, context_creator.clone()))229				{230					bindings.insert(n, b);231				}232				new_bindings.fill(bindings);233			}234235			let mut new_members = BTreeMap::new();236			for member in members.into_iter() {237				match member {238					Member::Field(FieldMember {239						name,240						plus,241						params: None,242						visibility,243						value,244					}) => {245						let name = evaluate_field_name(context.clone(), &name)?;246						if name.is_none() {247							continue;248						}249						let name = name.unwrap();250						new_members.insert(251							name.clone(),252							ObjMember {253								add: plus,254								visibility: visibility.clone(),255								invoke: binding!(256									closure!(clone name, clone value, clone context_creator, |this, super_obj| {257										push(value.clone(), "object ".to_owned()+&name+" field", ||{258											let context = context_creator.0(this, super_obj)?;259											evaluate(260												context,261												&value,262											)?.unwrap_if_lazy()263										})264									})265								),266							},267						);268					}269					Member::Field(FieldMember {270						name,271						params: Some(params),272						value,273						..274					}) => {275						let name = evaluate_field_name(context.clone(), &name)?;276						if name.is_none() {277							continue;278						}279						let name = name.unwrap();280						new_members.insert(281							name,282							ObjMember {283								add: false,284								visibility: Visibility::Hidden,285								invoke: binding!(286									closure!(clone value, clone context_creator, |this, super_obj| {287										// TODO: Assert288										Ok(evaluate_method(289											context_creator.0(this, super_obj)?,290											params.clone(),291											value.clone(),292										))293									})294								),295							},296						);297					}298					Member::BindStmt(_) => {}299					Member::AssertStmt(_) => {}300				}301			}302			future_this.fill(ObjValue::new(None, Rc::new(new_members)))303		}304		_ => todo!(),305	})306}307308#[inline(always)]309pub fn evaluate(context: Context, expr: &LocExpr) -> Result<Val> {310	use Expr::*;311	let locexpr = expr.clone();312	let LocExpr(expr, loc) = expr;313	Ok(match &**expr {314		Literal(LiteralType::This) => Val::Obj(315			context316				.this()317				.clone()318				.unwrap_or_else(|| panic!("this not found")),319		),320		Literal(LiteralType::Dollar) => Val::Obj(321			context322				.dollar()323				.clone()324				.unwrap_or_else(|| panic!("dollar not found")),325		),326		Literal(LiteralType::True) => Val::Bool(true),327		Literal(LiteralType::False) => Val::Bool(false),328		Literal(LiteralType::Null) => Val::Null,329		Parened(e) => evaluate(context, e)?,330		Str(v) => Val::Str(v.clone()),331		Num(v) => Val::Num(*v),332		BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,333		UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,334		Var(name) => push(locexpr, "var".to_owned(), || {335			Val::Lazy(context.binding(&name)).unwrap_if_lazy()336		})?,337		Index(LocExpr(v, _), index) if matches!(&**v, Expr::Literal(LiteralType::Super)) => {338			let name = evaluate(context.clone(), index)?.try_cast_str("object index")?;339			context340				.super_obj()341				.clone()342				.expect("no super found")343				.get_raw(&name, &context.this().clone().expect("no this found"))?344				.expect("value not found")345		}346		Index(value, index) => {347			match (348				evaluate(context.clone(), value)?.unwrap_if_lazy()?,349				evaluate(context, index)?,350			) {351				(Val::Obj(v), Val::Str(s)) => {352					if let Some(v) = v.get(&s)? {353						v.unwrap_if_lazy()?354					} else if let Some(Val::Str(n)) = v.get("__intristic_namespace__")? {355						Val::Intristic(n, s)356					} else {357						create_error(crate::Error::NoSuchField(s))?358					}359				}360				(Val::Arr(v), Val::Num(n)) => {361					if n.fract() > f64::EPSILON {362						create_error(crate::Error::FractionalIndex)?363					}364					v.get(n as usize)365						.unwrap_or_else(|| panic!("out of bounds"))366						.clone()367						.unwrap_if_lazy()?368				}369				(Val::Str(s), Val::Num(n)) => {370					Val::Str(s.chars().skip(n as usize).take(1).collect())371				}372				(v, i) => todo!("not implemented: {:?}[{:?}]", v, i.unwrap_if_lazy()),373			}374		}375		LocalExpr(bindings, returned) => {376			let mut new_bindings: HashMap<String, LazyBinding> = HashMap::new();377			let future_context = Context::new_future();378379			let context_creator = context_creator!(380				closure!(clone future_context, |_, _| Ok(future_context.clone().unwrap()))381			);382383			for (k, v) in bindings384				.iter()385				.map(|b| evaluate_binding(b, context_creator.clone()))386			{387				new_bindings.insert(k, v);388			}389390			let context = context391				.extend_unbound(new_bindings, None, None, None)?392				.into_future(future_context);393			evaluate(context, &returned.clone())?394		}395		Arr(items) => {396			let mut out = Vec::with_capacity(items.len());397			for item in items {398				out.push(Val::Lazy(lazy_val!(399					closure!(clone context, clone item, || {400						evaluate(context.clone(), &item)401					})402				)));403			}404			Val::Arr(out)405		}406		ArrComp(expr, compspecs) => Val::Arr(407			// First compspec should be forspec, so no "None" possible here408			evaluate_comp(context, expr, compspecs)?.unwrap(),409		),410		Obj(body) => Val::Obj(evaluate_object(context, body.clone())?),411		ObjExtend(s, t) => evaluate_add_op(412			&evaluate(context.clone(), s)?,413			&Val::Obj(evaluate_object(context, t.clone())?),414		)?,415		Apply(value, args, tailstrict) => {416			let value = evaluate(context.clone(), value)?.unwrap_if_lazy()?;417			match value {418				Val::Intristic(ns, name) => match (&ns as &str, &name as &str) {419					// arr/string/function420					("std", "length") => {421						assert_eq!(args.len(), 1);422						let expr = &args.get(0).unwrap().1;423						match evaluate(context, expr)? {424							Val::Str(n) => Val::Num(n.chars().count() as f64),425							Val::Arr(i) => Val::Num(i.len() as f64),426							Val::Obj(o) => Val::Num(o.fields().len() as f64),427							v => panic!("can't get length of {:?}", v),428						}429					}430					// any431					("std", "type") => {432						assert_eq!(args.len(), 1);433						let expr = &args.get(0).unwrap().1;434						Val::Str(evaluate(context, expr)?.value_type()?.name().to_owned())435					}436					// length, idx=>any437					("std", "makeArray") => {438						assert_eq!(args.len(), 2);439						if let (Val::Num(v), Val::Func(d)) = (440							evaluate(context.clone(), &args[0].1)?,441							evaluate(context, &args[1].1)?,442						) {443							assert!(v >= 0.0);444							let mut out = Vec::with_capacity(v as usize);445							for i in 0..v as usize {446								let call_ctx =447									Context::new().with_var("v".to_owned(), Val::Num(i as f64))?;448								out.push(d.evaluate(449									call_ctx,450									&ArgsDesc(vec![Arg(None, el!(Expr::Var("v".to_owned())))]),451									true,452								)?)453							}454							Val::Arr(out)455						} else {456							panic!("bad makeArray call");457						}458					}459					// string460					("std", "codepoint") => {461						assert_eq!(args.len(), 1);462						if let Val::Str(s) = evaluate(context, &args[0].1)? {463							assert!(464								s.chars().count() == 1,465								"std.codepoint should receive single char string"466							);467							Val::Num(s.chars().take(1).next().unwrap() as u32 as f64)468						} else {469							panic!("bad codepoint call");470						}471					}472					// object, includeHidden473					("std", "objectFieldsEx") => {474						assert_eq!(args.len(), 2);475						if let (Val::Obj(body), Val::Bool(_include_hidden)) = (476							evaluate(context.clone(), &args[0].1)?,477							evaluate(context, &args[1].1)?,478						) {479							// TODO: handle visibility (_include_hidden)480							Val::Arr(body.fields().into_iter().map(Val::Str).collect())481						} else {482							panic!("bad objectFieldsEx call");483						}484					}485					("std", "primitiveEquals") => {486						assert_eq!(args.len(), 2);487						let (a, b) = (488							evaluate(context.clone(), &args[0].1)?,489							evaluate(context, &args[1].1)?,490						);491						Val::Bool(a == b)492					}493					("std", "modulo") => {494						assert_eq!(args.len(), 2);495						if let (Val::Num(a), Val::Num(b)) = (496							evaluate(context.clone(), &args[0].1)?,497							evaluate(context, &args[1].1)?,498						) {499							Val::Num(a % b)500						} else {501							panic!("bad modulo call");502						}503					}504					("std", "floor") => {505						assert_eq!(args.len(), 1);506						if let Val::Num(a) = evaluate(context, &args[0].1)? {507							Val::Num(a.floor())508						} else {509							panic!("bad floor call");510						}511					}512					("std", "trace") => {513						assert_eq!(args.len(), 2);514						if let (Val::Str(a), b) = (515							evaluate(context.clone(), &args[0].1)?,516							evaluate(context, &args[1].1)?,517						) {518							// TODO: Line numbers as in original jsonnet519							println!("TRACE: {}", a);520							b521						} else {522							panic!("bad trace call");523						}524					}525					("std", "pow") => {526						assert_eq!(args.len(), 2);527						if let (Val::Num(a), Val::Num(b)) = (528							evaluate(context.clone(), &args[0].1)?,529							evaluate(context, &args[1].1)?,530						) {531							Val::Num(a.powf(b))532						} else {533							panic!("bad pow call");534						}535					}536					(ns, name) => panic!("Intristic not found: {}.{}", ns, name),537				},538				Val::Func(f) => {539					let body = #[inline(always)]540					|| f.evaluate(context, args, *tailstrict);541					if *tailstrict {542						body()?543					} else {544						push(locexpr, "function call".to_owned(), body)?545					}546				}547				_ => panic!("{:?} is not a function", value),548			}549		}550		Function(params, body) => evaluate_method(context, params.clone(), body.clone()),551		AssertExpr(AssertStmt(value, msg), returned) => {552			let assertion_result = push(value.clone(), "assertion condition".to_owned(), || {553				evaluate(context.clone(), &value)?554					.try_cast_bool("assertion condition should be boolean")555			})?;556			if assertion_result {557				push(558					returned.clone(),559					"assert 'return' branch".to_owned(),560					|| evaluate(context, returned),561				)?562			} else if let Some(msg) = msg {563				panic!(564					"assertion failed ({:?}): {}",565					value,566					evaluate(context, msg)?.try_cast_str("assertion message should be string")?567				);568			} else {569				panic!("assertion failed ({:?}): no message", value);570			}571		}572		Error(e) => create_error(crate::Error::RuntimeError(573			evaluate(context, e)?.try_cast_str("error text should be string")?,574		))?,575		IfElse {576			cond,577			cond_then,578			cond_else,579		} => {580			let condition_result = push(cond.0.clone(), "if condition".to_owned(), || {581				evaluate(context.clone(), &cond.0)?.try_cast_bool("if condition should be boolean")582			})?;583			if condition_result {584				push(585					cond_then.clone(),586					"if condition 'then' branch".to_owned(),587					|| evaluate(context, cond_then),588				)?589			} else {590				match cond_else {591					Some(v) => evaluate(context, v)?,592					None => Val::Null,593				}594			}595		}596		_ => panic!(597			"evaluation not implemented: {:?}",598			LocExpr(expr.clone(), loc.clone())599		),600	})601}
after · crates/jsonnet-evaluator/src/evaluate.rs
1use crate::{2	binding, context_creator, create_error, future_wrapper, lazy_val, push, Context,3	ContextCreator, FuncDesc, LazyBinding, ObjMember, ObjValue, Result, Val,4};5use closure::closure;6use jsonnet_parser::{7	el, Arg, ArgsDesc, AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, FieldMember,8	ForSpecData, IfSpecData, LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType,9	Visibility,10};11use std::{12	collections::{BTreeMap, HashMap},13	rc::Rc,14};1516pub fn evaluate_binding(b: &BindSpec, context_creator: ContextCreator) -> (String, 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						params.clone(),27						b.value.clone(),28					)))29				))30			})),31		)32	} else {33		(34			b.name.clone(),35			LazyBinding::Bindable(Rc::new(move |this, super_obj| {36				Ok(lazy_val!(closure!(clone context_creator, clone b, ||37					push(b.value.clone(), "thunk".to_owned(), ||{38						evaluate(39							context_creator.0(this.clone(), super_obj.clone())?,40							&b.value41						)42					})43				)))44			})),45		)46	}47}4849pub fn evaluate_method(ctx: Context, params: ParamsDesc, body: LocExpr) -> Val {50	Val::Func(FuncDesc { ctx, params, body })51}5253pub fn evaluate_field_name(54	context: Context,55	field_name: &jsonnet_parser::FieldName,56) -> Result<Option<String>> {57	Ok(match field_name {58		jsonnet_parser::FieldName::Fixed(n) => Some(n.clone()),59		jsonnet_parser::FieldName::Dyn(expr) => {60			let value = evaluate(context, expr)?.unwrap_if_lazy()?;61			if matches!(value, Val::Null) {62				None63			} else {64				Some(value.try_cast_str("dynamic field name")?)65			}66		}67	})68}6970pub fn evaluate_unary_op(op: UnaryOpType, b: &Val) -> Result<Val> {71	Ok(match (op, b) {72		(o, Val::Lazy(l)) => evaluate_unary_op(o, &l.evaluate()?)?,73		(UnaryOpType::Not, Val::Bool(v)) => Val::Bool(!v),74		(UnaryOpType::Minus, Val::Num(n)) => Val::Num(-*n),75		(UnaryOpType::BitNot, Val::Num(n)) => Val::Num(!(*n as i32) as f64),76		(op, o) => panic!("unary op not implemented: {:?} {:?}", op, o),77	})78}7980pub(crate) fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {81	Ok(match (a, b) {82		(Val::Str(v1), Val::Str(v2)) => Val::Str(v1.to_owned() + &v2),8384		(Val::Str(v1), Val::Num(v2)) => Val::Str(format!("{}{}", v1, v2)),85		(Val::Num(v1), Val::Str(v2)) => Val::Str(format!("{}{}", v1, v2)),86		(Val::Str(v1), Val::Bool(v2)) => Val::Str(format!("{}{}", v1, v2)),87		(Val::Bool(v1), Val::Str(v2)) => Val::Str(format!("{}{}", v1, v2)),88		(Val::Str(v1), Val::Null) => Val::Str(format!("{}null", v1)),89		(Val::Null, Val::Str(v2)) => Val::Str(format!("null{}", v2)),9091		(Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),92		(Val::Arr(a), Val::Arr(b)) => Val::Arr([&a[..], &b[..]].concat()),93		(Val::Num(v1), Val::Num(v2)) => Val::Num(v1 + v2),94		_ => panic!("can't add: {:?} and {:?}", a, b),95	})96}9798pub fn evaluate_binary_op_special(99	context: Context,100	a: &LocExpr,101	op: BinaryOpType,102	b: &LocExpr,103) -> Result<Val> {104	Ok(105		match (evaluate(context.clone(), &a)?.unwrap_if_lazy()?, op, b) {106			(Val::Bool(true), BinaryOpType::Or, _o) => Val::Bool(true),107			(Val::Bool(false), BinaryOpType::And, _o) => Val::Bool(false),108			(a, op, eb) => {109				evaluate_binary_op_normal(&a, op, &evaluate(context, eb)?.unwrap_if_lazy()?)?110			}111		},112	)113}114115pub fn evaluate_binary_op_normal(a: &Val, op: BinaryOpType, b: &Val) -> Result<Val> {116	Ok(match (a, op, b) {117		(a, BinaryOpType::Add, b) => evaluate_add_op(a, b)?,118119		(Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize)),120121		// Bool X Bool122		(Val::Bool(a), BinaryOpType::And, Val::Bool(b)) => Val::Bool(*a && *b),123		(Val::Bool(a), BinaryOpType::Or, Val::Bool(b)) => Val::Bool(*a || *b),124125		// Str X Str126		(Val::Str(v1), BinaryOpType::Lt, Val::Str(v2)) => Val::Bool(v1 < v2),127		(Val::Str(v1), BinaryOpType::Gt, Val::Str(v2)) => Val::Bool(v1 > v2),128		(Val::Str(v1), BinaryOpType::Lte, Val::Str(v2)) => Val::Bool(v1 <= v2),129		(Val::Str(v1), BinaryOpType::Gte, Val::Str(v2)) => Val::Bool(v1 >= v2),130131		// Num X Num132		(Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),133		(Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => {134			if *v2 <= f64::EPSILON {135				create_error(crate::Error::DivisionByZero)?136			}137			Val::Num(v1 / v2)138		}139140		(Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::Num(v1 - v2),141142		(Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => Val::Bool(v1 < v2),143		(Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => Val::Bool(v1 > v2),144		(Val::Num(v1), BinaryOpType::Lte, Val::Num(v2)) => Val::Bool(v1 <= v2),145		(Val::Num(v1), BinaryOpType::Gte, Val::Num(v2)) => Val::Bool(v1 >= v2),146147		(Val::Num(v1), BinaryOpType::BitAnd, Val::Num(v2)) => {148			Val::Num(((*v1 as i32) & (*v2 as i32)) as f64)149		}150		(Val::Num(v1), BinaryOpType::BitOr, Val::Num(v2)) => {151			Val::Num(((*v1 as i32) | (*v2 as i32)) as f64)152		}153		(Val::Num(v1), BinaryOpType::BitXor, Val::Num(v2)) => {154			Val::Num(((*v1 as i32) ^ (*v2 as i32)) as f64)155		}156		(Val::Num(v1), BinaryOpType::Lhs, Val::Num(v2)) => {157			Val::Num(((*v1 as i32) << (*v2 as i32)) as f64)158		}159		(Val::Num(v1), BinaryOpType::Rhs, Val::Num(v2)) => {160			Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)161		}162163		_ => panic!("no rules for binary operation: {:?} {:?} {:?}", a, op, b),164	})165}166167future_wrapper!(HashMap<String, LazyBinding>, FutureNewBindings);168future_wrapper!(ObjValue, FutureObjValue);169170pub fn evaluate_comp(171	context: Context,172	value: &LocExpr,173	specs: &[CompSpec],174) -> Result<Option<Vec<Val>>> {175	Ok(match specs.get(0) {176		None => Some(vec![evaluate(context, &value)?]),177		Some(CompSpec::IfSpec(IfSpecData(cond))) => {178			if evaluate(context.clone(), &cond)?.try_cast_bool("if spec")? {179				evaluate_comp(context, value, &specs[1..])?180			} else {181				None182			}183		}184		Some(CompSpec::ForSpec(ForSpecData(var, expr))) => {185			match evaluate(context.clone(), &expr)?.unwrap_if_lazy()? {186				Val::Arr(list) => {187					let mut out = Vec::new();188					for item in list {189						let item = item.clone().unwrap_if_lazy()?;190						out.push(evaluate_comp(191							context.with_var(var.clone(), item)?,192							value,193							&specs[1..],194						)?);195					}196					Some(out.iter().flatten().flatten().cloned().collect())197				}198				_ => panic!("for expression evaluated to non-iterable value"),199			}200		}201	})202}203204// TODO: Asserts205pub fn evaluate_object(context: Context, object: ObjBody) -> Result<ObjValue> {206	Ok(match object {207		ObjBody::MemberList(members) => {208			let new_bindings = FutureNewBindings::new();209			let future_this = FutureObjValue::new();210			let context_creator = context_creator!(211				closure!(clone context, clone new_bindings, clone future_this, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {212					Ok(context.clone().extend_unbound(213						new_bindings.clone().unwrap(),214						context.clone().dollar().clone().or_else(||this.clone()),215						Some(this.unwrap()),216						super_obj217					)?)218				})219			);220			{221				let mut bindings: HashMap<String, LazyBinding> = HashMap::new();222				for (n, b) in members223					.iter()224					.filter_map(|m| match m {225						Member::BindStmt(b) => Some(b.clone()),226						_ => None,227					})228					.map(|b| evaluate_binding(&b, context_creator.clone()))229				{230					bindings.insert(n, b);231				}232				new_bindings.fill(bindings);233			}234235			let mut new_members = BTreeMap::new();236			for member in members.into_iter() {237				match member {238					Member::Field(FieldMember {239						name,240						plus,241						params: None,242						visibility,243						value,244					}) => {245						let name = evaluate_field_name(context.clone(), &name)?;246						if name.is_none() {247							continue;248						}249						let name = name.unwrap();250						new_members.insert(251							name.clone(),252							ObjMember {253								add: plus,254								visibility: visibility.clone(),255								invoke: binding!(256									closure!(clone name, clone value, clone context_creator, |this, super_obj| {257										push(value.clone(), "object ".to_owned()+&name+" field", ||{258											let context = context_creator.0(this, super_obj)?;259											evaluate(260												context,261												&value,262											)?.unwrap_if_lazy()263										})264									})265								),266							},267						);268					}269					Member::Field(FieldMember {270						name,271						params: Some(params),272						value,273						..274					}) => {275						let name = evaluate_field_name(context.clone(), &name)?;276						if name.is_none() {277							continue;278						}279						let name = name.unwrap();280						new_members.insert(281							name,282							ObjMember {283								add: false,284								visibility: Visibility::Hidden,285								invoke: binding!(286									closure!(clone value, clone context_creator, |this, super_obj| {287										// TODO: Assert288										Ok(evaluate_method(289											context_creator.0(this, super_obj)?,290											params.clone(),291											value.clone(),292										))293									})294								),295							},296						);297					}298					Member::BindStmt(_) => {}299					Member::AssertStmt(_) => {}300				}301			}302			future_this.fill(ObjValue::new(None, Rc::new(new_members)))303		}304		_ => todo!(),305	})306}307308#[inline(always)]309pub fn evaluate(context: Context, expr: &LocExpr) -> Result<Val> {310	use Expr::*;311	let locexpr = expr.clone();312	let LocExpr(expr, loc) = expr;313	Ok(match &**expr {314		Literal(LiteralType::This) => Val::Obj(315			context316				.this()317				.clone()318				.unwrap_or_else(|| panic!("this not found")),319		),320		Literal(LiteralType::Dollar) => Val::Obj(321			context322				.dollar()323				.clone()324				.unwrap_or_else(|| panic!("dollar not found")),325		),326		Literal(LiteralType::True) => Val::Bool(true),327		Literal(LiteralType::False) => Val::Bool(false),328		Literal(LiteralType::Null) => Val::Null,329		Parened(e) => evaluate(context, e)?,330		Str(v) => Val::Str(v.clone()),331		Num(v) => Val::Num(*v),332		BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,333		UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,334		Var(name) => push(locexpr, "var".to_owned(), || {335			Val::Lazy(context.binding(&name)).unwrap_if_lazy()336		})?,337		Index(LocExpr(v, _), index) if matches!(&**v, Expr::Literal(LiteralType::Super)) => {338			let name = evaluate(context.clone(), index)?.try_cast_str("object index")?;339			context340				.super_obj()341				.clone()342				.expect("no super found")343				.get_raw(&name, &context.this().clone().expect("no this found"))?344				.expect("value not found")345		}346		Index(value, index) => {347			match (348				evaluate(context.clone(), value)?.unwrap_if_lazy()?,349				evaluate(context, index)?,350			) {351				(Val::Obj(v), Val::Str(s)) => {352					if let Some(v) = v.get(&s)? {353						v.unwrap_if_lazy()?354					} else if let Some(Val::Str(n)) = v.get("__intristic_namespace__")? {355						Val::Intristic(n, s)356					} else {357						create_error(crate::Error::NoSuchField(s))?358					}359				}360				(Val::Arr(v), Val::Num(n)) => {361					if n.fract() > f64::EPSILON {362						create_error(crate::Error::FractionalIndex)?363					}364					v.get(n as usize)365						.unwrap_or_else(|| panic!("out of bounds"))366						.clone()367						.unwrap_if_lazy()?368				}369				(Val::Str(s), Val::Num(n)) => {370					Val::Str(s.chars().skip(n as usize).take(1).collect())371				}372				(v, i) => todo!("not implemented: {:?}[{:?}]", v, i.unwrap_if_lazy()),373			}374		}375		LocalExpr(bindings, returned) => {376			let mut new_bindings: HashMap<String, LazyBinding> = HashMap::new();377			let future_context = Context::new_future();378379			let context_creator = context_creator!(380				closure!(clone future_context, |_, _| Ok(future_context.clone().unwrap()))381			);382383			for (k, v) in bindings384				.iter()385				.map(|b| evaluate_binding(b, context_creator.clone()))386			{387				new_bindings.insert(k, v);388			}389390			let context = context391				.extend_unbound(new_bindings, None, None, None)?392				.into_future(future_context);393			evaluate(context, &returned.clone())?394		}395		Arr(items) => {396			let mut out = Vec::with_capacity(items.len());397			for item in items {398				out.push(Val::Lazy(lazy_val!(399					closure!(clone context, clone item, || {400						evaluate(context.clone(), &item)401					})402				)));403			}404			Val::Arr(out)405		}406		ArrComp(expr, compspecs) => Val::Arr(407			// First compspec should be forspec, so no "None" possible here408			evaluate_comp(context, expr, compspecs)?.unwrap(),409		),410		Obj(body) => Val::Obj(evaluate_object(context, body.clone())?),411		ObjExtend(s, t) => evaluate_add_op(412			&evaluate(context.clone(), s)?,413			&Val::Obj(evaluate_object(context, t.clone())?),414		)?,415		Apply(value, args, tailstrict) => {416			let value = evaluate(context.clone(), value)?.unwrap_if_lazy()?;417			match value {418				Val::Intristic(ns, name) => match (&ns as &str, &name as &str) {419					// arr/string/function420					("std", "length") => {421						assert_eq!(args.len(), 1);422						let expr = &args.get(0).unwrap().1;423						match evaluate(context, expr)? {424							Val::Str(n) => Val::Num(n.chars().count() as f64),425							Val::Arr(i) => Val::Num(i.len() as f64),426							Val::Obj(o) => Val::Num(o.fields().len() as f64),427							v => panic!("can't get length of {:?}", v),428						}429					}430					// any431					("std", "type") => {432						assert_eq!(args.len(), 1);433						let expr = &args.get(0).unwrap().1;434						Val::Str(evaluate(context, expr)?.value_type()?.name().to_owned())435					}436					// length, idx=>any437					("std", "makeArray") => {438						assert_eq!(args.len(), 2);439						if let (Val::Num(v), Val::Func(d)) = (440							evaluate(context.clone(), &args[0].1)?,441							evaluate(context, &args[1].1)?,442						) {443							assert!(v >= 0.0);444							let mut out = Vec::with_capacity(v as usize);445							for i in 0..v as usize {446								let call_ctx =447									Context::new().with_var("v".to_owned(), Val::Num(i as f64))?;448								out.push(d.evaluate(449									call_ctx,450									&ArgsDesc(vec![Arg(None, el!(Expr::Var("v".to_owned())))]),451									true,452								)?)453							}454							Val::Arr(out)455						} else {456							panic!("bad makeArray call");457						}458					}459					// string460					("std", "codepoint") => {461						assert_eq!(args.len(), 1);462						if let Val::Str(s) = evaluate(context, &args[0].1)? {463							assert!(464								s.chars().count() == 1,465								"std.codepoint should receive single char string"466							);467							Val::Num(s.chars().take(1).next().unwrap() as u32 as f64)468						} else {469							panic!("bad codepoint call");470						}471					}472					// object, includeHidden473					("std", "objectFieldsEx") => {474						assert_eq!(args.len(), 2);475						if let (Val::Obj(body), Val::Bool(_include_hidden)) = (476							evaluate(context.clone(), &args[0].1)?,477							evaluate(context, &args[1].1)?,478						) {479							// TODO: handle visibility (_include_hidden)480							Val::Arr(body.fields().into_iter().map(Val::Str).collect())481						} else {482							panic!("bad objectFieldsEx call");483						}484					}485					("std", "primitiveEquals") => {486						assert_eq!(args.len(), 2);487						let (a, b) = (488							evaluate(context.clone(), &args[0].1)?,489							evaluate(context, &args[1].1)?,490						);491						Val::Bool(a == b)492					}493					("std", "modulo") => {494						assert_eq!(args.len(), 2);495						if let (Val::Num(a), Val::Num(b)) = (496							evaluate(context.clone(), &args[0].1)?,497							evaluate(context, &args[1].1)?,498						) {499							Val::Num(a % b)500						} else {501							panic!("bad modulo call");502						}503					}504					("std", "floor") => {505						assert_eq!(args.len(), 1);506						if let Val::Num(a) = evaluate(context, &args[0].1)? {507							Val::Num(a.floor())508						} else {509							panic!("bad floor call");510						}511					}512					("std", "trace") => {513						assert_eq!(args.len(), 2);514						if let (Val::Str(a), b) = (515							evaluate(context.clone(), &args[0].1)?,516							evaluate(context, &args[1].1)?,517						) {518							// TODO: Line numbers as in original jsonnet519							println!("TRACE: {}", a);520							b521						} else {522							panic!("bad trace call");523						}524					}525					("std", "pow") => {526						assert_eq!(args.len(), 2);527						if let (Val::Num(a), Val::Num(b)) = (528							evaluate(context.clone(), &args[0].1)?,529							evaluate(context, &args[1].1)?,530						) {531							Val::Num(a.powf(b))532						} else {533							panic!("bad pow call");534						}535					}536					("std", "extVar") => {537						assert_eq!(args.len(), 1);538						if let Val::Str(a) = evaluate(context, &args[0].1)? {539							with_state(|s| s.0.ext_vars.borrow().get(&a).cloned()).ok_or_else(540								|| {541									create_error::<()>(crate::Error::UndefinedExternalVariable(a))542										.err()543										.unwrap()544								},545							)?546						} else {547							panic!("bad extVar call");548						}549					}550					(ns, name) => panic!("Intristic not found: {}.{}", ns, name),551				},552				Val::Func(f) => {553					let body = #[inline(always)]554					|| f.evaluate(context, args, *tailstrict);555					if *tailstrict {556						body()?557					} else {558						push(locexpr, "function call".to_owned(), body)?559					}560				}561				_ => panic!("{:?} is not a function", value),562			}563		}564		Function(params, body) => evaluate_method(context, params.clone(), body.clone()),565		AssertExpr(AssertStmt(value, msg), returned) => {566			let assertion_result = push(value.clone(), "assertion condition".to_owned(), || {567				evaluate(context.clone(), &value)?568					.try_cast_bool("assertion condition should be boolean")569			})?;570			if assertion_result {571				push(572					returned.clone(),573					"assert 'return' branch".to_owned(),574					|| evaluate(context, returned),575				)?576			} else if let Some(msg) = msg {577				panic!(578					"assertion failed ({:?}): {}",579					value,580					evaluate(context, msg)?.try_cast_str("assertion message should be string")?581				);582			} else {583				panic!("assertion failed ({:?}): no message", value);584			}585		}586		Error(e) => create_error(crate::Error::RuntimeError(587			evaluate(context, e)?.try_cast_str("error text should be string")?,588		))?,589		IfElse {590			cond,591			cond_then,592			cond_else,593		} => {594			let condition_result = push(cond.0.clone(), "if condition".to_owned(), || {595				evaluate(context.clone(), &cond.0)?.try_cast_bool("if condition should be boolean")596			})?;597			if condition_result {598				push(599					cond_then.clone(),600					"if condition 'then' branch".to_owned(),601					|| evaluate(context, cond_then),602				)?603			} else {604				match cond_else {605					Some(v) => evaluate(context, v)?,606					None => Val::Null,607				}608			}609		}610		_ => panic!(611			"evaluation not implemented: {:?}",612			LocExpr(expr.clone(), loc.clone())613		),614	})615}
modifiedcrates/jsonnet-evaluator/src/lib.rsdiffbeforeafterboth
--- a/crates/jsonnet-evaluator/src/lib.rs
+++ b/crates/jsonnet-evaluator/src/lib.rs
@@ -72,6 +72,9 @@
 	files: RefCell<HashMap<PathBuf, FileData>>,
 	globals: RefCell<HashMap<String, Val>>,
 
+	/// Values to use with std.extVar
+	ext_vars: RefCell<HashMap<String, Val>>,
+
 	settings: EvaluationSettings,
 }
 
@@ -177,6 +180,9 @@
 	pub fn add_global(&self, name: String, value: Val) {
 		self.0.globals.borrow_mut().insert(name, value);
 	}
+	pub fn add_ext_var(&self, name: String, value: Val) {
+		self.0.ext_vars.borrow_mut().insert(name, value);
+	}
 
 	pub fn with_stdlib(&self) -> &Self {
 		self.begin_state();