Fixed: Ignore optional commas in aggregate options (#999)

drigz · dcodeIO · commit c05c58fad61c · 2018-03-18T20:05:30.000+01:00
diff --git a/src/parse.js b/src/parse.js
@@ -567,6 +567,7 @@ function parse(source, root, options) {
                     else
                         setOption(parent, name + "." + token, readValue(true));
                 }
+                skip(",", true);
             } while (!skip("}", true));
         } else
             setOption(parent, name, readValue(true));
diff --git a/tests/comp_options-textformat.js b/tests/comp_options-textformat.js
@@ -14,12 +14,14 @@ extend google.protobuf.FieldOptions {\
 message Test {\
   string value = 1 [(my_options) = { a: \"foo\" b: \"bar\" }];\
   string value2 = 2 [(my_options) = { a: \"foo\" b { c: \"bar\" } }];\
+  string value3 = 3 [(my_options) = { a: \"foo\", b: \"bar\" }];\
 }";
 
 tape.test("options in textformat", function(test) {
     var root = protobuf.parse(proto).root;
     var Test = root.lookup("Test");
     test.same(Test.fields.value.options, { "(my_options).a": "foo", "(my_options).b": "bar" }, "should parse correctly");
     test.same(Test.fields.value2.options, { "(my_options).a": "foo", "(my_options).b.c": "bar" }, "should parse correctly when nested");
+    test.same(Test.fields.value3.options, { "(my_options).a": "foo", "(my_options).b": "bar" }, "should parse correctly when comma-separated");
     test.end();
 });

Original file line number	Diff line number	Diff line change
`@@ -567,6 +567,7 @@ function parse(source, root, options) {`
`567`	`567`	`else`
`568`	`568`	`setOption(parent, name + "." + token, readValue(true));`
`569`	`569`	`}`
	`570`	`+ skip(",", true);`
`570`	`571`	`} while (!skip("}", true));`
`571`	`572`	`} else`
`572`	`573`	`setOption(parent, name, readValue(true));`