difftreelog
feat(evaluator) propogate EvaluationState
in: master
4 files changed
crates/jsonnet-evaluator/src/error.rsdiffbeforeafterboth--- /dev/null
+++ b/crates/jsonnet-evaluator/src/error.rs
@@ -0,0 +1 @@
+pub enum Error {}
crates/jsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth1use crate::{2 binding, bool_val, context_creator, function_default, function_rhs, future_wrapper,3 lazy_binding, lazy_val, Context, ContextCreator, FuncDesc, LazyBinding, ObjMember, ObjValue,4 Val,5};6use closure::closure;7use jsonnet_parser::{8 ArgsDesc, BinaryOpType, BindSpec, Expr, FieldMember, LiteralType, LocExpr, Member, ObjBody,9 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| lazy_val!(23 closure!(clone b, clone args, clone context_creator, || 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 lazy_val!(closure!(clone context_creator, clone b, || evaluate(35 context_creator.0(this.clone(), super_obj.clone()),36 &b.value37 )))38 }),39 )40 }41}4243pub fn evaluate_method(ctx: Context, expr: &LocExpr, arg_spec: ParamsDesc) -> Val {44 Val::Func(FuncDesc {45 ctx,46 params: arg_spec,47 eval_rhs: function_rhs!(closure!(clone expr, |ctx| evaluate(ctx, &expr))),48 eval_default: function_default!(|ctx, default| evaluate(ctx, &default)),49 })50}5152pub fn evaluate_field_name(context: Context, field_name: &jsonnet_parser::FieldName) -> String {53 match field_name {54 jsonnet_parser::FieldName::Fixed(n) => n.clone(),55 jsonnet_parser::FieldName::Dyn(expr) => {56 let name = evaluate(context, expr).unwrap_if_lazy();57 match name {58 Val::Str(n) => n,59 _ => panic!(60 "dynamic field name can be only evaluated to 'string', got: {:?}",61 name62 ),63 }64 }65 }66}6768pub fn evaluate_unary_op(op: UnaryOpType, b: &Val) -> Val {69 match (op, b) {70 (o, Val::Lazy(l)) => evaluate_unary_op(o, &l.evaluate()),71 (UnaryOpType::Not, Val::Bool(v)) => Val::Bool(!v),72 (op, o) => panic!("unary op not implemented: {:?} {:?}", op, o),73 }74}7576pub fn evaluate_binary_op(a: &Val, op: BinaryOpType, b: &Val) -> Val {77 match (a, op, b) {78 (Val::Lazy(a), o, b) => evaluate_binary_op(&a.evaluate(), o, b),79 (a, o, Val::Lazy(b)) => evaluate_binary_op(a, o, &b.evaluate()),8081 (Val::Str(v1), BinaryOpType::Add, Val::Str(v2)) => Val::Str(v1.to_owned() + &v2),82 (Val::Str(v1), BinaryOpType::Ne, Val::Str(v2)) => bool_val(v1 != v2),8384 (Val::Str(v1), BinaryOpType::Add, Val::Num(v2)) => Val::Str(format!("{}{}", v1, v2)),85 (Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize)),8687 (Val::Bool(a), BinaryOpType::And, Val::Bool(b)) => Val::Bool(*a && *b),88 (Val::Bool(a), BinaryOpType::Or, Val::Bool(b)) => Val::Bool(*a || *b),8990 (Val::Obj(v1), BinaryOpType::Add, Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),9192 (Val::Arr(a), BinaryOpType::Add, Val::Arr(b)) => Val::Arr([&a[..], &b[..]].concat()),9394 (Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),95 (Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => Val::Num(v1 / v2),96 (Val::Num(v1), BinaryOpType::Mod, Val::Num(v2)) => Val::Num(v1 % v2),9798 (Val::Num(v1), BinaryOpType::Add, Val::Num(v2)) => Val::Num(v1 + v2),99 (Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::Num(v1 - v2),100101 (Val::Num(v1), BinaryOpType::Lhs, Val::Num(v2)) => {102 Val::Num(((*v1 as i32) << (*v2 as i32)) as f64)103 }104 (Val::Num(v1), BinaryOpType::Rhs, Val::Num(v2)) => {105 Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)106 }107108 (Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => bool_val(v1 < v2),109 (Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => bool_val(v1 > v2),110 (Val::Num(v1), BinaryOpType::Lte, Val::Num(v2)) => bool_val(v1 <= v2),111 (Val::Num(v1), BinaryOpType::Gte, Val::Num(v2)) => bool_val(v1 >= v2),112113 (Val::Num(v1), BinaryOpType::Eq, Val::Num(v2)) => bool_val((v1 - v2).abs() < f64::EPSILON),114 (Val::Num(v1), BinaryOpType::Ne, Val::Num(v2)) => bool_val((v1 - v2).abs() > f64::EPSILON),115116 (Val::Num(v1), BinaryOpType::BitAnd, Val::Num(v2)) => {117 Val::Num(((*v1 as i32) & (*v2 as i32)) as f64)118 }119 (Val::Num(v1), BinaryOpType::BitOr, Val::Num(v2)) => {120 Val::Num(((*v1 as i32) | (*v2 as i32)) as f64)121 }122 (Val::Num(v1), BinaryOpType::BitXor, Val::Num(v2)) => {123 Val::Num(((*v1 as i32) ^ (*v2 as i32)) as f64)124 }125 (a, BinaryOpType::Eq, b) => bool_val(a == b),126 (a, BinaryOpType::Ne, b) => bool_val(a != b),127 _ => panic!("no rules for binary operation: {:?} {:?} {:?}", a, op, b),128 }129}130131future_wrapper!(HashMap<String, LazyBinding>, FutureNewBindings);132future_wrapper!(ObjValue, FutureObjValue);133134// TODO: Asserts135pub fn evaluate_object(context: Context, object: ObjBody) -> ObjValue {136 match object {137 ObjBody::MemberList(members) => {138 let new_bindings = FutureNewBindings::new();139 let future_this = FutureObjValue::new();140 let context_creator = context_creator!(141 closure!(clone context, clone new_bindings, clone future_this, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {142 context.clone().extend(143 new_bindings.clone().unwrap(),144 context.clone().dollar().clone().or_else(||this.clone()),145 Some(this.unwrap()),146 super_obj147 )148 })149 );150 {151 let mut bindings: HashMap<String, LazyBinding> = HashMap::new();152 for (n, b) in members153 .iter()154 .filter_map(|m| match m {155 Member::BindStmt(b) => Some(b.clone()),156 _ => None,157 })158 .map(|b| evaluate_binding(&b, context_creator.clone()))159 {160 bindings.insert(n, b);161 }162 new_bindings.fill(bindings);163 }164165 let mut new_members = BTreeMap::new();166 for member in members.into_iter() {167 match member {168 Member::Field(FieldMember {169 name,170 plus,171 params: None,172 visibility,173 value,174 }) => {175 let name = evaluate_field_name(context.clone(), &name);176 new_members.insert(177 name,178 ObjMember {179 add: plus,180 visibility: visibility.clone(),181 invoke: binding!(182 closure!(clone value, clone context_creator, |this, super_obj| {183 let context = context_creator.0(this, super_obj);184 // TODO: Assert185 evaluate(186 context,187 &value,188 ).unwrap_if_lazy()189 })190 ),191 },192 );193 }194 Member::Field(FieldMember {195 name,196 params: Some(params),197 value,198 ..199 }) => {200 let name = evaluate_field_name(context.clone(), &name);201 new_members.insert(202 name,203 ObjMember {204 add: false,205 visibility: Visibility::Hidden,206 invoke: binding!(207 closure!(clone value, clone context_creator, |this, super_obj| {208 // TODO: Assert209 evaluate_method(210 context_creator.0(this, super_obj),211 &value.clone(),212 params.clone(),213 )214 })215 ),216 },217 );218 }219 Member::BindStmt(_) => {}220 Member::AssertStmt(_) => {}221 }222 }223 future_this.fill(ObjValue::new(None, Rc::new(new_members)))224 }225 _ => todo!(),226 }227}228229pub fn evaluate(context: Context, expr: &LocExpr) -> Val {230 use Expr::*;231 let LocExpr(expr, loc) = expr;232 match &**expr {233 Literal(LiteralType::This) => Val::Obj(234 context235 .this()236 .clone()237 .unwrap_or_else(|| panic!("this not found")),238 ),239 Literal(LiteralType::Super) => Val::Obj(240 context241 .super_obj()242 .clone()243 .unwrap_or_else(|| panic!("super not found")),244 ),245 Literal(LiteralType::True) => Val::Bool(true),246 Literal(LiteralType::False) => Val::Bool(false),247 Literal(LiteralType::Null) => Val::Null,248 Parened(e) => evaluate(context, e),249 Str(v) => Val::Str(v.clone()),250 Num(v) => Val::Num(*v),251 BinaryOp(v1, o, v2) => {252 evaluate_binary_op(&evaluate(context.clone(), v1), *o, &evaluate(context, v2))253 }254 UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)),255 Var(name) => Val::Lazy(context.binding(&name)).unwrap_if_lazy(),256 Index(value, index) => {257 match (258 evaluate(context.clone(), value).unwrap_if_lazy(),259 evaluate(context.clone(), index),260 ) {261 (Val::Obj(v), Val::Str(s)) => v262 .get(&s)263 .unwrap_or_else(closure!(clone context, || {264 if let Some(n) = v.get("__intristic_namespace__") {265 if let Val::Str(n) = n.unwrap_if_lazy() {266 Val::Intristic(n, s)267 } else {268 panic!("__intristic_namespace__ should be string");269 }270 } else {271 panic!("{} not found in {:?}", s, v)272 }273 }))274 .unwrap_if_lazy(),275 (Val::Arr(v), Val::Num(n)) => v276 .get(n as usize)277 .unwrap_or_else(|| panic!("out of bounds"))278 .clone(),279 (Val::Str(s), Val::Num(n)) => {280 Val::Str(s.chars().skip(n as usize).take(1).collect())281 }282 (v, i) => todo!("not implemented: {:?}[{:?}]", v, i.unwrap_if_lazy()),283 }284 }285 LocalExpr(bindings, returned) => {286 let mut new_bindings: HashMap<String, LazyBinding> = HashMap::new();287 let future_context = Context::new_future();288289 let context_creator = context_creator!(290 closure!(clone future_context, |_, _| future_context.clone().unwrap())291 );292293 for (k, v) in bindings294 .iter()295 .map(move |b| evaluate_binding(b, context_creator.clone()))296 {297 new_bindings.insert(k, v);298 }299300 let context = context301 .extend(new_bindings, None, None, None)302 .into_future(future_context);303 evaluate(context, &returned.clone())304 }305 Obj(body) => Val::Obj(evaluate_object(context, body.clone())),306 Apply(value, ArgsDesc(args)) => {307 let value = evaluate(context.clone(), value).unwrap_if_lazy();308 match value {309 // TODO: Capture context of application310 Val::Intristic(ns, name) => match (&ns as &str, &name as &str) {311 ("std", "length") => {312 assert_eq!(args.len(), 1);313 let expr = &args.get(0).unwrap().1;314 match evaluate(context, expr) {315 Val::Str(n) => Val::Num(n.chars().count() as f64),316 Val::Arr(i) => Val::Num(i.len() as f64),317 v => panic!("can't get length of {:?}", v),318 }319 }320 ("std", "type") => {321 assert_eq!(args.len(), 1);322 let expr = &args.get(0).unwrap().1;323 Val::Str(evaluate(context, expr).type_of().to_owned())324 }325 ("std", "makeArray") => {326 assert_eq!(args.len(), 2);327 if let (Val::Num(v), Val::Func(d)) = (328 evaluate(context.clone(), &args[0].1),329 evaluate(context, &args[1].1),330 ) {331 assert!(v > 0.0);332 let mut out = Vec::with_capacity(v as usize);333 for i in 0..v as usize {334 out.push(d.evaluate(vec![(None, Val::Num(i as f64))]))335 }336 Val::Arr(out)337 } else {338 panic!("bad makeArray call");339 }340 }341 ("std", "codepoint") => {342 assert_eq!(args.len(), 1);343 if let Val::Str(s) = evaluate(context, &args[0].1) {344 assert!(345 s.chars().count() == 1,346 "std.codepoint should receive single char string"347 );348 Val::Num(s.chars().take(1).next().unwrap() as u32 as f64)349 } else {350 panic!("bad codepoint call");351 }352 }353 (ns, name) => panic!("Intristic not found: {}.{}", ns, name),354 },355 Val::Func(f) => f.evaluate(356 args.clone()357 .into_iter()358 .map(|a| {359 (360 a.clone().0,361 Val::Lazy(lazy_val!(362 closure!(clone context, clone a, || evaluate(context.clone(), &a.clone().1))363 )),364 )365 })366 .collect(),367 ),368 _ => panic!("{:?} is not a function", value),369 }370 }371 Function(params, body) => evaluate_method(context, body, params.clone()),372 Error(e) => panic!("error: {}", evaluate(context, e)),373 IfElse {374 cond,375 cond_then,376 cond_else,377 } => match evaluate(context.clone(), &cond.0).unwrap_if_lazy() {378 Val::Bool(true) => evaluate(context, cond_then),379 Val::Bool(false) => match cond_else {380 Some(v) => evaluate(context, v),381 None => Val::Bool(false),382 },383 v => panic!("if condition evaluated to {:?} (boolean needed instead)", v),384 },385 _ => panic!(386 "evaluation not implemented: {:?}",387 LocExpr(expr.clone(), loc.clone())388 ),389 }390}1use crate::{2 binding, bool_val, context_creator, function_default, function_rhs, future_wrapper,3 lazy_binding, lazy_val, Context, ContextCreator, EvaluationState, FuncDesc, LazyBinding,4 ObjMember, ObjValue, Val,5};6use closure::closure;7use jsonnet_parser::{8 ArgsDesc, BinaryOpType, BindSpec, Expr, FieldMember, LiteralType, LocExpr, Member, ObjBody,9 ParamsDesc, UnaryOpType, Visibility,10};11use std::{12 collections::{BTreeMap, HashMap},13 rc::Rc,14};1516pub fn evaluate_binding(17 eval_state: EvaluationState,18 b: &BindSpec,19 context_creator: ContextCreator,20) -> (String, LazyBinding) {21 let b = b.clone();22 if let Some(args) = &b.params {23 let args = args.clone();24 (25 b.name.clone(),26 lazy_binding!(move |this, super_obj| lazy_val!(27 closure!(clone b, clone args, clone context_creator, clone eval_state, || evaluate_method(28 context_creator.0(this.clone(), super_obj.clone()),29 eval_state.clone(),30 &b.value,31 args.clone()32 ))33 )),34 )35 } else {36 (37 b.name.clone(),38 lazy_binding!(move |this, super_obj| {39 lazy_val!(40 closure!(clone context_creator, clone b, clone eval_state, || evaluate(41 context_creator.0(this.clone(), super_obj.clone()),42 eval_state.clone(),43 &b.value44 ))45 )46 }),47 )48 }49}5051pub fn evaluate_method(52 ctx: Context,53 eval_state: EvaluationState,54 expr: &LocExpr,55 arg_spec: ParamsDesc,56) -> Val {57 Val::Func(FuncDesc {58 ctx,59 params: arg_spec,60 eval_rhs: function_rhs!(61 closure!(clone expr, clone eval_state, |ctx| evaluate(ctx, eval_state.clone(), &expr))62 ),63 eval_default: function_default!(64 closure!(clone eval_state, |ctx, default| evaluate(ctx, eval_state.clone(), &default))65 ),66 })67}6869pub fn evaluate_field_name(70 context: Context,71 eval_state: EvaluationState,72 field_name: &jsonnet_parser::FieldName,73) -> String {74 match field_name {75 jsonnet_parser::FieldName::Fixed(n) => n.clone(),76 jsonnet_parser::FieldName::Dyn(expr) => {77 let name = evaluate(context, eval_state, expr).unwrap_if_lazy();78 match name {79 Val::Str(n) => n,80 _ => panic!(81 "dynamic field name can be only evaluated to 'string', got: {:?}",82 name83 ),84 }85 }86 }87}8889pub fn evaluate_unary_op(op: UnaryOpType, b: &Val) -> Val {90 match (op, b) {91 (o, Val::Lazy(l)) => evaluate_unary_op(o, &l.evaluate()),92 (UnaryOpType::Not, Val::Bool(v)) => Val::Bool(!v),93 (op, o) => panic!("unary op not implemented: {:?} {:?}", op, o),94 }95}9697pub fn evaluate_binary_op(a: &Val, op: BinaryOpType, b: &Val) -> Val {98 match (a, op, b) {99 (Val::Lazy(a), o, b) => evaluate_binary_op(&a.evaluate(), o, b),100 (a, o, Val::Lazy(b)) => evaluate_binary_op(a, o, &b.evaluate()),101102 (Val::Str(v1), BinaryOpType::Add, Val::Str(v2)) => Val::Str(v1.to_owned() + &v2),103 (Val::Str(v1), BinaryOpType::Ne, Val::Str(v2)) => bool_val(v1 != v2),104105 (Val::Str(v1), BinaryOpType::Add, Val::Num(v2)) => Val::Str(format!("{}{}", v1, v2)),106 (Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize)),107108 (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),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()),114115 (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),117 (Val::Num(v1), BinaryOpType::Mod, Val::Num(v2)) => Val::Num(v1 % v2),118119 (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),121122 (Val::Num(v1), BinaryOpType::Lhs, Val::Num(v2)) => {123 Val::Num(((*v1 as i32) << (*v2 as i32)) as f64)124 }125 (Val::Num(v1), BinaryOpType::Rhs, Val::Num(v2)) => {126 Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)127 }128129 (Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => bool_val(v1 < v2),130 (Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => bool_val(v1 > v2),131 (Val::Num(v1), BinaryOpType::Lte, Val::Num(v2)) => bool_val(v1 <= v2),132 (Val::Num(v1), BinaryOpType::Gte, Val::Num(v2)) => bool_val(v1 >= v2),133134 (Val::Num(v1), BinaryOpType::Eq, Val::Num(v2)) => bool_val((v1 - v2).abs() < f64::EPSILON),135 (Val::Num(v1), BinaryOpType::Ne, Val::Num(v2)) => bool_val((v1 - v2).abs() > f64::EPSILON),136137 (Val::Num(v1), BinaryOpType::BitAnd, Val::Num(v2)) => {138 Val::Num(((*v1 as i32) & (*v2 as i32)) as f64)139 }140 (Val::Num(v1), BinaryOpType::BitOr, Val::Num(v2)) => {141 Val::Num(((*v1 as i32) | (*v2 as i32)) as f64)142 }143 (Val::Num(v1), BinaryOpType::BitXor, Val::Num(v2)) => {144 Val::Num(((*v1 as i32) ^ (*v2 as i32)) as f64)145 }146 (a, BinaryOpType::Eq, b) => bool_val(a == b),147 (a, BinaryOpType::Ne, b) => bool_val(a != b),148 _ => panic!("no rules for binary operation: {:?} {:?} {:?}", a, op, b),149 }150}151152future_wrapper!(HashMap<String, LazyBinding>, FutureNewBindings);153future_wrapper!(ObjValue, FutureObjValue);154155// TODO: Asserts156pub fn evaluate_object(context: Context, eval_state: EvaluationState, object: ObjBody) -> ObjValue {157 match object {158 ObjBody::MemberList(members) => {159 let new_bindings = FutureNewBindings::new();160 let future_this = FutureObjValue::new();161 let context_creator = context_creator!(162 closure!(clone context, clone new_bindings, clone future_this, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {163 context.clone().extend(164 new_bindings.clone().unwrap(),165 context.clone().dollar().clone().or_else(||this.clone()),166 Some(this.unwrap()),167 super_obj168 )169 })170 );171 {172 let mut bindings: HashMap<String, LazyBinding> = HashMap::new();173 for (n, b) in members174 .iter()175 .filter_map(|m| match m {176 Member::BindStmt(b) => Some(b.clone()),177 _ => None,178 })179 .map(|b| evaluate_binding(eval_state.clone(), &b, context_creator.clone()))180 {181 bindings.insert(n, b);182 }183 new_bindings.fill(bindings);184 }185186 let mut new_members = BTreeMap::new();187 for member in members.into_iter() {188 match member {189 Member::Field(FieldMember {190 name,191 plus,192 params: None,193 visibility,194 value,195 }) => {196 let name = evaluate_field_name(context.clone(), eval_state.clone(), &name);197 new_members.insert(198 name,199 ObjMember {200 add: plus,201 visibility: visibility.clone(),202 invoke: binding!(203 closure!(clone value, clone context_creator, clone eval_state, |this, super_obj| {204 let context = context_creator.0(this, super_obj);205 // TODO: Assert206 evaluate(207 context,208 eval_state.clone(),209 &value,210 ).unwrap_if_lazy()211 })212 ),213 },214 );215 }216 Member::Field(FieldMember {217 name,218 params: Some(params),219 value,220 ..221 }) => {222 let name = evaluate_field_name(context.clone(), eval_state.clone(), &name);223 new_members.insert(224 name,225 ObjMember {226 add: false,227 visibility: Visibility::Hidden,228 invoke: binding!(229 closure!(clone value, clone context_creator, clone eval_state, |this, super_obj| {230 // TODO: Assert231 evaluate_method(232 context_creator.0(this, super_obj),233 eval_state.clone(),234 &value.clone(),235 params.clone(),236 )237 })238 ),239 },240 );241 }242 Member::BindStmt(_) => {}243 Member::AssertStmt(_) => {}244 }245 }246 future_this.fill(ObjValue::new(None, Rc::new(new_members)))247 }248 _ => todo!(),249 }250}251252pub fn evaluate(context: Context, eval_state: EvaluationState, expr: &LocExpr) -> Val {253 println!("===");254 eval_state.print_stack_trace();255 use Expr::*;256 eval_state.clone().push(expr.clone(), "expr".to_owned(), || {257 let LocExpr(expr, loc) = expr;258 match &**expr {259 Literal(LiteralType::This) => Val::Obj(260 context261 .this()262 .clone()263 .unwrap_or_else(|| panic!("this not found")),264 ),265 Literal(LiteralType::Super) => Val::Obj(266 context267 .super_obj()268 .clone()269 .unwrap_or_else(|| panic!("super not found")),270 ),271 Literal(LiteralType::True) => Val::Bool(true),272 Literal(LiteralType::False) => Val::Bool(false),273 Literal(LiteralType::Null) => Val::Null,274 Parened(e) => evaluate(context, eval_state.clone(), e),275 Str(v) => Val::Str(v.clone()),276 Num(v) => Val::Num(*v),277 BinaryOp(v1, o, v2) => evaluate_binary_op(278 &evaluate(context.clone(), eval_state.clone(), v1),279 *o,280 &evaluate(context, eval_state.clone(), v2),281 ),282 UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, eval_state, v)),283 Var(name) => Val::Lazy(context.binding(&name)).unwrap_if_lazy(),284 Index(value, index) => {285 match (286 evaluate(context.clone(), eval_state.clone(), value).unwrap_if_lazy(),287 evaluate(context.clone(), eval_state.clone(), index),288 ) {289 (Val::Obj(v), Val::Str(s)) => v290 .get(&s)291 .unwrap_or_else(closure!(clone context, || {292 if let Some(n) = v.get("__intristic_namespace__") {293 if let Val::Str(n) = n.unwrap_if_lazy() {294 Val::Intristic(n, s)295 } else {296 panic!("__intristic_namespace__ should be string");297 }298 } else {299 panic!("{} not found in {:?}", s, v)300 }301 }))302 .unwrap_if_lazy(),303 (Val::Arr(v), Val::Num(n)) => v304 .get(n as usize)305 .unwrap_or_else(|| panic!("out of bounds"))306 .clone(),307 (Val::Str(s), Val::Num(n)) => {308 Val::Str(s.chars().skip(n as usize).take(1).collect())309 }310 (v, i) => todo!("not implemented: {:?}[{:?}]", v, i.unwrap_if_lazy()),311 }312 }313 LocalExpr(bindings, returned) => {314 let mut new_bindings: HashMap<String, LazyBinding> = HashMap::new();315 let future_context = Context::new_future();316317 let context_creator = context_creator!(318 closure!(clone future_context, |_, _| future_context.clone().unwrap())319 );320321 for (k, v) in bindings322 .iter()323 .map(|b| evaluate_binding(eval_state.clone(), b, context_creator.clone()))324 {325 new_bindings.insert(k, v);326 }327328 let context = context329 .extend(new_bindings, None, None, None)330 .into_future(future_context);331 evaluate(context, eval_state.clone(), &returned.clone())332 }333 Obj(body) => Val::Obj(evaluate_object(context, eval_state, body.clone())),334 Apply(value, ArgsDesc(args)) => {335 let value = evaluate(context.clone(), eval_state.clone(), value).unwrap_if_lazy();336 match value {337 // TODO: Capture context of application338 Val::Intristic(ns, name) => match (&ns as &str, &name as &str) {339 ("std", "length") => {340 assert_eq!(args.len(), 1);341 let expr = &args.get(0).unwrap().1;342 match evaluate(context, eval_state.clone(), expr) {343 Val::Str(n) => Val::Num(n.chars().count() as f64),344 Val::Arr(i) => Val::Num(i.len() as f64),345 v => panic!("can't get length of {:?}", v),346 }347 }348 ("std", "type") => {349 assert_eq!(args.len(), 1);350 let expr = &args.get(0).unwrap().1;351 Val::Str(evaluate(context, eval_state, expr).type_of().to_owned())352 }353 ("std", "makeArray") => {354 assert_eq!(args.len(), 2);355 if let (Val::Num(v), Val::Func(d)) = (356 evaluate(context.clone(), eval_state.clone(), &args[0].1),357 evaluate(context, eval_state, &args[1].1),358 ) {359 assert!(v > 0.0);360 let mut out = Vec::with_capacity(v as usize);361 for i in 0..v as usize {362 out.push(d.evaluate(vec![(None, Val::Num(i as f64))]))363 }364 Val::Arr(out)365 } else {366 panic!("bad makeArray call");367 }368 }369 ("std", "codepoint") => {370 assert_eq!(args.len(), 1);371 if let Val::Str(s) = evaluate(context, eval_state, &args[0].1) {372 assert!(373 s.chars().count() == 1,374 "std.codepoint should receive single char string"375 );376 Val::Num(s.chars().take(1).next().unwrap() as u32 as f64)377 } else {378 panic!("bad codepoint call");379 }380 }381 (ns, name) => panic!("Intristic not found: {}.{}", ns, name),382 },383 Val::Func(f) => f.evaluate(384 args.clone()385 .into_iter()386 .map(move |a| {387 (388 a.clone().0,389 Val::Lazy(lazy_val!(390 closure!(clone context, clone a, clone eval_state, || evaluate(context.clone(), eval_state.clone(), &a.clone().1))391 )),392 )393 })394 .collect(),395 ),396 _ => panic!("{:?} is not a function", value),397 }398 }399 Function(params, body) => evaluate_method(context, eval_state, body, params.clone()),400 Error(e) => panic!("error: {}", evaluate(context, eval_state, e)),401 IfElse {402 cond,403 cond_then,404 cond_else,405 } => match evaluate(context.clone(), eval_state.clone(), &cond.0).unwrap_if_lazy() {406 Val::Bool(true) => evaluate(context, eval_state.clone(), cond_then),407 Val::Bool(false) => match cond_else {408 Some(v) => evaluate(context, eval_state, v),409 None => Val::Bool(false),410 },411 v => panic!("if condition evaluated to {:?} (boolean needed instead)", v),412 },413 _ => panic!(414 "evaluation not implemented: {:?}",415 LocExpr(expr.clone(), loc.clone())416 ),417 }418 })419}crates/jsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/lib.rs
+++ b/crates/jsonnet-evaluator/src/lib.rs
@@ -4,12 +4,14 @@
#![allow(macro_expanded_macro_exports_accessed_by_absolute_paths)]
mod ctx;
mod dynamic;
+mod error;
mod evaluate;
mod obj;
mod val;
pub use ctx::*;
pub use dynamic::*;
+pub use error::*;
pub use evaluate::*;
use jsonnet_parser::*;
pub use obj::*;
@@ -32,23 +34,20 @@
function_default,
dyn Fn(Context, LocExpr) -> Val
);
-
-pub struct ExitGuard<'s>(&'s EvaluationState);
-impl<'s> Drop for ExitGuard<'s> {
- fn drop(&mut self) {
- self.0.stack.borrow_mut().pop();
- }
-}
+#[derive(Default, Clone)]
pub struct EvaluationState {
- pub stack: Rc<RefCell<Vec<LocExpr>>>,
- pub files: Rc<RefCell<HashMap<String, String>>>,
+ /// Used for stack-overflows and stacktraces
+ pub stack: Rc<RefCell<Vec<(LocExpr, String)>>>,
+ /// Contains file source codes and evaluated results for imports and pretty printing stacktraces
+ pub files: Rc<RefCell<HashMap<String, (String, Option<Val>)>>>,
}
impl EvaluationState {
- #[must_use = "should keep exit guard before exit from function"]
- pub fn push(&self, e: LocExpr) -> ExitGuard {
- self.stack.borrow_mut().push(e);
- ExitGuard(self)
+ pub fn push<T>(&self, e: LocExpr, comment: String, f: impl FnOnce() -> T) -> T {
+ self.stack.borrow_mut().push((e, comment));
+ let result = f();
+ self.stack.borrow_mut().pop();
+ result
}
pub fn print_stack_trace(&self) {
for e in self
@@ -56,19 +55,19 @@
.borrow()
.iter()
.rev()
- .map(|e| e.1.clone())
+ .map(|(loc, comment)| loc.1.clone().map(|v| (v, comment.clone())))
.flatten()
{
- println!("{:?}", e)
+ println!("{:?} - {:?}", e.0, e.1)
}
}
-}
-impl Default for EvaluationState {
- fn default() -> Self {
- EvaluationState {
- stack: Rc::new(RefCell::new(Vec::new())),
- files: Rc::new(RefCell::new(HashMap::new())),
- }
+ pub fn stack_trace(&self) -> Vec<(LocExpr, String)> {
+ self.stack
+ .borrow()
+ .iter()
+ .rev()
+ .map(|e| e.clone())
+ .collect()
}
}
@@ -81,19 +80,24 @@
#[test]
fn eval_state_stacktrace() {
let state = EvaluationState::default();
- let _v = state.push(loc_expr!(
- Expr::Num(0.0),
- true,
- ("test.jsonnet".to_owned(), 10, 20)
- ));
-
- state.print_stack_trace()
+ state.push(
+ loc_expr!(Expr::Num(0.0), true, ("test1.jsonnet".to_owned(), 10, 20)),
+ "outer".to_owned(),
+ || {
+ state.push(
+ loc_expr!(Expr::Num(0.0), true, ("test2.jsonnet".to_owned(), 30, 40)),
+ "inner".to_owned(),
+ || state.print_stack_trace(),
+ );
+ },
+ );
}
macro_rules! eval {
($str: expr) => {
evaluate(
Context::new(),
+ EvaluationState::default(),
&parse(
$str,
&ParserSettings {
@@ -111,6 +115,7 @@
let std = "local std = ".to_owned() + jsonnet_stdlib::STDLIB_STR + ";";
evaluate(
Context::new(),
+ EvaluationState::default(),
&parse(
&(std + $str),
&ParserSettings {
@@ -128,6 +133,7 @@
assert_eq!(
evaluate(
Context::new(),
+ EvaluationState::default(),
&parse(
$str,
&ParserSettings {
@@ -148,6 +154,7 @@
"{}",
evaluate(
Context::new(),
+ EvaluationState::default(),
&parse(
$str,
&ParserSettings {
@@ -172,6 +179,7 @@
assert_eq!(
evaluate(
Context::new(),
+ EvaluationState::default(),
&parse(
$str,
&ParserSettings {
@@ -380,7 +388,6 @@
local x19 = {k: x18.k + x18.k};
local x20 = {k: x19.k + x19.k};
local x21 = {k: x20.k + x20.k};
- x21.k
"#
);
}
crates/jsonnet-parser/src/expr.rsdiffbeforeafterboth--- a/crates/jsonnet-parser/src/expr.rs
+++ b/crates/jsonnet-parser/src/expr.rs
@@ -246,7 +246,11 @@
LocExpr(
std::rc::Rc::new($expr),
if $need_loc {
- Some(std::rc::Rc::new(ExprLocation($name.to_owned(), $start, $end)))
+ Some(std::rc::Rc::new(ExprLocation(
+ $name.to_owned(),
+ $start,
+ $end,
+ )))
} else {
None
},