added support for multiple match lhd tokens

Author: cseufert

src/ast.js

@@ -493,6 +493,7 @@ AST.prototype.checkNodes = function () {
   require("./ast/encapsed"),
   require("./ast/encapsedpart"),
   require("./ast/entry"),
+  require("./ast/matchentry"),
   require("./ast/error"),
   require("./ast/eval"),
   require("./ast/exit"),

src/ast/matchentry.js

@@ -0,0 +1,29 @@
+/**
+ * Copyright (C) 2018 Glayzzle (BSD3 License)
+ * @authors https://github.com/glayzzle/php-parser/graphs/contributors
+ * @url http://glayzzle.com
+ */
+"use strict";
+
+const Expression = require("./expression");
+const KIND = "matchentry";
+
+/**
+ * An array entry - see [Array](#array)
+ * @constructor Entry
+ * @extends {Expression}
+ * @property {Node|null} key The entry key/offset
+ * @property {Node} value The entry value
+ * @property {Boolean} byRef By reference
+ * @property {Boolean} unpack Argument unpacking
+ */
+module.exports = Expression.extends(KIND, function MatchEntry(
+  keys,
+  value,
+  docs,
+  location
+) {
+  Expression.apply(this, [KIND, docs, location]);
+  this.keys = keys;
+  this.value = value;
+});

src/parser/expr.js

@@ -635,21 +635,25 @@ module.exports = {
       return this.node("noop")();
     }
 
-    const entry = this.node("entry");
+    const entry = this.node("matchentry");
 
-    let key = null;
+    const keys = [];
     if (this.token === this.tok.T_DEFAULT) {
-      key = this.node("defaultkeyword")("default");
+      keys.push(this.node("defaultkeyword")("default"));
       this.next();
     } else {
-      key = this.read_expr();
+      keys.push(this.read_expr());
+      while (this.token === ",") {
+        this.next();
+        keys.push(this.read_expr());
+      }
     }
     if (this.expect(this.tok.T_DOUBLE_ARROW)) {
       this.next();
     }
     const value = this.read_expr();
 
-    return entry(key, value, false, false);
+    return entry(keys, value, false, false);
   },
 
   /**

test/snapshot/match.test.js

@@ -4,9 +4,31 @@ describe("match", () => {
   it("can be parsed", () => {
     const ast = parser.parseEval(`
     $test = match($a) {
-    true => 'yes',
-    false => 'no',
-    default => null,
+      true => 'yes',
+      false => 'no',
+      default => null,
+    };
+    `);
+    console.log(ast.children[0].expression.right.body);
+    // expect (ast).toMatchSnapshot();
+  });
+
+  it("can have lhs, functions", () => {
+    const ast = parser.parseEval(`
+    $test = match(true) {
+      test($a), abc($b) => 'yes',
+      default => null,
+    };
+    `);
+    console.log(ast.children[0].expression.right.body);
+    // expect (ast).toMatchSnapshot();
+  });
+
+  it("can have multiple values", () => {
+    const ast = parser.parseEval(`
+    $test = match(trye) {
+      0,1,2,3 => run(),
+      default => null,
     };
     `);
     console.log(ast.children[0].expression.right.body);