difftreelog
fix make jsonnet tests partially pass
in: master
3 files changed
crates/jsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth1use crate::{2 binding, context_creator, create_error, function_default, function_rhs, future_wrapper,3 lazy_binding, lazy_val, push, Context, ContextCreator, FuncDesc, LazyBinding, ObjMember,4 ObjValue, Result, Val,5};6use closure::closure;7use jsonnet_parser::{8 ArgsDesc, AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, FieldMember, ForSpecData,9 IfSpecData, LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType, 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(args) = &b.params {19 let args = args.clone();20 (21 b.name.clone(),22 lazy_binding!(move |this, super_obj| Ok(lazy_val!(23 closure!(clone b, clone args, clone context_creator, || Ok(evaluate_method(24 context_creator.0(this.clone(), super_obj.clone())?,25 &b.value,26 args.clone()27 )))28 ))),29 )30 } else {31 (32 b.name.clone(),33 lazy_binding!(move |this, super_obj| {34 Ok(lazy_val!(35 closure!(clone context_creator, clone b, || evaluate(36 context_creator.0(this.clone(), super_obj.clone())?,37 &b.value38 ))39 ))40 }),41 )42 }43}4445pub fn evaluate_method(ctx: Context, expr: &LocExpr, arg_spec: ParamsDesc) -> Val {46 Val::Func(FuncDesc {47 ctx,48 params: arg_spec,49 eval_rhs: function_rhs!(closure!(clone expr, |ctx| evaluate(ctx, &expr))),50 eval_default: function_default!(closure!(|ctx, default| evaluate(ctx, &default))),51 })52}5354pub fn evaluate_field_name(55 context: Context,56 field_name: &jsonnet_parser::FieldName,57) -> Result<String> {58 Ok(match field_name {59 jsonnet_parser::FieldName::Fixed(n) => n.clone(),60 jsonnet_parser::FieldName::Dyn(expr) => {61 evaluate(context, expr)?.try_cast_str("dynamic field name")?62 }63 })64}6566pub fn evaluate_unary_op(op: UnaryOpType, b: &Val) -> Result<Val> {67 Ok(match (op, b) {68 (o, Val::Lazy(l)) => evaluate_unary_op(o, &l.evaluate()?)?,69 (UnaryOpType::Not, Val::Bool(v)) => Val::Bool(!v),70 (UnaryOpType::Minus, Val::Num(n)) => Val::Num(-*n),71 (UnaryOpType::BitNot, Val::Num(n)) => Val::Num(!(*n as i32) as f64),72 (op, o) => panic!("unary op not implemented: {:?} {:?}", op, o),73 })74}7576pub(crate) fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {77 Ok(match (a, b) {78 (Val::Str(v1), Val::Str(v2)) => Val::Str(v1.to_owned() + &v2),7980 (Val::Str(v1), Val::Num(v2)) => Val::Str(format!("{}{}", v1, v2)),81 (Val::Num(v1), Val::Str(v2)) => Val::Str(format!("{}{}", v1, v2)),82 (Val::Str(v1), Val::Bool(v2)) => Val::Str(format!("{}{}", v1, v2)),83 (Val::Bool(v1), Val::Str(v2)) => Val::Str(format!("{}{}", v1, v2)),84 (Val::Str(v1), Val::Null) => Val::Str(format!("{}null", v1)),85 (Val::Null, Val::Str(v2)) => Val::Str(format!("null{}", v2)),8687 (Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),88 (Val::Arr(a), Val::Arr(b)) => Val::Arr([&a[..], &b[..]].concat()),89 (Val::Num(v1), Val::Num(v2)) => Val::Num(v1 + v2),90 _ => panic!("can't add: {:?} and {:?}", a, b),91 })92}9394pub fn evaluate_binary_op_special(95 context: Context,96 a: &LocExpr,97 op: BinaryOpType,98 b: &LocExpr,99) -> Result<Val> {100 Ok(101 match (evaluate(context.clone(), &a)?.unwrap_if_lazy()?, op, b) {102 (Val::Bool(true), BinaryOpType::Or, _o) => Val::Bool(true),103 (Val::Bool(false), BinaryOpType::And, _o) => Val::Bool(false),104 (a, op, eb) => {105 evaluate_binary_op_normal(&a, op, &evaluate(context, eb)?.unwrap_if_lazy()?)?106 }107 },108 )109}110111pub fn evaluate_binary_op_normal(a: &Val, op: BinaryOpType, b: &Val) -> Result<Val> {112 Ok(match (a, op, b) {113 (a, BinaryOpType::Add, b) => evaluate_add_op(a, b)?,114115 (Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize)),116117 // Bool X Bool118 (Val::Bool(a), BinaryOpType::And, Val::Bool(b)) => Val::Bool(*a && *b),119 (Val::Bool(a), BinaryOpType::Or, Val::Bool(b)) => Val::Bool(*a || *b),120121 // Str X Str122 (Val::Str(v1), BinaryOpType::Lt, Val::Str(v2)) => Val::Bool(v1 < v2),123 (Val::Str(v1), BinaryOpType::Gt, Val::Str(v2)) => Val::Bool(v1 > v2),124 (Val::Str(v1), BinaryOpType::Lte, Val::Str(v2)) => Val::Bool(v1 <= v2),125 (Val::Str(v1), BinaryOpType::Gte, Val::Str(v2)) => Val::Bool(v1 >= v2),126127 // Num X Num128 (Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),129 (Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => Val::Num(v1 / v2),130131 (Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::Num(v1 - v2),132133 (Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => Val::Bool(v1 < v2),134 (Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => Val::Bool(v1 > v2),135 (Val::Num(v1), BinaryOpType::Lte, Val::Num(v2)) => Val::Bool(v1 <= v2),136 (Val::Num(v1), BinaryOpType::Gte, Val::Num(v2)) => Val::Bool(v1 >= v2),137138 (Val::Num(v1), BinaryOpType::BitAnd, Val::Num(v2)) => {139 Val::Num(((*v1 as i32) & (*v2 as i32)) as f64)140 }141 (Val::Num(v1), BinaryOpType::BitOr, Val::Num(v2)) => {142 Val::Num(((*v1 as i32) | (*v2 as i32)) as f64)143 }144 (Val::Num(v1), BinaryOpType::BitXor, Val::Num(v2)) => {145 Val::Num(((*v1 as i32) ^ (*v2 as i32)) as f64)146 }147 (Val::Num(v1), BinaryOpType::Lhs, Val::Num(v2)) => {148 Val::Num(((*v1 as i32) << (*v2 as i32)) as f64)149 }150 (Val::Num(v1), BinaryOpType::Rhs, Val::Num(v2)) => {151 Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)152 }153154 _ => panic!("no rules for binary operation: {:?} {:?} {:?}", a, op, b),155 })156}157158future_wrapper!(HashMap<String, LazyBinding>, FutureNewBindings);159future_wrapper!(ObjValue, FutureObjValue);160161pub fn evaluate_comp(162 context: Context,163 value: &LocExpr,164 specs: &[CompSpec],165) -> Result<Option<Vec<Val>>> {166 Ok(match specs.get(0) {167 None => Some(vec![evaluate(context, &value)?]),168 Some(CompSpec::IfSpec(IfSpecData(cond))) => {169 if evaluate(context.clone(), &cond)?.try_cast_bool("if spec")? {170 evaluate_comp(context, value, &specs[1..])?171 } else {172 None173 }174 }175 Some(CompSpec::ForSpec(ForSpecData(var, expr))) => {176 match evaluate(context.clone(), &expr)?.unwrap_if_lazy()? {177 Val::Arr(list) => {178 let mut out = Vec::new();179 for item in list {180 let item = item.clone().unwrap_if_lazy()?;181 out.push(evaluate_comp(182 context.with_var(var.clone(), item)?,183 value,184 &specs[1..],185 )?);186 }187 Some(out.iter().flatten().flatten().cloned().collect())188 }189 _ => panic!("for expression evaluated to non-iterable value"),190 }191 }192 })193}194195// TODO: Asserts196pub fn evaluate_object(context: Context, object: ObjBody) -> Result<ObjValue> {197 Ok(match object {198 ObjBody::MemberList(members) => {199 let new_bindings = FutureNewBindings::new();200 let future_this = FutureObjValue::new();201 let context_creator = context_creator!(202 closure!(clone context, clone new_bindings, clone future_this, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {203 Ok(context.clone().extend(204 new_bindings.clone().unwrap(),205 context.clone().dollar().clone().or_else(||this.clone()),206 Some(this.unwrap()),207 super_obj208 )?)209 })210 );211 {212 let mut bindings: HashMap<String, LazyBinding> = HashMap::new();213 for (n, b) in members214 .iter()215 .filter_map(|m| match m {216 Member::BindStmt(b) => Some(b.clone()),217 _ => None,218 })219 .map(|b| evaluate_binding(&b, context_creator.clone()))220 {221 bindings.insert(n, b);222 }223 new_bindings.fill(bindings);224 }225226 let mut new_members = BTreeMap::new();227 for member in members.into_iter() {228 match member {229 Member::Field(FieldMember {230 name,231 plus,232 params: None,233 visibility,234 value,235 }) => {236 let name = evaluate_field_name(context.clone(), &name)?;237 new_members.insert(238 name.clone(),239 ObjMember {240 add: plus,241 visibility: visibility.clone(),242 invoke: binding!(243 closure!(clone name, clone value, clone context_creator, |this, super_obj| {244 push(value.clone(), "object ".to_owned()+&name+" field", ||{245 let context = context_creator.0(this, super_obj)?;246 evaluate(247 context,248 &value,249 )?.unwrap_if_lazy()250 })251 })252 ),253 },254 );255 }256 Member::Field(FieldMember {257 name,258 params: Some(params),259 value,260 ..261 }) => {262 let name = evaluate_field_name(context.clone(), &name)?;263 new_members.insert(264 name,265 ObjMember {266 add: false,267 visibility: Visibility::Hidden,268 invoke: binding!(269 closure!(clone value, clone context_creator, |this, super_obj| {270 // TODO: Assert271 Ok(evaluate_method(272 context_creator.0(this, super_obj)?,273 &value.clone(),274 params.clone(),275 ))276 })277 ),278 },279 );280 }281 Member::BindStmt(_) => {}282 Member::AssertStmt(_) => {}283 }284 }285 future_this.fill(ObjValue::new(None, Rc::new(new_members)))286 }287 _ => todo!(),288 })289}290291pub fn evaluate(context: Context, expr: &LocExpr) -> Result<Val> {292 use Expr::*;293 let locexpr = expr.clone();294 let LocExpr(expr, loc) = expr;295 Ok(match &**expr {296 Literal(LiteralType::This) => Val::Obj(297 context298 .this()299 .clone()300 .unwrap_or_else(|| panic!("this not found")),301 ),302 Literal(LiteralType::Super) => Val::Obj(303 context304 .super_obj()305 .clone()306 .unwrap_or_else(|| panic!("super not found")),307 ),308 Literal(LiteralType::Dollar) => Val::Obj(309 context310 .dollar()311 .clone()312 .unwrap_or_else(|| panic!("dollar not found")),313 ),314 Literal(LiteralType::True) => Val::Bool(true),315 Literal(LiteralType::False) => Val::Bool(false),316 Literal(LiteralType::Null) => Val::Null,317 Parened(e) => evaluate(context, e)?,318 Str(v) => Val::Str(v.clone()),319 Num(v) => Val::Num(*v),320 BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,321 UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,322 Var(name) => Val::Lazy(context.binding(&name)).unwrap_if_lazy()?,323 Index(value, index) => {324 match (325 evaluate(context.clone(), value)?.unwrap_if_lazy()?,326 evaluate(context, index)?,327 ) {328 (Val::Obj(v), Val::Str(s)) => {329 if let Some(v) = v.get(&s)? {330 v.unwrap_if_lazy()?331 } else if let Some(Val::Str(n)) = v.get("__intristic_namespace__")? {332 Val::Intristic(n, s)333 } else {334 create_error(crate::Error::NoSuchField(s))?335 }336 }337 (Val::Arr(v), Val::Num(n)) => v338 .get(n as usize)339 .unwrap_or_else(|| panic!("out of bounds"))340 .clone()341 .unwrap_if_lazy()?,342 (Val::Str(s), Val::Num(n)) => {343 Val::Str(s.chars().skip(n as usize).take(1).collect())344 }345 (v, i) => todo!("not implemented: {:?}[{:?}]", v, i.unwrap_if_lazy()),346 }347 }348 LocalExpr(bindings, returned) => {349 let mut new_bindings: HashMap<String, LazyBinding> = HashMap::new();350 let future_context = Context::new_future();351352 let context_creator = context_creator!(353 closure!(clone future_context, |_, _| Ok(future_context.clone().unwrap()))354 );355356 for (k, v) in bindings357 .iter()358 .map(|b| evaluate_binding(b, context_creator.clone()))359 {360 new_bindings.insert(k, v);361 }362363 let context = context364 .extend(new_bindings, None, None, None)?365 .into_future(future_context);366 evaluate(context, &returned.clone())?367 }368 Arr(items) => {369 let mut out = Vec::with_capacity(items.len());370 for item in items {371 out.push(Val::Lazy(lazy_val!(372 closure!(clone context, clone item, || {373 evaluate(context.clone(), &item)374 })375 )));376 }377 Val::Arr(out)378 }379 ArrComp(expr, compspecs) => Val::Arr(380 // First compspec should be forspec, so no "None" possible here381 evaluate_comp(context, expr, compspecs)?.unwrap(),382 ),383 Obj(body) => Val::Obj(evaluate_object(context, body.clone())?),384 Apply(value, ArgsDesc(args)) => {385 let value = evaluate(context.clone(), value)?.unwrap_if_lazy()?;386 match value {387 Val::Intristic(ns, name) => match (&ns as &str, &name as &str) {388 // arr/string/function389 ("std", "length") => {390 assert_eq!(args.len(), 1);391 let expr = &args.get(0).unwrap().1;392 match evaluate(context, expr)? {393 Val::Str(n) => Val::Num(n.chars().count() as f64),394 Val::Arr(i) => Val::Num(i.len() as f64),395 v => panic!("can't get length of {:?}", v),396 }397 }398 // any399 ("std", "type") => {400 assert_eq!(args.len(), 1);401 let expr = &args.get(0).unwrap().1;402 Val::Str(evaluate(context, expr)?.value_type()?.name().to_owned())403 }404 // length, idx=>any405 ("std", "makeArray") => {406 assert_eq!(args.len(), 2);407 if let (Val::Num(v), Val::Func(d)) = (408 evaluate(context.clone(), &args[0].1)?,409 evaluate(context, &args[1].1)?,410 ) {411 assert!(v > 0.0);412 let mut out = Vec::with_capacity(v as usize);413 for i in 0..v as usize {414 out.push(d.evaluate(vec![(None, Val::Num(i as f64))])?)415 }416 Val::Arr(out)417 } else {418 panic!("bad makeArray call");419 }420 }421 // string422 ("std", "codepoint") => {423 assert_eq!(args.len(), 1);424 if let Val::Str(s) = evaluate(context, &args[0].1)? {425 assert!(426 s.chars().count() == 1,427 "std.codepoint should receive single char string"428 );429 Val::Num(s.chars().take(1).next().unwrap() as u32 as f64)430 } else {431 panic!("bad codepoint call");432 }433 }434 // object, includeHidden435 ("std", "objectFieldsEx") => {436 assert_eq!(args.len(), 2);437 if let (Val::Obj(body), Val::Bool(_include_hidden)) = (438 evaluate(context.clone(), &args[0].1)?,439 evaluate(context, &args[1].1)?,440 ) {441 // TODO: handle visibility (_include_hidden)442 Val::Arr(body.fields().into_iter().map(Val::Str).collect())443 } else {444 panic!("bad objectFieldsEx call");445 }446 }447 ("std", "primitiveEquals") => {448 assert_eq!(args.len(), 2);449 let (a, b) = (450 evaluate(context.clone(), &args[0].1)?,451 evaluate(context, &args[1].1)?,452 );453 Val::Bool(a == b)454 }455 (ns, name) => panic!("Intristic not found: {}.{}", ns, name),456 },457 Val::Func(f) => push(locexpr, "function call".to_owned(), || {458 f.evaluate(459 args.clone()460 .into_iter()461 .map(move |a| {462 (463 a.clone().0,464 Val::Lazy(lazy_val!(465 closure!(clone context, clone a, || evaluate(context.clone(), &a.clone().1))466 )),467 )468 })469 .collect(),470 )471 })?,472 _ => panic!("{:?} is not a function", value),473 }474 }475 Function(params, body) => evaluate_method(context, body, params.clone()),476 AssertExpr(AssertStmt(value, msg), returned) => {477 let assertion_result = push(value.clone(), "assertion condition".to_owned(), || {478 evaluate(context.clone(), &value)?479 .try_cast_bool("assertion condition should be boolean")480 })?;481 if assertion_result {482 push(483 returned.clone(),484 "assert 'return' branch".to_owned(),485 || evaluate(context, returned),486 )?487 } else if let Some(msg) = msg {488 panic!(489 "assertion failed ({:?}): {}",490 value,491 evaluate(context, msg)?.try_cast_str("assertion message should be string")?492 );493 } else {494 panic!("assertion failed ({:?}): no message", value);495 }496 }497 Error(e) => create_error(crate::Error::RuntimeError(498 evaluate(context, e)?.try_cast_str("error text should be string")?,499 ))?,500 IfElse {501 cond,502 cond_then,503 cond_else,504 } => {505 let condition_result = push(cond.0.clone(), "if condition".to_owned(), || {506 evaluate(context.clone(), &cond.0)?.try_cast_bool("if condition should be boolean")507 })?;508 if condition_result {509 push(510 cond_then.clone(),511 "if condition 'then' branch".to_owned(),512 || evaluate(context, cond_then),513 )?514 } else {515 match cond_else {516 Some(v) => push(v.clone(), "if condition 'else' branch".to_owned(), || {517 evaluate(context, v)518 })?,519 None => Val::Bool(false),520 }521 }522 }523 _ => panic!(524 "evaluation not implemented: {:?}",525 LocExpr(expr.clone(), loc.clone())526 ),527 })528}crates/jsonnet-evaluator/src/obj.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/obj.rs
+++ b/crates/jsonnet-evaluator/src/obj.rs
@@ -83,7 +83,7 @@
Ok(None)
}
}
- fn get_raw(&self, key: &str, real_this: &ObjValue) -> Result<Option<Val>> {
+ pub(crate) fn get_raw(&self, key: &str, real_this: &ObjValue) -> Result<Option<Val>> {
match (self.0.this_entries.get(key), &self.0.super_obj) {
(Some(k), None) => Ok(Some(k.invoke.0(
Some(real_this.clone()),
crates/jsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/val.rs
+++ b/crates/jsonnet-evaluator/src/val.rs
@@ -3,7 +3,7 @@
ObjValue, Result,
};
use closure::closure;
-use jsonnet_parser::ParamsDesc;
+use jsonnet_parser::{Param, ParamsDesc};
use std::{
cell::RefCell,
collections::HashMap,
@@ -70,19 +70,15 @@
let mut new_bindings: HashMap<String, LazyBinding> = HashMap::new();
let future_ctx = Context::new_future();
- // self.params
- // .with_defaults()
- // .into_iter()
- // .for_each(|Param(name, default)| {
- // let default = Rc::new(*default.unwrap());
- // new_bindings.insert(
- // name,
- // binding!(move |_, _| Val::Lazy(lazy_val!(|| self
- // .eval_default
- // .0
- // .default(future_ctx.unwrap(), *default.clone())))),
- // );
- // });
+ for Param(name, default) in self.params.with_defaults() {
+ let default = default.unwrap();
+ let eval_default = self.eval_default.clone();
+ new_bindings.insert(
+ name,
+ lazy_binding!(closure!(clone future_ctx, clone default, clone eval_default, |_, _| Ok(lazy_val!(closure!(clone future_ctx, clone eval_default, clone default, || (eval_default.clone()).0
+ (future_ctx.clone().unwrap(), default.clone())))))),
+ );
+ }
for (name, val) in args.clone().into_iter().filter(|e| e.0.is_some()) {
new_bindings.insert(
name.as_ref().unwrap().clone(),