refactor: read_lexical_vars

Author: alexander-akait

src/parser/function.js

@@ -120,10 +120,8 @@ module.exports = {
     if (this.expect("(")) this.next();
     const params = this.read_parameter_list();
     if (this.expect(")")) this.next();
-    if (type === 1 && this.token === this.tok.T_USE) {
-      if (this.next().expect("(")) this.next();
-      use = this.read_list(this.read_lexical_var, ",");
-      if (this.expect(")")) this.next();
+    if (type === 1) {
+      use = this.read_lexical_vars();
     }
     if (this.token === ":") {
       if (this.next().token === "?") {
@@ -138,6 +136,24 @@ module.exports = {
     }
     return result(name, params, isRef, returnType, nullable);
   },
+
+  read_lexical_vars: function() {
+    let result = [];
+
+    if (this.token === this.tok.T_USE) {
+      this.next();
+      this.expect("(") && this.next();
+      result = this.read_lexical_var_list();
+      this.expect(")") && this.next();
+    }
+
+    return result;
+  },
+
+  read_lexical_var_list: function() {
+    return this.read_list(this.read_lexical_var, ",");
+  },
+
   /**
    * ```ebnf
    * lexical_var ::= '&'? T_VARIABLE

test/snapshot/__snapshots__/closure.test.js.snap

@@ -409,6 +409,63 @@ Program {
 }
 `;
 
+exports[`closure inside call 1`] = `
+Program {
+  "children": Array [
+    ExpressionStatement {
+      "expression": Call {
+        "arguments": Array [
+          Closure {
+            "arguments": Array [
+              Parameter {
+                "byref": false,
+                "kind": "parameter",
+                "name": Identifier {
+                  "kind": "identifier",
+                  "name": "arg",
+                },
+                "nullable": false,
+                "type": null,
+                "value": null,
+                "variadic": false,
+              },
+            ],
+            "body": Block {
+              "children": Array [
+                Return {
+                  "expr": Variable {
+                    "curly": false,
+                    "kind": "variable",
+                    "name": "arg",
+                  },
+                  "kind": "return",
+                },
+              ],
+              "kind": "block",
+            },
+            "byref": false,
+            "isStatic": false,
+            "kind": "closure",
+            "nullable": false,
+            "type": null,
+            "uses": Array [],
+          },
+        ],
+        "kind": "call",
+        "what": ClassReference {
+          "kind": "classreference",
+          "name": "call",
+          "resolution": "uqn",
+        },
+      },
+      "kind": "expressionstatement",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
 exports[`closure simple 1`] = `
 Program {
   "children": Array [
@@ -565,3 +622,67 @@ Program {
   "kind": "program",
 }
 `;
+
+exports[`closure use multiple 1`] = `
+Program {
+  "children": Array [
+    ExpressionStatement {
+      "expression": Assign {
+        "kind": "assign",
+        "left": Variable {
+          "curly": false,
+          "kind": "variable",
+          "name": "var",
+        },
+        "operator": "=",
+        "right": Closure {
+          "arguments": Array [],
+          "body": Block {
+            "children": Array [
+              Echo {
+                "expressions": Array [
+                  String {
+                    "isDoubleQuote": true,
+                    "kind": "string",
+                    "raw": "\\"something\\"",
+                    "unicode": false,
+                    "value": "something",
+                  },
+                ],
+                "kind": "echo",
+                "shortForm": false,
+              },
+            ],
+            "kind": "block",
+          },
+          "byref": false,
+          "isStatic": false,
+          "kind": "closure",
+          "nullable": false,
+          "type": null,
+          "uses": Array [
+            Variable {
+              "curly": false,
+              "kind": "variable",
+              "name": "message",
+            },
+            Variable {
+              "curly": false,
+              "kind": "variable",
+              "name": "message1",
+            },
+            Variable {
+              "curly": false,
+              "kind": "variable",
+              "name": "message2",
+            },
+          ],
+        },
+      },
+      "kind": "expressionstatement",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;

test/snapshot/closure.test.js

@@ -33,6 +33,13 @@ describe("closure", () => {
       )
     ).toMatchSnapshot();
   });
+  it("use multiple", () => {
+    expect(
+      parser.parseEval(
+        '$var = function() use ($message, $message1, $message2) { echo "something"; };'
+      )
+    ).toMatchSnapshot();
+  });
   it("use by ref", () => {
     expect(
       parser.parseEval(
@@ -54,4 +61,9 @@ describe("closure", () => {
       )
     ).toMatchSnapshot();
   });
+  it("inside call", () => {
+    expect(
+      parser.parseEval(`call(function ($arg) { return $arg; });`)
+    ).toMatchSnapshot();
+  });
 });