Merge pull request #366 from hildjj/multi-semi

Allow extra semicolons between rules.
peggyjs · Mar 4, 2023 · 2439e4a · 2439e4a
2 parents 6066dbf + deca52a
commit 2439e4a
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,8 @@ Released: TBD
   could have successfully used these in the past.  From @hildjj.
 - [#364](https://github.com/peggyjs/peggy/issues/364) Fix passing an incorrect
   external label to the expression inside the `repeated` node.  From @Mingun.
+- [#346](https://github.com/peggyjs/peggy/issues/346)] Allow extra semicolons
+  between rules.  From @hildjj.
 
 3.0.0
 -----

diff --git a/lib/parser.js b/lib/parser.js
diff --git a/src/parser.pegjs b/src/parser.pegjs
@@ -540,7 +540,7 @@ _
 // Automatic Semicolon Insertion
 
 EOS
-  = __ ";"
+  = (__ ";")+
   / _ SingleLineComment? LineTerminatorSequence
   / __ EOF
 

diff --git a/test/unit/parser.spec.js b/test/unit/parser.spec.js
@@ -282,7 +282,7 @@ describe("Peggy grammar parser", () => {
     expect("\na = 'abcd';\n").to.parseAs(
       { type: "grammar", topLevelInitializer: null, initializer: null, rules: [ruleA] }
     );
-    expect("\na = 'abcd';\nb = 'efgh';\nc = 'ijkl';\n").to.parseAs(
+    expect("\na = 'abcd'; /* comment */; // comment\n;\nb = 'efgh';\nc = 'ijkl';\n").to.parseAs(
       { type: "grammar", topLevelInitializer: null, initializer: null, rules: [ruleA, ruleB, ruleC] }
     );
     expect("\n{ code };\na = 'abcd';\n").to.parseAs(