difftreelog
feat plus in object comprehensions
in: master
Fixes #60
3 files changed
crates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -431,6 +431,7 @@
builder
.member(n)
.with_location(obj.value.1.clone())
+ .with_add(obj.plus)
.bindable(Box::new(ObjCompBinding {
context: ctx,
value: obj.value.clone(),
crates/jrsonnet-parser/src/expr.rsdiffbeforeafterboth247pub struct ObjComp {247pub struct ObjComp {248 pub pre_locals: Vec<BindSpec>,248 pub pre_locals: Vec<BindSpec>,249 pub key: LocExpr,249 pub key: LocExpr,250 pub plus: bool,250 pub value: LocExpr,251 pub value: LocExpr,251 pub post_locals: Vec<BindSpec>,252 pub post_locals: Vec<BindSpec>,252 pub compspecs: Vec<CompSpec>,253 pub compspecs: Vec<CompSpec>,crates/jrsonnet-parser/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-parser/src/lib.rs
+++ b/crates/jrsonnet-parser/src/lib.rs
@@ -136,12 +136,13 @@
/ assertion:assertion(s) {expr::Member::AssertStmt(assertion)}
/ field:field(s) {expr::Member::Field(field)}
pub rule objinside(s: &ParserSettings) -> expr::ObjBody
- = pre_locals:(b: obj_local(s) comma() {b})* "[" _ key:expr(s) _ "]" _ ":" _ value:expr(s) post_locals:(comma() b:obj_local(s) {b})* _ forspec:forspec(s) others:(_ rest:compspec(s) {rest})? {
+ = pre_locals:(b: obj_local(s) comma() {b})* "[" _ key:expr(s) _ "]" _ plus:"+"? _ ":" _ value:expr(s) post_locals:(comma() b:obj_local(s) {b})* _ forspec:forspec(s) others:(_ rest:compspec(s) {rest})? {
let mut compspecs = vec![CompSpec::ForSpec(forspec)];
compspecs.extend(others.unwrap_or_default());
expr::ObjBody::ObjComp(expr::ObjComp{
pre_locals,
key,
+ plus: plus.is_some(),
value,
post_locals,
compspecs,