fix #167

Author: ichiriac

src/parser/variable.js

@@ -290,6 +290,7 @@ module.exports = {
     let offset;
     while (this.token != this.EOF) {
       const node = this.node();
+      /*
       if (this.token == "[") {
         offset = null;
         if (encapsed) {
@@ -299,7 +300,8 @@ module.exports = {
         }
         this.expect("]") && this.next();
         result = node("offsetlookup", result, offset);
-      } else if (this.token == "{" && !encapsed) {
+      } else */
+      if (this.token == "{" && !encapsed) {
         offset = this.next().read_expr();
         this.expect("}") && this.next();
         result = node("offsetlookup", result, offset);

test/debug.js

@@ -17,13 +17,13 @@
 const util = require('util');
 const parser = require("../src/index");
 const ast = parser.parseEval(`
-true;
+Foo::$bar['baz']();
 `, { 
     parser: {
       debug: true
     }
   }
 );
 console.log(
-  util.inspect(ast, false, 5, true)
+  util.inspect(ast, false, 10, true)
 );

test/snapshot/__snapshots__/variable.test.js.snap

@@ -715,33 +715,33 @@ exports[`Test variables Variable chains 1`] = `
 Program {
   "children": Array [
     ExpressionStatement {
-      "expression": StaticLookup {
-        "kind": "staticlookup",
-        "offset": OffsetLookup {
+      "expression": OffsetLookup {
+        "kind": "offsetlookup",
+        "offset": Number {
+          "kind": "number",
+          "value": "2",
+        },
+        "what": OffsetLookup {
           "kind": "offsetlookup",
           "offset": Number {
             "kind": "number",
-            "value": "2",
+            "value": "1",
           },
-          "what": OffsetLookup {
-            "kind": "offsetlookup",
-            "offset": Number {
-              "kind": "number",
-              "value": "1",
-            },
-            "what": Variable {
+          "what": StaticLookup {
+            "kind": "staticlookup",
+            "offset": Variable {
               "byref": false,
               "curly": false,
               "kind": "variable",
               "name": "a",
             },
+            "what": ClassReference {
+              "kind": "classreference",
+              "name": "foo",
+              "resolution": "uqn",
+            },
           },
         },
-        "what": ClassReference {
-          "kind": "classreference",
-          "name": "foo",
-          "resolution": "uqn",
-        },
       },
       "kind": "expressionstatement",
     },
@@ -870,3 +870,84 @@ Program {
   "kind": "program",
 }
 `;
+
+exports[`Test variables fix #167 1`] = `
+Program {
+  "children": Array [
+    ExpressionStatement {
+      "expression": Assign {
+        "kind": "assign",
+        "left": Variable {
+          "byref": false,
+          "curly": false,
+          "kind": "variable",
+          "name": "var",
+        },
+        "operator": "=",
+        "right": Call {
+          "arguments": Array [],
+          "kind": "call",
+          "what": StaticLookup {
+            "kind": "staticlookup",
+            "offset": OffsetLookup {
+              "kind": "offsetlookup",
+              "offset": String {
+                "isDoubleQuote": false,
+                "kind": "string",
+                "raw": "'baz'",
+                "unicode": false,
+                "value": "baz",
+              },
+              "what": Variable {
+                "byref": false,
+                "curly": false,
+                "kind": "variable",
+                "name": "bar",
+              },
+            },
+            "what": ClassReference {
+              "kind": "classreference",
+              "name": "Foo",
+              "resolution": "uqn",
+            },
+          },
+        },
+      },
+      "kind": "expressionstatement",
+    },
+    ExpressionStatement {
+      "expression": Call {
+        "arguments": Array [],
+        "kind": "call",
+        "what": OffsetLookup {
+          "kind": "offsetlookup",
+          "offset": String {
+            "isDoubleQuote": false,
+            "kind": "string",
+            "raw": "'baz'",
+            "unicode": false,
+            "value": "baz",
+          },
+          "what": StaticLookup {
+            "kind": "staticlookup",
+            "offset": Variable {
+              "byref": false,
+              "curly": false,
+              "kind": "variable",
+              "name": "bar",
+            },
+            "what": ClassReference {
+              "kind": "classreference",
+              "name": "Foo",
+              "resolution": "uqn",
+            },
+          },
+        },
+      },
+      "kind": "expressionstatement",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;

test/snapshot/variable.test.js

@@ -17,6 +17,10 @@ describe("Test variables", function() {
     expect(parser.parseEval("foo::$a[1][2];")).toMatchSnapshot();
   });
 
+  it("fix #167", function() {
+    expect(parser.parseEval("$var = Foo::{$bar['baz']}();Foo::$bar['baz']();")).toMatchSnapshot();
+  });
+
   it("Class constants", function() {
     expect(parser.parseEval(`
       static::foo();