Merge pull request #225 from glayzzle/issue-201

fix: staticlookup inside call - I validate this commit, will open another issue as it's introduce a minor side effect
glayzzle · Nov 10, 2018 · e002a44 · e002a44
2 parents e6752a9 + 15fbf83
commit e002a44
Show file tree

Hide file tree

Showing 5 changed files with 157 additions and 0 deletions.
diff --git a/src/parser/variable.js b/src/parser/variable.js
@@ -94,6 +94,10 @@ module.exports = {
       name = this.text();
       this.next();
       offset = offset(name);
+    } else if (this.token === "{") {
+      offset = this.next().read_expr();
+      this.expect("}") && this.next();
+      this.expect("(");
     } else {
       this.error([this.tok.T_VARIABLE, this.tok.T_STRING]);
       // graceful mode : set getter as error node and continue

diff --git a/test/snapshot/__snapshots__/call.test.js.snap b/test/snapshot/__snapshots__/call.test.js.snap
@@ -471,6 +471,65 @@ Program {
 }
 `;
 
+exports[`Test call inside staticlookup (10) 1`] = `
+Program {
+  "children": Array [
+    Call {
+      "arguments": Array [],
+      "kind": "call",
+      "what": Call {
+        "arguments": Array [],
+        "kind": "call",
+        "what": StaticLookup {
+          "kind": "staticlookup",
+          "offset": Identifier {
+            "kind": "identifier",
+            "name": "call",
+          },
+          "what": ClassReference {
+            "kind": "classreference",
+            "name": "Order",
+            "resolution": "uqn",
+          },
+        },
+      },
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
+exports[`Test call inside staticlookup (11) 1`] = `
+Program {
+  "children": Array [
+    Call {
+      "arguments": Array [],
+      "kind": "call",
+      "what": StaticLookup {
+        "kind": "staticlookup",
+        "offset": Call {
+          "arguments": Array [],
+          "kind": "call",
+          "what": ClassReference {
+            "kind": "classreference",
+            "name": "call",
+            "resolution": "uqn",
+          },
+        },
+        "what": ClassReference {
+          "kind": "classreference",
+          "name": "Order",
+          "resolution": "uqn",
+        },
+      },
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
 exports[`Test call inside staticlookup 1`] = `
 Program {
   "children": Array [

diff --git a/test/snapshot/__snapshots__/graceful.test.js.snap b/test/snapshot/__snapshots__/graceful.test.js.snap
@@ -65,6 +65,73 @@ Program {
 }
 `;
 
+exports[`Test graceful mode to suppress errors should fail ! 1`] = `
+Program {
+  "children": Array [
+    ExpressionStatement {
+      "expression": New {
+        "arguments": Array [],
+        "kind": "new",
+        "what": StaticLookup {
+          "kind": "staticlookup",
+          "offset": Call {
+            "arguments": Array [],
+            "kind": "call",
+            "what": ClassReference {
+              "kind": "classreference",
+              "name": "call",
+              "resolution": "uqn",
+            },
+          },
+          "what": ClassReference {
+            "kind": "classreference",
+            "name": "Foo",
+            "resolution": "uqn",
+          },
+        },
+      },
+      "kind": "expressionstatement",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
+exports[`Test graceful mode to suppress errors staticlookup 1`] = `
+Program {
+  "children": Array [
+    StaticLookup {
+      "kind": "staticlookup",
+      "offset": Call {
+        "arguments": Array [],
+        "kind": "call",
+        "what": ClassReference {
+          "kind": "classreference",
+          "name": "call",
+          "resolution": "uqn",
+        },
+      },
+      "what": ClassReference {
+        "kind": "classreference",
+        "name": "Order",
+        "resolution": "uqn",
+      },
+    },
+  ],
+  "errors": Array [
+    Error {
+      "expected": "(",
+      "kind": "error",
+      "line": 1,
+      "message": "Parse Error : syntax error, unexpected ';', expecting '(' on line 1",
+      "token": "';'",
+    },
+  ],
+  "kind": "program",
+}
+`;
+
 exports[`Test graceful mode to suppress errors test class 1`] = `
 Program {
   "children": Array [

diff --git a/test/snapshot/call.test.js b/test/snapshot/call.test.js
@@ -280,4 +280,22 @@ describe("Test call", function() {
     );
     expect(ast).toMatchSnapshot();
   });
+  it("inside staticlookup (10)", function() {
+    const ast = parser.parseEval(
+      'Order::call()();',
+      {
+        parser: { debug: false }
+      }
+    );
+    expect(ast).toMatchSnapshot();
+  });
+  it("inside staticlookup (11)", function() {
+    const ast = parser.parseEval(
+      'Order::{call()}();',
+      {
+        parser: { debug: false }
+      }
+    );
+    expect(ast).toMatchSnapshot();
+  });
 });
diff --git a/test/snapshot/graceful.test.js b/test/snapshot/graceful.test.js
@@ -46,5 +46,14 @@ describe("Test graceful mode", function() {
         ->
       `)).toMatchSnapshot();
     });
+
+    it("staticlookup", function() {
+      expect(test.parseEval('Order::{call()};')).toMatchSnapshot();
+    });
+
+    it("should fail !", function() {
+      expect(test.parseEval('new Foo::{call()}();')).toMatchSnapshot();
+    });
+
   });
 });