support throw as expression in match statement

glayzzle · Mar 29, 2021 · d27e051 · d27e051
1 parent 6e91308
commit d27e051
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/src/parser/expr.js b/src/parser/expr.js
@@ -346,6 +346,14 @@ module.exports = {
       case this.tok.T_UNSET_CAST:
         return this.read_expr_cast("unset");
 
+      case this.tok.T_THROW: {
+        if (this.version < 800) {
+          this.raiseError("PHP 8+ is required to use throw as an expression");
+        }
+        const result = this.node("throw");
+        const expr = this.next().read_expr();
+        return result(expr);
+      }
       case this.tok.T_EXIT: {
         const useDie = this.lexer.yytext.toLowerCase() === "die";
         result = this.node("exit");

diff --git a/test/snapshot/__snapshots__/match.test.js.snap b/test/snapshot/__snapshots__/match.test.js.snap
@@ -258,12 +258,25 @@ Program {
               "kind": "matcharm",
             },
             MatchArm {
-              "body": String {
-                "isDoubleQuote": false,
-                "kind": "string",
-                "raw": "'Nope!'",
-                "unicode": false,
-                "value": "Nope!",
+              "body": Throw {
+                "kind": "throw",
+                "what": New {
+                  "arguments": Array [
+                    String {
+                      "isDoubleQuote": false,
+                      "kind": "string",
+                      "raw": "'Nope'",
+                      "unicode": false,
+                      "value": "Nope",
+                    },
+                  ],
+                  "kind": "new",
+                  "what": Name {
+                    "kind": "name",
+                    "name": "Exception",
+                    "resolution": "uqn",
+                  },
+                },
               },
               "conds": Array [
                 Boolean {

diff --git a/test/snapshot/match.test.js b/test/snapshot/match.test.js
@@ -35,7 +35,7 @@ describe("match", () => {
     const ast = parser.parseEval(`
     $test = match($test) {
       true, => 'ok',
-      false => 'Nope!',
+      false => throw new Exception('Nope'),
     };
     `);
     expect(ast).toMatchSnapshot();