git.delta.rocks / jrsonnet / refs/commits / 673ea5e48855

difftreelog

fix(parser) allow trailing comma before forspec in object

Yaroslav Bolyukin2022-08-05parent: #4ad9956.patch.diff
in: master

1 file changed

modifiedcrates/jrsonnet-parser/src/lib.rsdiffbeforeafterboth
195			/ assertion:assertion(s) {expr::Member::AssertStmt(assertion)}195			/ assertion:assertion(s) {expr::Member::AssertStmt(assertion)}
196			/ field:field(s) {expr::Member::Field(field)}196			/ field:field(s) {expr::Member::Field(field)}
197		pub rule objinside(s: &ParserSettings) -> expr::ObjBody197		pub rule objinside(s: &ParserSettings) -> expr::ObjBody
198			= 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})? {198			= 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})? {
199				let mut compspecs = vec![CompSpec::ForSpec(forspec)];199				let mut compspecs = vec![CompSpec::ForSpec(forspec)];
200				compspecs.extend(others.unwrap_or_default());200				compspecs.extend(others.unwrap_or_default());
201				expr::ObjBody::ObjComp(expr::ObjComp{201				expr::ObjBody::ObjComp(expr::ObjComp{