#205 - fix assign usage - new & function calls

Author: ichiriac

src/parser/expr.js

@@ -199,13 +199,13 @@ module.exports = {
       case this.tok.T_INC:
         return this.node("pre")(
           "+",
-          this.next().read_variable(false, false, false)
+          this.next().read_variable(false, false)
         );
 
       case this.tok.T_DEC:
         return this.node("pre")(
           "-",
-          this.next().read_variable(false, false, false)
+          this.next().read_variable(false, false)
         );
 
       case this.tok.T_NEW:
@@ -341,7 +341,7 @@ module.exports = {
     // SCALAR | VARIABLE
     if (this.is("VARIABLE")) {
       result = this.node();
-      expr = this.read_variable(false, false, false);
+      expr = this.read_variable(false, false);
 
       // https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L877
       // should accept only a variable
@@ -355,13 +355,14 @@ module.exports = {
           if (isConst) this.error("VARIABLE");
           let right;
           if (this.next().token == "&") {
+            right = this.node('byref');
             if (this.next().token === this.tok.T_NEW) {
               if (this.php7) {
                 this.error();
               }
-              right = this.read_new_expr();
+              right = right(this.read_new_expr());
             } else {
-              right = this.read_variable(false, false, true);
+              right = right(this.read_variable(false, false));
             }
           } else {
             right = this.read_expr();
@@ -511,7 +512,7 @@ module.exports = {
       }
       return result;
     } else if (this.is("VARIABLE")) {
-      return this.read_variable(true, false, false);
+      return this.read_variable(true, false);
     } else {
       this.expect([this.tok.T_STRING, "VARIABLE"]);
     }

src/parser/loops.js

@@ -162,7 +162,7 @@ module.exports = {
       if (this.expect(isShort ? "]" : ")")) this.next();
       return result(assignList, isShort);
     } else {
-      return this.read_variable(false, false, false);
+      return this.read_variable(false, false);
     }
   }
 };

src/parser/namespace.js

@@ -123,7 +123,7 @@ module.exports = {
    */
   read_class_name_reference: function() {
     // resolved as the same
-    return this.read_variable(true, false, false);
+    return this.read_variable(true, false);
   },
   /**
    * Reads a use declaration

src/parser/scalar.js

@@ -224,7 +224,7 @@ module.exports = {
       // https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L1246
       curly = true;
       result.destroy();
-      result = this.next().read_variable(false, false, false);
+      result = this.next().read_variable(false, false);
       this.expect("}") && this.next();
     } else if (this.token === this.tok.T_VARIABLE) {
       // plain variable

src/parser/try.js

@@ -28,7 +28,7 @@ module.exports = {
       const item = this.node("catch");
       this.next().expect("(") && this.next();
       const what = this.read_list(this.read_namespace_name, "|", false);
-      const variable = this.read_variable(true, false, false);
+      const variable = this.read_variable(true, false);
       this.expect(")");
       catches.push(item(this.next().read_statement(), what, variable));
     }

test/debug.js

@@ -17,7 +17,7 @@
 const util = require('util');
 const parser = require("../src/index");
 const ast = parser.parseEval(`
-&$foo = 1;
+$a =& foo( &$b );
 `, { 
     parser: {
       debug: true,

test/snapshot/__snapshots__/byref.test.js.snap

@@ -12,22 +12,25 @@ Program {
           "name": "a",
         },
         "operator": "=",
-        "right": Call {
-          "arguments": Array [
-            ByRef {
-              "kind": "byref",
-              "what": Variable {
-                "curly": false,
-                "kind": "variable",
-                "name": "b",
+        "right": ByRef {
+          "kind": "byref",
+          "what": Call {
+            "arguments": Array [
+              ByRef {
+                "kind": "byref",
+                "what": Variable {
+                  "curly": false,
+                  "kind": "variable",
+                  "name": "b",
+                },
               },
+            ],
+            "kind": "call",
+            "what": ClassReference {
+              "kind": "classreference",
+              "name": "foo",
+              "resolution": "uqn",
             },
-          ],
-          "kind": "call",
-          "what": ClassReference {
-            "kind": "classreference",
-            "name": "foo",
-            "resolution": "uqn",
           },
         },
       },
@@ -88,13 +91,16 @@ Program {
           "name": "a",
         },
         "operator": "=",
-        "right": New {
-          "arguments": Array [],
-          "kind": "new",
-          "what": ClassReference {
-            "kind": "classreference",
-            "name": "foo",
-            "resolution": "uqn",
+        "right": ByRef {
+          "kind": "byref",
+          "what": New {
+            "arguments": Array [],
+            "kind": "new",
+            "what": ClassReference {
+              "kind": "classreference",
+              "name": "foo",
+              "resolution": "uqn",
+            },
           },
         },
       },

test/snapshot/__snapshots__/new.test.js.snap

@@ -12,13 +12,16 @@ Program {
           "name": "a",
         },
         "operator": "=",
-        "right": New {
-          "arguments": Array [],
-          "kind": "new",
-          "what": ClassReference {
-            "kind": "classreference",
-            "name": "Foo",
-            "resolution": "uqn",
+        "right": ByRef {
+          "kind": "byref",
+          "what": New {
+            "arguments": Array [],
+            "kind": "new",
+            "what": ClassReference {
+              "kind": "classreference",
+              "name": "Foo",
+              "resolution": "uqn",
+            },
           },
         },
       },

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

@@ -799,10 +799,13 @@ Program {
           "name": "b",
         },
         "operator": "=",
-        "right": Variable {
-          "curly": false,
-          "kind": "variable",
-          "name": "c",
+        "right": ByRef {
+          "kind": "byref",
+          "what": Variable {
+            "curly": false,
+            "kind": "variable",
+            "name": "c",
+          },
         },
       },
       "kind": "expressionstatement",