difftreelog
feat(evaluator) ArrComp support
in: master
7 files changed
crates/jsonnet-evaluator/src/ctx.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/ctx.rs
+++ b/crates/jsonnet-evaluator/src/ctx.rs
@@ -1,4 +1,7 @@
-use crate::{future_wrapper, rc_fn_helper, LazyBinding, LazyVal, ObjValue};
+use crate::{
+ future_wrapper, lazy_binding, lazy_val, rc_fn_helper, LazyBinding, LazyVal, ObjValue, Val,
+};
+use closure::closure;
use std::{cell::RefCell, collections::HashMap, fmt::Debug, rc::Rc};
rc_fn_helper!(
@@ -62,6 +65,17 @@
ctx.unwrap()
}
+ pub fn with_var(&self, name: String, value: Val) -> Context {
+ let mut new_bindings: HashMap<_, LazyBinding> = HashMap::new();
+ new_bindings.insert(
+ name,
+ lazy_binding!(
+ closure!(clone value, |_t, _s|lazy_val!(closure!(clone value, ||value.clone())))
+ ),
+ );
+ self.extend(new_bindings, None, None, None)
+ }
+
pub fn extend(
&self,
new_bindings: HashMap<String, LazyBinding>,
crates/jsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth5};5};6use closure::closure;6use closure::closure;7use jsonnet_parser::{7use jsonnet_parser::{8 ArgsDesc, BinaryOpType, BindSpec, Expr, FieldMember, LiteralType, LocExpr, Member, ObjBody,8 el, Arg, ArgsDesc, AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, FieldMember,9 ParamsDesc, UnaryOpType, Visibility,9 ForSpecData, IfSpecData, LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType,10 Visibility,10};11};11use std::{12use std::{94 }95 }95}96}9798pub fn evaluate_add_op(a: &Val, b: &Val) -> Val {99 match (a, b) {100 (Val::Str(v1), Val::Str(v2)) => Val::Str(v1.to_owned() + &v2),101 (Val::Str(v1), Val::Num(v2)) => Val::Str(format!("{}{}", v1, v2)),102 (Val::Num(v1), Val::Str(v2)) => Val::Str(format!("{}{}", v1, v2)),103 (Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),104 (Val::Arr(a), Val::Arr(b)) => Val::Arr([&a[..], &b[..]].concat()),105 (Val::Num(v1), Val::Num(v2)) => Val::Num(v1 + v2),106 _ => panic!("can't add: {:?} and {:?}", a, b),107 }108}9610997pub fn evaluate_binary_op(a: &Val, op: BinaryOpType, b: &Val) -> Val {110pub fn evaluate_binary_op(111 context: Context,112 eval_state: EvaluationState,113 a: &Val,114 op: BinaryOpType,115 b: &Val,116) -> Val {98 match (a, op, b) {117 match (a, op, b) {99 (Val::Lazy(a), o, b) => evaluate_binary_op(&a.evaluate(), o, b),118 (Val::Lazy(a), o, b) => evaluate_binary_op(context, eval_state, &a.evaluate(), o, b),100 (a, o, Val::Lazy(b)) => evaluate_binary_op(a, o, &b.evaluate()),119 (a, o, Val::Lazy(b)) => evaluate_binary_op(context, eval_state, a, o, &b.evaluate()),101120102 (Val::Str(v1), BinaryOpType::Add, Val::Str(v2)) => Val::Str(v1.to_owned() + &v2),121 (a, BinaryOpType::Add, b) => evaluate_add_op(a, b),122103 (Val::Str(v1), BinaryOpType::Ne, Val::Str(v2)) => bool_val(v1 != v2),123 (Val::Str(v1), BinaryOpType::Ne, Val::Str(v2)) => bool_val(v1 != v2),104124105 (Val::Str(v1), BinaryOpType::Add, Val::Num(v2)) => Val::Str(format!("{}{}", v1, v2)),125 (Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize)),106 (Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize)),126 (Val::Str(format), BinaryOpType::Mod, args) => evaluate(127 context128 .with_var("__tmp__format__".to_owned(), Val::Str(format.to_owned()))129 .with_var(130 "__tmp__args__".to_owned(),131 match args {132 Val::Arr(v) => Val::Arr(v.clone()),133 v => Val::Arr(vec![v.clone()]),134 },135 ),136 eval_state,137 &el!(Expr::Apply(138 el!(Expr::Index(139 el!(Expr::Var("std".to_owned())),140 el!(Expr::Str("format".to_owned()))141 )),142 ArgsDesc(vec![143 Arg(None, el!(Expr::Var("__tmp__format__".to_owned()))),144 Arg(None, el!(Expr::Var("__tmp__args__".to_owned())))145 ])146 )),147 ),107148108 (Val::Bool(a), BinaryOpType::And, Val::Bool(b)) => Val::Bool(*a && *b),149 (Val::Bool(a), BinaryOpType::And, Val::Bool(b)) => Val::Bool(*a && *b),109 (Val::Bool(a), BinaryOpType::Or, Val::Bool(b)) => Val::Bool(*a || *b),150 (Val::Bool(a), BinaryOpType::Or, Val::Bool(b)) => Val::Bool(*a || *b),110111 (Val::Obj(v1), BinaryOpType::Add, Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),112113 (Val::Arr(a), BinaryOpType::Add, Val::Arr(b)) => Val::Arr([&a[..], &b[..]].concat()),114151115 (Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),152 (Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),116 (Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => Val::Num(v1 / v2),153 (Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => Val::Num(v1 / v2),117 (Val::Num(v1), BinaryOpType::Mod, Val::Num(v2)) => Val::Num(v1 % v2),154 (Val::Num(v1), BinaryOpType::Mod, Val::Num(v2)) => Val::Num(v1 % v2),118155119 (Val::Num(v1), BinaryOpType::Add, Val::Num(v2)) => Val::Num(v1 + v2),120 (Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::Num(v1 - v2),156 (Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::Num(v1 - v2),121157122 (Val::Num(v1), BinaryOpType::Lhs, Val::Num(v2)) => {158 (Val::Num(v1), BinaryOpType::Lhs, Val::Num(v2)) => {152future_wrapper!(HashMap<String, LazyBinding>, FutureNewBindings);188future_wrapper!(HashMap<String, LazyBinding>, FutureNewBindings);153future_wrapper!(ObjValue, FutureObjValue);189future_wrapper!(ObjValue, FutureObjValue);190191pub fn evaluate_comp(192 context: Context,193 eval_state: EvaluationState,194 value: &LocExpr,195 specs: &[CompSpec],196) -> Option<Vec<Val>> {197 match specs.get(0) {198 None => Some(vec![evaluate(context, eval_state, &value)]),199 Some(CompSpec::IfSpec(IfSpecData(cond))) => {200 match evaluate(context.clone(), eval_state.clone(), &cond).unwrap_if_lazy() {201 Val::Bool(false) => None,202 Val::Bool(true) => evaluate_comp(context, eval_state, value, &specs[1..]),203 _ => panic!("if expression evaluated to non-boolean value"),204 }205 }206 Some(CompSpec::ForSpec(ForSpecData(var, expr))) => {207 match evaluate(context.clone(), eval_state.clone(), &expr).unwrap_if_lazy() {208 Val::Arr(list) => {209 let mut out = Vec::new();210 for item in list {211 let item = item.clone();212 out.push(evaluate_comp(213 context.with_var(var.clone(), item),214 eval_state.clone(),215 value,216 &specs[1..],217 ));218 }219 Some(out.iter().flatten().flatten().cloned().collect())220 }221 _ => panic!("for expression evaluated to non-iterable value"),222 }223 }224 }225}154226155// TODO: Asserts227// TODO: Asserts156pub fn evaluate_object(context: Context, eval_state: EvaluationState, object: ObjBody) -> ObjValue {228pub fn evaluate_object(context: Context, eval_state: EvaluationState, object: ObjBody) -> ObjValue {272 Parened(e) => evaluate(context, eval_state.clone(), e),344 Parened(e) => evaluate(context, eval_state.clone(), e),273 Str(v) => Val::Str(v.clone()),345 Str(v) => Val::Str(v.clone()),274 Num(v) => Val::Num(*v),346 Num(v) => Val::Num(*v),275 BinaryOp(v1, o, v2) => evaluate_binary_op(347 BinaryOp(v1, o, v2) => {276 &evaluate(context.clone(), eval_state.clone(), v1),348 let a = evaluate(context.clone(), eval_state.clone(), v1).unwrap_if_lazy();277 *o,349 let op = *o;278 &evaluate(context, eval_state.clone(), v2),350 let b = evaluate(context.clone(), eval_state.clone(), v2).unwrap_if_lazy();351 evaluate_binary_op(352 context,353 eval_state,354 &a,355 op,356 &b,357 )279 ),358 },280 UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, eval_state, v)),359 UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, eval_state, v)),281 Var(name) => Val::Lazy(context.binding(&name)).unwrap_if_lazy(),360 Var(name) => Val::Lazy(context.binding(&name)).unwrap_if_lazy(),282 Index(value, index) => {361 Index(value, index) => {286 ) {365 ) {287 (Val::Obj(v), Val::Str(s)) => v366 (Val::Obj(v), Val::Str(s)) => v288 .get(&s)367 .get(&s)289 .unwrap_or_else(closure!(clone context, || {368 .unwrap_or_else(closure!(clone context, clone eval_state, || {290 if let Some(n) = v.get("__intristic_namespace__") {369 if let Some(n) = v.get("__intristic_namespace__") {291 if let Val::Str(n) = n.unwrap_if_lazy() {370 if let Val::Str(n) = n.unwrap_if_lazy() {292 Val::Intristic(n, s)371 Val::Intristic(n, s)335 }414 }336 Val::Arr(out)415 Val::Arr(out)337 }416 }417 ArrComp(expr, compspecs) => {418 Val::Arr(evaluate_comp(context, eval_state, expr, compspecs).unwrap())419 }338 Obj(body) => Val::Obj(evaluate_object(context, eval_state, body.clone())),420 Obj(body) => Val::Obj(evaluate_object(context, eval_state, body.clone())),339 Apply(value, ArgsDesc(args)) => {421 Apply(value, ArgsDesc(args)) => {340 let value = evaluate(context.clone(), eval_state.clone(), value).unwrap_if_lazy();422 let value = evaluate(context.clone(), eval_state.clone(), value).unwrap_if_lazy();341 match value {423 match value {342 // TODO: Capture context of application424 // TODO: Capture context of application343 Val::Intristic(ns, name) => match (&ns as &str, &name as &str) {425 Val::Intristic(ns, name) => match (&ns as &str, &name as &str) {426 // arr/string/function344 ("std", "length") => {427 ("std", "length") => {345 assert_eq!(args.len(), 1);428 assert_eq!(args.len(), 1);346 let expr = &args.get(0).unwrap().1;429 let expr = &args.get(0).unwrap().1;350 v => panic!("can't get length of {:?}", v),433 v => panic!("can't get length of {:?}", v),351 }434 }352 }435 }436 // any353 ("std", "type") => {437 ("std", "type") => {354 assert_eq!(args.len(), 1);438 assert_eq!(args.len(), 1);355 let expr = &args.get(0).unwrap().1;439 let expr = &args.get(0).unwrap().1;356 Val::Str(evaluate(context, eval_state, expr).type_of().to_owned())440 Val::Str(evaluate(context, eval_state, expr).type_of().to_owned())357 }441 }442 // length, idx=>any358 ("std", "makeArray") => {443 ("std", "makeArray") => {359 assert_eq!(args.len(), 2);444 assert_eq!(args.len(), 2);360 if let (Val::Num(v), Val::Func(d)) = (445 if let (Val::Num(v), Val::Func(d)) = (371 panic!("bad makeArray call");456 panic!("bad makeArray call");372 }457 }373 }458 }459 // string374 ("std", "codepoint") => {460 ("std", "codepoint") => {375 assert_eq!(args.len(), 1);461 assert_eq!(args.len(), 1);376 if let Val::Str(s) = evaluate(context, eval_state, &args[0].1) {462 if let Val::Str(s) = evaluate(context, eval_state, &args[0].1) {383 panic!("bad codepoint call");469 panic!("bad codepoint call");384 }470 }385 }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(), eval_state.clone(), &args[0].1),477 evaluate(context, eval_state, &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 }386 (ns, name) => panic!("Intristic not found: {}.{}", ns, name),485 (ns, name) => panic!("Intristic not found: {}.{}", ns, name),387 },486 },388 Val::Func(f) => f.evaluate(487 Val::Func(f) => f.evaluate(402 }501 }403 }502 }404 Function(params, body) => evaluate_method(context, eval_state, body, params.clone()),503 Function(params, body) => evaluate_method(context, eval_state, body, params.clone()),504 AssertExpr(AssertStmt(value, msg), returned) => {505 if evaluate(context.clone(), eval_state.clone(), &value).try_cast_bool() {506 evaluate(context, eval_state, returned)507 }else {508 if let Some(msg) = msg {509 panic!("assertion failed ({:?}): {}", value, evaluate(context, eval_state, msg).try_cast_str());510 } else {511 panic!("assertion failed ({:?}): no message", value);512 }513 }514 },405 Error(e) => panic!("error: {}", evaluate(context, eval_state, e)),515 Error(e) => panic!("error: {}", evaluate(context, eval_state, e)),406 IfElse {516 IfElse {407 cond,517 cond,crates/jsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/lib.rs
+++ b/crates/jsonnet-evaluator/src/lib.rs
@@ -359,7 +359,12 @@
#[test]
fn json() {
- println!("{:?}", eval_stdlib!(r#"std.manifestJson({a:3, b:4, c:6})"#));
+ println!("{:?}", eval_stdlib!(r#"std.manifestJsonEx({a:3, b:4, c:6},"")"#));
+ }
+
+ #[test]
+ fn test() {
+ assert_json_stdlib!(r#"[[a, b] for a in [1,2,3] for b in [4,5,6]]"#, "");
}
#[test]
crates/jsonnet-evaluator/src/obj.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/obj.rs
+++ b/crates/jsonnet-evaluator/src/obj.rs
@@ -1,5 +1,5 @@
-use crate::{evaluate_binary_op, Binding, Val};
-use jsonnet_parser::{BinaryOpType, Visibility};
+use crate::{evaluate_add_op, Binding, Val};
+use jsonnet_parser::Visibility;
use std::{
cell::RefCell,
collections::{BTreeMap, BTreeSet, HashMap},
@@ -90,9 +90,8 @@
(Some(k), Some(s)) => {
let our = k.invoke.0(Some(real_this.clone()), self.0.super_obj.clone());
if k.add {
- s.get_raw(key, real_this).map_or(Some(our.clone()), |v| {
- Some(evaluate_binary_op(&v, BinaryOpType::Add, &our))
- })
+ s.get_raw(key, real_this)
+ .map_or(Some(our.clone()), |v| Some(evaluate_add_op(&v, &our)))
} else {
Some(our)
}
crates/jsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/val.rs
+++ b/crates/jsonnet-evaluator/src/val.rs
@@ -117,6 +117,18 @@
Intristic(String, String),
}
impl Val {
+ pub fn try_cast_bool(self) -> bool {
+ match self.unwrap_if_lazy() {
+ Val::Bool(v) => v,
+ v => panic!("expected bool, got {:?}", v),
+ }
+ }
+ pub fn try_cast_str(self) -> String {
+ match self.unwrap_if_lazy() {
+ Val::Str(v) => v,
+ v => panic!("expected bool, got {:?}", v),
+ }
+ }
pub fn unwrap_if_lazy(self) -> Self {
if let Val::Lazy(v) = self {
v.evaluate().unwrap_if_lazy()
crates/jsonnet-parser/src/expr.rsdiffbeforeafterboth--- a/crates/jsonnet-parser/src/expr.rs
+++ b/crates/jsonnet-parser/src/expr.rs
@@ -165,7 +165,7 @@
/// ]
/// ],
/// ```
- ArrComp(LocExpr, ForSpecData, Vec<CompSpec>),
+ ArrComp(LocExpr, Vec<CompSpec>),
/// Object: {a: 2}
Obj(ObjBody),
crates/jsonnet-parser/src/lib.rsdiffbeforeafterboth--- a/crates/jsonnet-parser/src/lib.rs
+++ b/crates/jsonnet-parser/src/lib.rs
@@ -125,7 +125,7 @@
pub rule string_expr(s: &ParserSettings) -> LocExpr = l(s, <s:string() {Expr::Str(s)}>)
pub rule obj_expr(s: &ParserSettings) -> LocExpr = l(s,<"{" _ body:objinside(s) _ "}" {Expr::Obj(body)}>)
pub rule array_expr(s: &ParserSettings) -> LocExpr = l(s,<"[" _ elems:(expr(s) ** comma()) _ comma()? "]" {Expr::Arr(elems)}>)
- pub rule array_comp_expr(s: &ParserSettings) -> LocExpr = l(s,<"[" _ expr:expr(s) _ comma()? _ forspec:forspec(s) _ others:(others: compspec(s) _ {others})? "]" {Expr::ArrComp(expr, forspec, others.unwrap_or_default())}>)
+ pub rule array_comp_expr(s: &ParserSettings) -> LocExpr = l(s,<"[" _ expr:expr(s) _ comma()? _ forspec:forspec(s) _ others:(others: compspec(s) _ {others})? "]" {Expr::ArrComp(expr, [vec![CompSpec::ForSpec(forspec)], others.unwrap_or_default()].concat())}>)
pub rule number_expr(s: &ParserSettings) -> LocExpr = l(s,<n:number() { expr::Expr::Num(n) }>)
pub rule var_expr(s: &ParserSettings) -> LocExpr = l(s,<n:id() { expr::Expr::Var(n) }>)
pub rule if_then_else_expr(s: &ParserSettings) -> LocExpr = l(s,<cond:ifspec(s) _ keyword("then") _ cond_then:expr(s) cond_else:(_ keyword("else") _ e:expr(s) {e})? {Expr::IfElse{
@@ -252,15 +252,18 @@
jsonnet_parser::jsonnet(str, settings)
}
+#[macro_export]
+macro_rules! el {
+ ($expr:expr) => {
+ LocExpr(std::rc::Rc::new($expr), None)
+ };
+}
+
#[cfg(test)]
pub mod tests {
use super::{expr::*, parse};
use crate::ParserSettings;
- macro_rules! el {
- ($expr:expr) => {
- LocExpr(std::rc::Rc::new($expr), None)
- };
- }
+
macro_rules! parse {
($s:expr) => {
parse(
@@ -390,8 +393,10 @@
)),
ArgsDesc(vec![Arg(None, el!(Var("x".to_owned())))])
)),
- ForSpecData("x".to_owned(), el!(Var("arr".to_owned()))),
- vec![]
+ vec![CompSpec::ForSpec(ForSpecData(
+ "x".to_owned(),
+ el!(Var("arr".to_owned()))
+ ))]
)),
)
}
@@ -403,24 +408,26 @@
parse!("[k for k in std.objectFields(patch) if patch[k] == null]"),
el!(ArrComp(
el!(Var("k".to_owned())),
- ForSpecData(
- "k".to_owned(),
- el!(Apply(
+ vec![
+ CompSpec::ForSpec(ForSpecData(
+ "k".to_owned(),
+ el!(Apply(
+ el!(Index(
+ el!(Var("std".to_owned())),
+ el!(Str("objectFields".to_owned()))
+ )),
+ ArgsDesc(vec![Arg(None, el!(Var("patch".to_owned())))])
+ ))
+ )),
+ CompSpec::IfSpec(IfSpecData(el!(BinaryOp(
el!(Index(
- el!(Var("std".to_owned())),
- el!(Str("objectFields".to_owned()))
+ el!(Var("patch".to_owned())),
+ el!(Var("k".to_owned()))
)),
- ArgsDesc(vec![Arg(None, el!(Var("patch".to_owned())))])
- ))
- ),
- vec![CompSpec::IfSpec(IfSpecData(el!(BinaryOp(
- el!(Index(
- el!(Var("patch".to_owned())),
- el!(Var("k".to_owned()))
- )),
- BinaryOpType::Eq,
- el!(Literal(LiteralType::Null))
- ))))]
+ BinaryOpType::Eq,
+ el!(Literal(LiteralType::Null))
+ ))))
+ ]
))
);
}