difftreelog
fix(evaluator) arrays should be lazy
in: master
2 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 el, Arg, ArgsDesc, AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, FieldMember,9 ForSpecData, IfSpecData, LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType,10 Visibility,11};12use std::{13 collections::{BTreeMap, HashMap},14 rc::Rc,15};1617pub fn evaluate_binding(b: &BindSpec, context_creator: ContextCreator) -> (String, LazyBinding) {18 let b = b.clone();19 if let Some(args) = &b.params {20 let args = args.clone();21 (22 b.name.clone(),23 lazy_binding!(move |this, super_obj| Ok(lazy_val!(24 closure!(clone b, clone args, clone context_creator, || Ok(evaluate_method(25 context_creator.0(this.clone(), super_obj.clone())?,26 &b.value,27 args.clone()28 )))29 ))),30 )31 } else {32 (33 b.name.clone(),34 lazy_binding!(move |this, super_obj| {35 Ok(lazy_val!(36 closure!(clone context_creator, clone b, || evaluate(37 context_creator.0(this.clone(), super_obj.clone())?,38 &b.value39 ))40 ))41 }),42 )43 }44}4546pub fn evaluate_method(ctx: Context, expr: &LocExpr, arg_spec: ParamsDesc) -> Val {47 Val::Func(FuncDesc {48 ctx,49 params: arg_spec,50 eval_rhs: function_rhs!(closure!(clone expr, |ctx| evaluate(ctx, &expr))),51 eval_default: function_default!(closure!(|ctx, default| evaluate(ctx, &default))),52 })53}5455pub fn evaluate_field_name(56 context: Context,57 field_name: &jsonnet_parser::FieldName,58) -> Result<String> {59 Ok(match field_name {60 jsonnet_parser::FieldName::Fixed(n) => n.clone(),61 jsonnet_parser::FieldName::Dyn(expr) => {62 evaluate(context, expr)?.try_cast_str("dynamic field name")?63 }64 })65}6667pub fn evaluate_unary_op(op: UnaryOpType, b: &Val) -> Result<Val> {68 Ok(match (op, b) {69 (o, Val::Lazy(l)) => evaluate_unary_op(o, &l.evaluate()?)?,70 (UnaryOpType::Not, Val::Bool(v)) => Val::Bool(!v),71 (UnaryOpType::Minus, Val::Num(n)) => Val::Num(-*n),72 (UnaryOpType::BitNot, Val::Num(n)) => Val::Num(!(*n as i32) as f64),73 (op, o) => panic!("unary op not implemented: {:?} {:?}", op, o),74 })75}7677pub(crate) fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {78 Ok(match (a, b) {79 (Val::Str(v1), Val::Str(v2)) => Val::Str(v1.to_owned() + &v2),8081 (Val::Str(v1), Val::Num(v2)) => Val::Str(format!("{}{}", v1, v2)),82 (Val::Num(v1), Val::Str(v2)) => Val::Str(format!("{}{}", v1, v2)),83 (Val::Str(v1), Val::Bool(v2)) => Val::Str(format!("{}{}", v1, v2)),84 (Val::Bool(v1), Val::Str(v2)) => Val::Str(format!("{}{}", v1, v2)),85 (Val::Str(v1), Val::Null) => Val::Str(format!("{}null", v1)),86 (Val::Null, Val::Str(v2)) => Val::Str(format!("null{}", v2)),8788 (Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),89 (Val::Arr(a), Val::Arr(b)) => Val::Arr([&a[..], &b[..]].concat()),90 (Val::Num(v1), Val::Num(v2)) => Val::Num(v1 + v2),91 _ => panic!("can't add: {:?} and {:?}", a, b),92 })93}9495pub fn evaluate_binary_op_special(96 context: Context,97 a: &LocExpr,98 op: BinaryOpType,99 b: &LocExpr,100) -> Result<Val> {101 Ok(102 match (evaluate(context.clone(), &a)?.unwrap_if_lazy()?, op, b) {103 (Val::Bool(true), BinaryOpType::Or, _o) => Val::Bool(true),104 (Val::Bool(false), BinaryOpType::And, _o) => Val::Bool(false),105 (a, op, eb) => evaluate_binary_op_normal(106 context.clone(),107 &a,108 op,109 &evaluate(context, eb)?.unwrap_if_lazy()?,110 )?,111 },112 )113}114115pub fn evaluate_binary_op_normal(116 context: Context,117 a: &Val,118 op: BinaryOpType,119 b: &Val,120) -> Result<Val> {121 Ok(match (a, op, b) {122 (a, BinaryOpType::Add, b) => evaluate_add_op(a, b)?,123124 (Val::Str(v1), BinaryOpType::Ne, Val::Str(v2)) => Val::Bool(v1 != v2),125126 (Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize)),127 (Val::Str(format), BinaryOpType::Mod, args) => evaluate(128 context129 .with_var("__tmp__format__".to_owned(), Val::Str(format.to_owned()))?130 .with_var(131 "__tmp__args__".to_owned(),132 match args {133 Val::Arr(v) => Val::Arr(v.clone()),134 v => Val::Arr(vec![v.clone()]),135 },136 )?,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 )?,148149 (Val::Bool(a), BinaryOpType::And, Val::Bool(b)) => Val::Bool(*a && *b),150 (Val::Bool(a), BinaryOpType::Or, Val::Bool(b)) => Val::Bool(*a || *b),151152 (Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),153 (Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => Val::Num(v1 / v2),154 (Val::Num(v1), BinaryOpType::Mod, Val::Num(v2)) => Val::Num(v1 % v2),155156 (Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::Num(v1 - v2),157158 (Val::Num(v1), BinaryOpType::Lhs, Val::Num(v2)) => {159 Val::Num(((*v1 as i32) << (*v2 as i32)) as f64)160 }161 (Val::Num(v1), BinaryOpType::Rhs, Val::Num(v2)) => {162 Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)163 }164165 (Val::Str(v1), BinaryOpType::Lt, Val::Str(v2)) => Val::Bool(v1 < v2),166 (Val::Str(v1), BinaryOpType::Gt, Val::Str(v2)) => Val::Bool(v1 > v2),167 (Val::Str(v1), BinaryOpType::Lte, Val::Str(v2)) => Val::Bool(v1 <= v2),168 (Val::Str(v1), BinaryOpType::Gte, Val::Str(v2)) => Val::Bool(v1 >= v2),169170 (Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => Val::Bool(v1 < v2),171 (Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => Val::Bool(v1 > v2),172 (Val::Num(v1), BinaryOpType::Lte, Val::Num(v2)) => Val::Bool(v1 <= v2),173 (Val::Num(v1), BinaryOpType::Gte, Val::Num(v2)) => Val::Bool(v1 >= v2),174175 (Val::Num(v1), BinaryOpType::Eq, Val::Num(v2)) => Val::Bool((v1 - v2).abs() < f64::EPSILON),176 (Val::Num(v1), BinaryOpType::Ne, Val::Num(v2)) => Val::Bool((v1 - v2).abs() > f64::EPSILON),177178 (Val::Num(v1), BinaryOpType::BitAnd, Val::Num(v2)) => {179 Val::Num(((*v1 as i32) & (*v2 as i32)) as f64)180 }181 (Val::Num(v1), BinaryOpType::BitOr, Val::Num(v2)) => {182 Val::Num(((*v1 as i32) | (*v2 as i32)) as f64)183 }184 (Val::Num(v1), BinaryOpType::BitXor, Val::Num(v2)) => {185 Val::Num(((*v1 as i32) ^ (*v2 as i32)) as f64)186 }187 (a, BinaryOpType::Eq, b) => Val::Bool(a == b),188 (a, BinaryOpType::Ne, b) => Val::Bool(a != b),189 _ => panic!("no rules for binary operation: {:?} {:?} {:?}", a, op, b),190 })191}192193future_wrapper!(HashMap<String, LazyBinding>, FutureNewBindings);194future_wrapper!(ObjValue, FutureObjValue);195196pub fn evaluate_comp(197 context: Context,198 value: &LocExpr,199 specs: &[CompSpec],200) -> Result<Option<Vec<Val>>> {201 Ok(match specs.get(0) {202 None => Some(vec![evaluate(context, &value)?]),203 Some(CompSpec::IfSpec(IfSpecData(cond))) => {204 if evaluate(context.clone(), &cond)?.try_cast_bool("if spec")? {205 evaluate_comp(context, value, &specs[1..])?206 } else {207 None208 }209 }210 Some(CompSpec::ForSpec(ForSpecData(var, expr))) => {211 match evaluate(context.clone(), &expr)?.unwrap_if_lazy()? {212 Val::Arr(list) => {213 let mut out = Vec::new();214 for item in list {215 let item = item.clone();216 out.push(evaluate_comp(217 context.with_var(var.clone(), item)?,218 value,219 &specs[1..],220 )?);221 }222 Some(out.iter().flatten().flatten().cloned().collect())223 }224 _ => panic!("for expression evaluated to non-iterable value"),225 }226 }227 })228}229230// TODO: Asserts231pub fn evaluate_object(context: Context, object: ObjBody) -> Result<ObjValue> {232 Ok(match object {233 ObjBody::MemberList(members) => {234 let new_bindings = FutureNewBindings::new();235 let future_this = FutureObjValue::new();236 let context_creator = context_creator!(237 closure!(clone context, clone new_bindings, clone future_this, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {238 Ok(context.clone().extend(239 new_bindings.clone().unwrap(),240 context.clone().dollar().clone().or_else(||this.clone()),241 Some(this.unwrap()),242 super_obj243 )?)244 })245 );246 {247 let mut bindings: HashMap<String, LazyBinding> = HashMap::new();248 for (n, b) in members249 .iter()250 .filter_map(|m| match m {251 Member::BindStmt(b) => Some(b.clone()),252 _ => None,253 })254 .map(|b| evaluate_binding(&b, context_creator.clone()))255 {256 bindings.insert(n, b);257 }258 new_bindings.fill(bindings);259 }260261 let mut new_members = BTreeMap::new();262 for member in members.into_iter() {263 match member {264 Member::Field(FieldMember {265 name,266 plus,267 params: None,268 visibility,269 value,270 }) => {271 let name = evaluate_field_name(context.clone(), &name)?;272 new_members.insert(273 name.clone(),274 ObjMember {275 add: plus,276 visibility: visibility.clone(),277 invoke: binding!(278 closure!(clone name, clone value, clone context_creator, |this, super_obj| {279 push(value.clone(), "object ".to_owned()+&name+" field", ||{280 let context = context_creator.0(this, super_obj)?;281 evaluate(282 context,283 &value,284 )?.unwrap_if_lazy()285 })286 })287 ),288 },289 );290 }291 Member::Field(FieldMember {292 name,293 params: Some(params),294 value,295 ..296 }) => {297 let name = evaluate_field_name(context.clone(), &name)?;298 new_members.insert(299 name,300 ObjMember {301 add: false,302 visibility: Visibility::Hidden,303 invoke: binding!(304 closure!(clone value, clone context_creator, |this, super_obj| {305 // TODO: Assert306 Ok(evaluate_method(307 context_creator.0(this, super_obj)?,308 &value.clone(),309 params.clone(),310 ))311 })312 ),313 },314 );315 }316 Member::BindStmt(_) => {}317 Member::AssertStmt(_) => {}318 }319 }320 future_this.fill(ObjValue::new(None, Rc::new(new_members)))321 }322 _ => todo!(),323 })324}325326pub fn evaluate(context: Context, expr: &LocExpr) -> Result<Val> {327 use Expr::*;328 let locexpr = expr.clone();329 let LocExpr(expr, loc) = expr;330 Ok(match &**expr {331 Literal(LiteralType::This) => Val::Obj(332 context333 .this()334 .clone()335 .unwrap_or_else(|| panic!("this not found")),336 ),337 Literal(LiteralType::Super) => Val::Obj(338 context339 .super_obj()340 .clone()341 .unwrap_or_else(|| panic!("super not found")),342 ),343 Literal(LiteralType::Dollar) => Val::Obj(344 context345 .dollar()346 .clone()347 .unwrap_or_else(|| panic!("dollar not found")),348 ),349 Literal(LiteralType::True) => Val::Bool(true),350 Literal(LiteralType::False) => Val::Bool(false),351 Literal(LiteralType::Null) => Val::Null,352 Parened(e) => evaluate(context, e)?,353 Str(v) => Val::Str(v.clone()),354 Num(v) => Val::Num(*v),355 BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,356 UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,357 Var(name) => Val::Lazy(context.binding(&name)).unwrap_if_lazy()?,358 Index(value, index) => {359 match (360 evaluate(context.clone(), value)?.unwrap_if_lazy()?,361 evaluate(context.clone(), index)?,362 ) {363 (Val::Obj(v), Val::Str(s)) => {364 if let Some(v) = v.get(&s)? {365 v.unwrap_if_lazy()?366 } else if let Some(Val::Str(n)) = v.get("__intristic_namespace__")? {367 Val::Intristic(n, s)368 } else {369 create_error(crate::Error::NoSuchField(s))?370 }371 }372 (Val::Arr(v), Val::Num(n)) => v373 .get(n as usize)374 .unwrap_or_else(|| panic!("out of bounds"))375 .clone(),376 (Val::Str(s), Val::Num(n)) => {377 Val::Str(s.chars().skip(n as usize).take(1).collect())378 }379 (v, i) => todo!("not implemented: {:?}[{:?}]", v, i.unwrap_if_lazy()),380 }381 }382 LocalExpr(bindings, returned) => {383 let mut new_bindings: HashMap<String, LazyBinding> = HashMap::new();384 let future_context = Context::new_future();385386 let context_creator = context_creator!(387 closure!(clone future_context, |_, _| Ok(future_context.clone().unwrap()))388 );389390 for (k, v) in bindings391 .iter()392 .map(|b| evaluate_binding(b, context_creator.clone()))393 {394 new_bindings.insert(k, v);395 }396397 let context = context398 .extend(new_bindings, None, None, None)?399 .into_future(future_context);400 evaluate(context, &returned.clone())?401 }402 Arr(items) => {403 let mut out = Vec::with_capacity(items.len());404 for item in items {405 out.push(evaluate(context.clone(), item)?);406 }407 Val::Arr(out)408 }409 ArrComp(expr, compspecs) => Val::Arr(410 // First compspec should be forspec, so no "None" possible here411 evaluate_comp(context, expr, compspecs)?.unwrap(),412 ),413 Obj(body) => Val::Obj(evaluate_object(context, body.clone())?),414 Apply(value, ArgsDesc(args)) => {415 let value = evaluate(context.clone(), value)?.unwrap_if_lazy()?;416 match value {417 Val::Intristic(ns, name) => match (&ns as &str, &name as &str) {418 // arr/string/function419 ("std", "length") => {420 assert_eq!(args.len(), 1);421 let expr = &args.get(0).unwrap().1;422 match evaluate(context, expr)? {423 Val::Str(n) => Val::Num(n.chars().count() as f64),424 Val::Arr(i) => Val::Num(i.len() as f64),425 v => panic!("can't get length of {:?}", v),426 }427 }428 // any429 ("std", "type") => {430 assert_eq!(args.len(), 1);431 let expr = &args.get(0).unwrap().1;432 Val::Str(evaluate(context, expr)?.value_type()?.name().to_owned())433 }434 // length, idx=>any435 ("std", "makeArray") => {436 assert_eq!(args.len(), 2);437 if let (Val::Num(v), Val::Func(d)) = (438 evaluate(context.clone(), &args[0].1)?,439 evaluate(context, &args[1].1)?,440 ) {441 assert!(v > 0.0);442 let mut out = Vec::with_capacity(v as usize);443 for i in 0..v as usize {444 out.push(d.evaluate(vec![(None, Val::Num(i as f64))])?)445 }446 Val::Arr(out)447 } else {448 panic!("bad makeArray call");449 }450 }451 // string452 ("std", "codepoint") => {453 assert_eq!(args.len(), 1);454 if let Val::Str(s) = evaluate(context, &args[0].1)? {455 assert!(456 s.chars().count() == 1,457 "std.codepoint should receive single char string"458 );459 Val::Num(s.chars().take(1).next().unwrap() as u32 as f64)460 } else {461 panic!("bad codepoint call");462 }463 }464 // object, includeHidden465 ("std", "objectFieldsEx") => {466 assert_eq!(args.len(), 2);467 if let (Val::Obj(body), Val::Bool(_include_hidden)) = (468 evaluate(context.clone(), &args[0].1)?,469 evaluate(context, &args[1].1)?,470 ) {471 // TODO: handle visibility (_include_hidden)472 Val::Arr(body.fields().into_iter().map(Val::Str).collect())473 } else {474 panic!("bad objectFieldsEx call");475 }476 }477 (ns, name) => panic!("Intristic not found: {}.{}", ns, name),478 },479 Val::Func(f) => push(locexpr.clone(), "function call".to_owned(), || {480 f.evaluate(481 args.clone()482 .into_iter()483 .map(move |a| {484 (485 a.clone().0,486 Val::Lazy(lazy_val!(487 closure!(clone context, clone a, || evaluate(context.clone(), &a.clone().1))488 )),489 )490 })491 .collect(),492 )493 })?,494 _ => panic!("{:?} is not a function", value),495 }496 }497 Function(params, body) => evaluate_method(context, body, params.clone()),498 AssertExpr(AssertStmt(value, msg), returned) => {499 if push(value.clone(), "assertion condition".to_owned(), || {500 evaluate(context.clone(), &value)?501 .try_cast_bool("assertion condition should be boolean")502 })? {503 push(504 returned.clone(),505 "assert 'return' branch".to_owned(),506 || evaluate(context, returned),507 )?508 } else if let Some(msg) = msg {509 panic!(510 "assertion failed ({:?}): {}",511 value,512 evaluate(context, msg)?.try_cast_str("assertion message should be string")?513 );514 } else {515 panic!("assertion failed ({:?}): no message", value);516 }517 }518 Error(e) => create_error(crate::Error::RuntimeError(519 evaluate(context, e)?.try_cast_str("error text should be string")?,520 ))?,521 IfElse {522 cond,523 cond_then,524 cond_else,525 } => {526 if push(cond.0.clone(), "if condition".to_owned(), || {527 evaluate(context.clone(), &cond.0)?.try_cast_bool("if condition should be boolean")528 })? {529 push(530 cond_then.clone(),531 "if condition 'then' branch".to_owned(),532 || evaluate(context, cond_then),533 )?534 } else {535 match cond_else {536 Some(v) => push(v.clone(), "if condition 'else' branch".to_owned(), || {537 evaluate(context, v)538 })?,539 None => Val::Bool(false),540 }541 }542 }543 _ => panic!(544 "evaluation not implemented: {:?}",545 LocExpr(expr.clone(), loc.clone())546 ),547 })548}crates/jsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/val.rs
+++ b/crates/jsonnet-evaluator/src/val.rs
@@ -44,7 +44,11 @@
}
impl Debug for LazyVal {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- write!(f, "Lazy")
+ if self.0.cached.borrow().is_some() {
+ write!(f, "{:?}", self.0.cached.borrow().clone().unwrap())
+ } else {
+ write!(f, "Lazy")
+ }
}
}
impl PartialEq for LazyVal {