Parsing of catch without parameter

mck89 · Dec 21, 2018 · 47e9d46 · 47e9d46
1 parent 19feb1a
commit 47e9d46
Show file tree

Hide file tree

Showing 8 changed files with 636 additions and 9 deletions.
diff --git a/lib/Peast/Renderer.php b/lib/Peast/Renderer.php
@@ -195,14 +195,16 @@ protected function renderNode(Syntax\Node\Node $node)
                          ")";
             break;
             case "CatchClause":
-                $code .= "catch" .
-                         $this->renderOpts->sao .
-                         "(" .
-                         $this->renderOpts->sirb .
-                         $this->renderNode($node->getParam()) .
-                         $this->renderOpts->sirb .
-                         ")" .
-                         $this->renderStatementBlock($node->getBody(), true);
+                $code .= "catch";
+                if ($params = $node->getParam()) {
+                    $code .= $this->renderOpts->sao .
+                             "(" .
+                             $this->renderOpts->sirb .
+                             $this->renderNode($params) .
+                             $this->renderOpts->sirb .
+                             ")";
+                }
+                $code .= $this->renderStatementBlock($node->getBody(), true);
             break;
             case "ClassExpression":
             case "ClassDeclaration":

diff --git a/lib/Peast/Syntax/ES2019/Parser.php b/lib/Peast/Syntax/ES2019/Parser.php
@@ -18,4 +18,33 @@
  */
 class Parser extends \Peast\Syntax\ES2018\Parser
 {
+    /**
+     * Parses the catch block of a try-catch statement
+     * 
+     * @return Node\CatchClause|null
+     */
+    protected function parseCatch()
+    {
+        if ($token = $this->scanner->consume("catch")) {
+
+            $node = $this->createNode("CatchClause", $token);
+
+            if ($this->scanner->consume("(")) {
+                if (!($param = $this->parseCatchParameter()) ||
+                    !$this->scanner->consume(")")) {
+                    return $this->error();
+                }
+                $node->setParam($param);
+            }
+
+            if (!($body = $this->parseBlock())) {
+                return $this->error();
+            }
+
+            $node->setBody($body);
+
+            return $this->completeNode($node);
+        }
+        return null;
+    }
 }
diff --git a/lib/Peast/Syntax/Node/CatchClause.php b/lib/Peast/Syntax/Node/CatchClause.php
@@ -57,8 +57,9 @@ public function getParam()
      * 
      * @return $this
      */
-    public function setParam(Pattern $param)
+    public function setParam($param)
     {
+        $this->assertType($param, "Pattern", true);
         $this->param = $param;
         return $this;
     }

diff --git a/test/Peast/Syntax/ES2019/ES2019Test.php b/test/Peast/Syntax/ES2019/ES2019Test.php
@@ -10,6 +10,17 @@ protected function getTestVersions()
         return array("ES2015", "ES2016", "ES2017", "ES2018", "ES2019");
     }
 
+    protected function getExcludedTests()
+    {
+        $excluded = parent::getExcludedTests();
+        return array_merge(
+            $excluded,
+            array(
+                "TryStatement/InvalidCatch2.js"
+            )
+        );
+    }
+
     public function stringCharsProvider()
     {
         $chars = parent::stringCharsProvider();

diff --git a/test/Peast/Syntax/ES2019/files/TryStatement/CatchNoParam.Render.txt b/test/Peast/Syntax/ES2019/files/TryStatement/CatchNoParam.Render.txt
@@ -0,0 +1,15 @@
+try {
+	fn();
+} catch {
+	console.log("error");
+}
+/**************************************************/
+try{fn();}catch{console.log("error");}
+/**************************************************/
+try
+{
+	fn(  );
+} catch
+{
+	console.log( "error" );
+}