#235 fix

glayzzle · Nov 18, 2018 · b73c136 · b73c136
1 parent 2bfe692
commit b73c136
Show file tree

Hide file tree

Showing 5 changed files with 185 additions and 8 deletions.
diff --git a/src/parser/expr.js b/src/parser/expr.js
@@ -502,7 +502,7 @@ module.exports = {
       this.token === this.tok.T_STRING ||
       this.token === this.tok.T_NAMESPACE
     ) {
-      let result = this.read_namespace_name();
+      let result = this.read_namespace_name(true);
       if (this.token === this.tok.T_DOUBLE_COLON) {
         result = this.read_static_getter(result);
       }

diff --git a/src/parser/namespace.js b/src/parser/namespace.js
@@ -61,7 +61,7 @@ module.exports = {
    * @see http://php.net/manual/en/language.namespaces.rules.php
    * @return {Reference}
    */
-  read_namespace_name: function() {
+  read_namespace_name: function(resolveReference) {
     const result = this.node();
     let relative = false;
     if (this.token === this.tok.T_NAMESPACE) {
@@ -73,7 +73,11 @@ module.exports = {
       this.tok.T_NS_SEPARATOR,
       true
     );
-    if (!relative && names.length === 1) {
+    if (
+      !relative &&
+      names.length === 1 &&
+      (resolveReference || this.token !== "(")
+    ) {
       if (names[0].toLowerCase() === "parent") {
         return result("parentreference", names[0]);
       } else if (names[0].toLowerCase() === "self") {

diff --git a/test/debug.js b/test/debug.js
@@ -14,13 +14,14 @@
   ]
 }
  */
-var parser = require("../src/index");
-parser.parseEval(`
-new foo;
-$a = (new foo)[0];
+const parser = require("../src/index");
+const ast = parser.parseEval(`
+self();
+paRenT();
 `, { 
     parser: {
       debug: true
     }
   }
-);
+);
+console.log(ast);
diff --git a/test/snapshot/__snapshots__/expr.test.js.snap b/test/snapshot/__snapshots__/expr.test.js.snap
@@ -314,6 +314,99 @@ Program {
 }
 `;
 
+exports[`Test expressions fix #235 1`] = `
+Program {
+  "children": Array [
+    Call {
+      "arguments": Array [],
+      "kind": "call",
+      "what": ClassReference {
+        "kind": "classreference",
+        "name": "self",
+        "resolution": "uqn",
+      },
+    },
+    Call {
+      "arguments": Array [],
+      "kind": "call",
+      "what": ClassReference {
+        "kind": "classreference",
+        "name": "sElF",
+        "resolution": "uqn",
+      },
+    },
+    Call {
+      "arguments": Array [],
+      "kind": "call",
+      "what": ClassReference {
+        "kind": "classreference",
+        "name": "parent",
+        "resolution": "uqn",
+      },
+    },
+    Call {
+      "arguments": Array [],
+      "kind": "call",
+      "what": ClassReference {
+        "kind": "classreference",
+        "name": "pArEnT",
+        "resolution": "uqn",
+      },
+    },
+    Call {
+      "arguments": Array [],
+      "kind": "call",
+      "what": StaticLookup {
+        "kind": "staticlookup",
+        "offset": Identifier {
+          "kind": "identifier",
+          "name": "foo",
+        },
+        "what": ParentReference {
+          "kind": "parentreference",
+          "raw": "parent",
+        },
+      },
+    },
+    ExpressionStatement {
+      "expression": New {
+        "arguments": Array [],
+        "kind": "new",
+        "what": SelfReference {
+          "kind": "selfreference",
+          "raw": "self",
+        },
+      },
+      "kind": "expressionstatement",
+    },
+    ExpressionStatement {
+      "expression": New {
+        "arguments": Array [],
+        "kind": "new",
+        "what": StaticReference {
+          "kind": "staticreference",
+          "raw": "static",
+        },
+      },
+      "kind": "expressionstatement",
+    },
+    ExpressionStatement {
+      "expression": New {
+        "arguments": Array [],
+        "kind": "new",
+        "what": ParentReference {
+          "kind": "parentreference",
+          "raw": "parent",
+        },
+      },
+      "kind": "expressionstatement",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
 exports[`Test expressions should assign class static 1`] = `
 Program {
   "children": Array [
@@ -2208,6 +2301,63 @@ Program {
 }
 `;
 
+exports[`Test expressions test node references 1`] = `
+Program {
+  "children": Array [
+    Call {
+      "arguments": Array [],
+      "kind": "call",
+      "what": StaticLookup {
+        "kind": "staticlookup",
+        "offset": Identifier {
+          "kind": "identifier",
+          "name": "foo",
+        },
+        "what": ParentReference {
+          "kind": "parentreference",
+          "raw": "parent",
+        },
+      },
+    },
+    ExpressionStatement {
+      "expression": New {
+        "arguments": Array [],
+        "kind": "new",
+        "what": SelfReference {
+          "kind": "selfreference",
+          "raw": "self",
+        },
+      },
+      "kind": "expressionstatement",
+    },
+    ExpressionStatement {
+      "expression": New {
+        "arguments": Array [],
+        "kind": "new",
+        "what": StaticReference {
+          "kind": "staticreference",
+          "raw": "static",
+        },
+      },
+      "kind": "expressionstatement",
+    },
+    ExpressionStatement {
+      "expression": New {
+        "arguments": Array [],
+        "kind": "new",
+        "what": ParentReference {
+          "kind": "parentreference",
+          "raw": "parent",
+        },
+      },
+      "kind": "expressionstatement",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
 exports[`Test expressions test silent 1`] = `
 Program {
   "children": Array [

diff --git a/test/snapshot/expr.test.js b/test/snapshot/expr.test.js
@@ -228,6 +228,28 @@ describe("Test expressions", function() {
     `, { parser: { debug: false } })).toMatchSnapshot();
   });
 
+  it("fix #235", function() {
+    expect(parser.parseEval(`
+    self();
+    sElF();
+    parent();
+    pArEnT();
+    parent::foo();
+    new self();
+    new static();
+    new parent();
+    `, { parser: { debug: false } })).toMatchSnapshot();
+  });
+
+  it("test node references", function() {
+    expect(parser.parseEval(`
+    parent::foo();
+    new self();
+    new static();
+    new parent();
+    `, { parser: { debug: false } })).toMatchSnapshot();
+  });
+
   it("test fail new", function() {
     expect(parser.parseEval(`
       $a = new foo[0];