Fixed bug when parsing a semicolon on a new line after break and cont…

…inue statements
mck89 · Jun 21, 2020 · e11664e · e11664e
1 parent 7444820
commit e11664e
Show file tree

Hide file tree

Showing 7 changed files with 654 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.10.3-dev"
+            "dev-master": "1.10.4-dev"
         }
     }
 }
diff --git a/doc/changelog.md b/doc/changelog.md
@@ -4,6 +4,7 @@ Changelog
 #### 1.10.4
 * Implemented parsing of coalescing operator
 * Implemented parsing of optional chaining
+* Fixed bug when parsing a semicolon on a new line after break and continue statements
 
 #### 1.10.3
 * Implemented parsing of `import.meta` syntax

diff --git a/lib/Peast/Syntax/Parser.php b/lib/Peast/Syntax/Parser.php
@@ -646,14 +646,15 @@ protected function parseContinueStatement()
 
             $node = $this->createNode("ContinueStatement", $token);
 
-            if ($this->scanner->noLineTerminators()) {
-                if ($label = $this->parseIdentifier(static::$labelledIdentifier)) {
-                    $node->setLabel($label);
-                }
+            if ($this->scanner->noLineTerminators() &&
+                ($label = $this->parseIdentifier(static::$labelledIdentifier))
+            ) {
+                $node->setLabel($label);
+                $this->assertEndOfStatement();
+            } else {
+                $this->scanner->consume(";");
             }
 
-            $this->assertEndOfStatement();
-
             return $this->completeNode($node);
         }
         return null;
@@ -670,14 +671,14 @@ protected function parseBreakStatement()
 
             $node = $this->createNode("BreakStatement", $token);
 
-            if ($this->scanner->noLineTerminators()) {
-                if ($label = $this->parseIdentifier(static::$labelledIdentifier)) {
-                    $node->setLabel($label);
-                }
+            if ($this->scanner->noLineTerminators() &&
+                ($label = $this->parseIdentifier(static::$labelledIdentifier))) {
+                $node->setLabel($label);
+                $this->assertEndOfStatement();
+            } else {
+                $this->scanner->consume(";");
             }
 
-            $this->assertEndOfStatement();
-
             return $this->completeNode($node);
         }
         return null;

diff --git a/test/Peast/Syntax/ES2015/files/Misc/ContinueBreakNoLabelNewLineAfter.Render.txt b/test/Peast/Syntax/ES2015/files/Misc/ContinueBreakNoLabelNewLineAfter.Render.txt
@@ -0,0 +1,28 @@
+for (; ; ) {
+	if (true) {
+		break;
+	} else {
+	}
+	if (true) {
+		continue;
+	} else {
+	}
+}
+/**************************************************/
+for(;;){if(true)break;else{}if(true)continue;else{}}
+/**************************************************/
+for ( ; ;  )
+{
+	if ( true )
+	{
+		break;
+	} else
+	{
+	}
+	if ( true )
+	{
+		continue;
+	} else
+	{
+	}
+}