Merge pull request #390 from glayzzle/refactor-isset-variables

refactor: isset variables

Author: ichiriac

src/parser/expr.js

@@ -116,6 +116,20 @@ module.exports = {
     return this.node("cast")(type, this.text(), this.next().read_expr());
   },
 
+  /**
+   * Read a isset variable
+   */
+  read_isset_variable: function() {
+    return this.read_expr();
+  },
+
+  /**
+   * Reads isset variables
+   */
+  read_isset_variables: function () {
+    return this.read_function_list(this.read_isset_variable, ",");
+  },
+
   /**
    * ```ebnf
    * Reads an expression
@@ -215,7 +229,7 @@ module.exports = {
         if (this.next().expect("(")) {
           this.next();
         }
-        const variables = this.read_function_list(this.read_expr, ",");
+        const variables = this.read_isset_variables();
         if (this.expect(")")) {
           this.next();
         }

test/snapshot/__snapshots__/isset.test.js.snap

@@ -85,6 +85,48 @@ Program {
 }
 `;
 
+exports[`isset test errors 1`] = `
+Program {
+  "children": Array [
+    ExpressionStatement {
+      "expression": Assign {
+        "kind": "assign",
+        "left": Variable {
+          "curly": false,
+          "kind": "variable",
+          "name": "var",
+        },
+        "operator": "=",
+        "right": Isset {
+          "kind": "isset",
+          "variables": Array [
+            undefined,
+          ],
+        },
+      },
+      "kind": "expressionstatement",
+    },
+  ],
+  "errors": Array [
+    Error {
+      "expected": "EXPR",
+      "kind": "error",
+      "line": 1,
+      "message": "Parse Error : syntax error, unexpected ')' on line 1",
+      "token": "')'",
+    },
+    Error {
+      "expected": ")",
+      "kind": "error",
+      "line": 1,
+      "message": "Parse Error : syntax error, unexpected ';', expecting ')' on line 1",
+      "token": "';'",
+    },
+  ],
+  "kind": "program",
+}
+`;
+
 exports[`isset trailing comma #2 1`] = `
 Program {
   "children": Array [

test/snapshot/isset.test.js

@@ -1,19 +1,26 @@
-const parser = require('../main');
+const parser = require("../main");
 
 describe("isset", function() {
   it("simple", function() {
-    expect(parser.parseEval('isset($var);')).toMatchSnapshot();
+    expect(parser.parseEval("isset($var);")).toMatchSnapshot();
   });
   it("multiple", function() {
-    expect(parser.parseEval('isset($var, $var, $var);')).toMatchSnapshot();
+    expect(parser.parseEval("isset($var, $var, $var);")).toMatchSnapshot();
   });
   it("assign", function() {
-    expect(parser.parseEval('$var = isset($var);')).toMatchSnapshot();
+    expect(parser.parseEval("$var = isset($var);")).toMatchSnapshot();
   });
   it("trailing comma", function() {
-    expect(parser.parseEval('isset($foo,);')).toMatchSnapshot();
+    expect(parser.parseEval("isset($foo,);")).toMatchSnapshot();
   });
   it("trailing comma #2", function() {
-    expect(parser.parseEval('isset($foo, $bar,);')).toMatchSnapshot();
+    expect(parser.parseEval("isset($foo, $bar,);")).toMatchSnapshot();
+  });
+  it("test errors", function() {
+    const errAst = parser.parseEval("$var = isset();", {
+      parser: { suppressErrors: true }
+    });
+    expect(errAst).toMatchSnapshot();
+    expect(errAst.errors.length).not.toBe(0);
   });
 });