Merge pull request glayzzle#226 from glayzzle/issue-220

Issue 220 - impl static & instanceof

Author: ichiriac

src/parser/expr.js

@@ -6,9 +6,11 @@
 "use strict";
 
 module.exports = {
-  read_expr: function() {
+  read_expr: function(expr) {
     const result = this.node();
-    const expr = this.read_expr_item();
+    if (!expr) {
+      expr = this.read_expr_item();
+    }
     // binary operations
     if (this.token === "|")
       return result("bin", "|", expr, this.next().read_expr());
@@ -63,8 +65,21 @@ module.exports = {
       return result("bin", ">=", expr, this.next().read_expr());
     if (this.token === this.tok.T_SPACESHIP)
       return result("bin", "<=>", expr, this.next().read_expr());
-    if (this.token === this.tok.T_INSTANCEOF)
-      return result("bin", "instanceof", expr, this.next().read_expr());
+    if (this.token === this.tok.T_INSTANCEOF) {
+      expr = result(
+        "bin",
+        "instanceof",
+        expr,
+        this.next().read_class_name_reference()
+      );
+      if (
+        this.token !== ";" &&
+        this.token !== this.tok.T_INLINE_HTML &&
+        this.token !== this.EOF
+      ) {
+        expr = this.read_expr(expr);
+      }
+    }
 
     // extra operations :
     // $username = $_GET['user'] ?? 'nobody';

src/parser/namespace.js

@@ -112,6 +112,14 @@ module.exports = {
     this.expect(";") && this.next();
     return result;
   },
+  /**
+   *
+   * @see https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L1045
+   */
+  read_class_name_reference: function() {
+    // resolved as the same
+    return this.read_variable(true, false, false);
+  },
   /**
    * Reads a use declaration
    * ```ebnf

test/precedence.test.js

@@ -48,7 +48,7 @@ describe("Test precedence", function() {
     shouldBeSame("5 % 3 . 2", "(5 % 3) . 2");
   });
   it("test instanceof", function() {
-    shouldBeSame("3 instanceof 2 * 5", "(3 instanceof 2) * 5");
+    shouldBeSame("$a instanceof $b && $c", "($a instanceof $b) && $c");
   });
   it("test <<", function() {
     shouldBeSame("1 + 3 << 5", "(1 + 3) << 5");
@@ -95,8 +95,8 @@ describe("Test precedence", function() {
     shouldBeSame("5 AND 4 + 3", "5 AND (4 + 3)");
   });
   it("test unary : !", function() {
-    shouldBeSame("!4 instanceof 3", "(!4) instanceof 3");
-    shouldBeSame("!4 + 5 instanceof 3", "(!4) + (5 instanceof 3)");
+    shouldBeSame("!$a instanceof $b", "(!$a) instanceof $b");
+    shouldBeSame("!$a + $b instanceof $c", "(!$a) + ($b instanceof $c)");
     shouldBeSame("6 + !4 + 5", "6 + (!4) + 5");
     shouldBeSame("if($a && !$b) {}", "if($a && (!$b)) {}");
   });

test/snapshot/__snapshots__/bin.test.js.snap

@@ -818,6 +818,31 @@ Program {
 }
 `;
 
+exports[`bin instanceof static 1`] = `
+Program {
+  "children": Array [
+    ExpressionStatement {
+      "expression": Bin {
+        "kind": "bin",
+        "left": Variable {
+          "byref": false,
+          "curly": false,
+          "kind": "variable",
+          "name": "foo",
+        },
+        "right": StaticReference {
+          "kind": "staticreference",
+        },
+        "type": "instanceof",
+      },
+      "kind": "expressionstatement",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
 exports[`bin instanceof variable 1`] = `
 Program {
   "children": Array [
@@ -894,6 +919,48 @@ Program {
 }
 `;
 
+exports[`bin multiple instanceof static 1`] = `
+Program {
+  "children": Array [
+    ExpressionStatement {
+      "expression": Bin {
+        "kind": "bin",
+        "left": Bin {
+          "kind": "bin",
+          "left": Variable {
+            "byref": false,
+            "curly": false,
+            "kind": "variable",
+            "name": "foo",
+          },
+          "right": StaticReference {
+            "kind": "staticreference",
+          },
+          "type": "instanceof",
+        },
+        "right": Bin {
+          "kind": "bin",
+          "left": Variable {
+            "byref": false,
+            "curly": false,
+            "kind": "variable",
+            "name": "bar",
+          },
+          "right": SelfReference {
+            "kind": "selfreference",
+          },
+          "type": "instanceof",
+        },
+        "type": "&&",
+      },
+      "kind": "expressionstatement",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
 exports[`bin or 1`] = `
 Program {
   "children": Array [

test/snapshot/__snapshots__/encapsed.test.js.snap

@@ -296,7 +296,7 @@ exports[`encapsed variable curly (simple syntax) 1`] = `
 Program {
   "children": Array [
     Echo {
-      "arguments": Array [
+      "expressions": Array [
         Encapsed {
           "kind": "encapsed",
           "raw": "\\"string \${var} string\\"",

test/snapshot/bin.test.js

@@ -91,6 +91,13 @@ describe('bin', () => {
   it('instanceof self', () => {
     expect(parser.parseEval('$foo instanceof self;')).toMatchSnapshot();
   });
+  it('instanceof static', () => {
+    expect(parser.parseEval('$foo instanceof static;')).toMatchSnapshot();
+  });
+  it('multiple instanceof static', () => {
+    expect(parser.parseEval('$foo instanceof static && $bar instanceof self;')).toMatchSnapshot();
+  });
+
   it('??', () => {
     expect(parser.parseEval('$foo ?? $bar;')).toMatchSnapshot();
   });