Fixes #513. Allow whitespace between plucked word and its pattern

peggyjs · Jun 19, 2024 · 13df923 · 13df923
1 parent fbd94d6
commit 13df923
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,8 @@ Unreleased
 - [#520](https://github.com/peggyjs/peggy/pull/520) Grammar with token "constructor" fails to generate
 - [#522](https://github.com/peggyjs/peggy/pull/522) Switched from puppeteer
   to playwright for web tests, and added them to CI.
+- [#513](https://github.com/peggyjs/peggy/pull/513) Allow whitespace between
+  plucked word and its pattern.
 
 ### Documentation
 - [#506](https://github.com/peggyjs/peggy/pull/506) Added END OF INPUT (`!.`).

diff --git a/docs/js/benchmark-bundle.min.js b/docs/js/benchmark-bundle.min.js
diff --git a/docs/js/test-bundle.min.js b/docs/js/test-bundle.min.js
diff --git a/docs/vendor/peggy/peggy.min.js b/docs/vendor/peggy/peggy.min.js
diff --git a/lib/parser.js b/lib/parser.js
@@ -1697,11 +1697,10 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = peg$parseLabelColon();
       if (s1 !== peg$FAILED) {
-        s2 = peg$parse__();
-        s3 = peg$parsePrefixedExpression();
-        if (s3 !== peg$FAILED) {
+        s2 = peg$parsePrefixedExpression();
+        if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f23(s1, s3);
+          s0 = peg$f23(s1, s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1739,7 +1738,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseLabelColon() {
-    var s0, s1, s2, s3;
+    var s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = peg$parseIdentifierName();
@@ -1753,6 +1752,7 @@ function peg$parse(input, options) {
         if (peg$silentFails === 0) { peg$fail(peg$e12); }
       }
       if (s3 !== peg$FAILED) {
+        s4 = peg$parse__();
         peg$savedPos = s0;
         s0 = peg$f25(s1);
       } else {

diff --git a/src/parser.pegjs b/src/parser.pegjs
@@ -267,7 +267,7 @@ LabeledExpression
         location: location()
       };
     }
-  / label:LabelColon __ expression:PrefixedExpression {
+  / label:LabelColon expression:PrefixedExpression {
       return {
         type: "labeled",
         label: label[0],
@@ -282,7 +282,7 @@ Pluck
   = "@" { return location(); }
 
 LabelColon
-  = label:IdentifierName __ ":" {
+  = label:IdentifierName __ ":" __ {
       if (reservedWords.indexOf(label[0]) >= 0) {
         error(`Label can't be a reserved word "${label[0]}"`, label[1]);
       }

diff --git a/test/unit/parser.spec.js b/test/unit/parser.spec.js
@@ -367,6 +367,9 @@ describe("Peggy grammar parser", () => {
     expect("start = a:'abcd'\nb:'efgh'").to.parseAs(
       oneRuleGrammar(sequence2)
     );
+    expect("start = a: 'abcd'\nb :'efgh'").to.parseAs(
+      oneRuleGrammar(sequence2)
+    );
     expect("start = a:'abcd'\nb:'efgh'\nc:'ijkl'\nd:'mnop'").to.parseAs(
       oneRuleGrammar(sequence4)
     );
@@ -395,6 +398,15 @@ describe("Peggy grammar parser", () => {
     expect("start = @a:'abcd'").to.parseAs(
       $S($P("a", literalAbcd))
     );
+    expect("start = @a: 'abcd'").to.parseAs(
+      $S($P("a", literalAbcd))
+    );
+    expect("start = @a :'abcd'").to.parseAs(
+      $S($P("a", literalAbcd))
+    );
+    expect("start = @a : 'abcd'").to.parseAs(
+      $S($P("a", literalAbcd))
+    );
     expect("start = 'abcd' @'efgh'").to.parseAs(
       $S(literalAbcd, $P(null, literalEfgh))
     );