refactor: byRef

glayzzle · Aug 31, 2019 · 98f510e · 98f510e
1 parent 62973ef
commit 98f510e
Show file tree

Hide file tree

Showing 11 changed files with 226 additions and 107 deletions.
diff --git a/src/ast.js b/src/ast.js
@@ -46,6 +46,7 @@ const Position = require("./ast/position");
  *     - [Exit](#exit)
  *     - [Clone](#clone)
  *     - [Assign](#assign)
+ *     - [AssignRef](#assignref)
  *     - [Array](#array)
  *     - [List](#list)
  *     - [Variable](#variable)
@@ -458,6 +459,7 @@ AST.prototype.checkNodes = function() {
 [
   require("./ast/array"),
   require("./ast/assign"),
+  require("./ast/assignref"),
   require("./ast/bin"),
   require("./ast/block"),
   require("./ast/boolean"),

diff --git a/src/ast/assign.js b/src/ast/assign.js
@@ -24,7 +24,7 @@ module.exports = Expression.extends(KIND, function Assign(
   location
 ) {
   Expression.apply(this, [KIND, docs, location]);
-  this.operator = operator;
   this.left = left;
   this.right = right;
+  this.operator = operator;
 });
diff --git a/src/ast/assignref.js b/src/ast/assignref.js
@@ -0,0 +1,28 @@
+/**
+ * Copyright (C) 2018 Glayzzle (BSD3 License)
+ * @authors https://github.com/glayzzle/php-parser/graphs/contributors
+ * @url http://glayzzle.com
+ */
+"use strict";
+
+const Expression = require("./expression");
+const KIND = "assignref";
+
+/**
+ * Assigns a value to the specified target
+ * @constructor Assign
+ * @extends {Expression}
+ * @property {Expression} left
+ * @property {Expression} right
+ * @property {String} operator
+ */
+module.exports = Expression.extends(KIND, function AssignRef(
+    left,
+    right,
+    docs,
+    location
+) {
+    Expression.apply(this, [KIND, docs, location]);
+    this.left = left;
+    this.right = right;
+});
diff --git a/src/parser/expr.js b/src/parser/expr.js
@@ -354,21 +354,19 @@ module.exports = {
           if (isConst) this.error("VARIABLE");
           let right;
           if (this.next().token == "&") {
-            right = this.read_byref(
-              function() {
-                if (this.token === this.tok.T_NEW) {
-                  if (this.php7) {
-                    this.error();
-                  }
-                  return this.read_new_expr();
-                } else {
-                  return this.read_variable(false, false);
-                }
-              }.bind(this)
-            );
-          } else {
-            right = this.read_expr();
+            this.next();
+            if (this.token === this.tok.T_NEW) {
+              if (this.php7) {
+                this.error();
+              }
+              right = this.read_new_expr();
+            } else {
+              right = this.read_variable(false, false);
+            }
+
+            return result("assignref", expr, right);
           }
+          right = this.read_expr();
           return result("assign", expr, right, "=");
         }
 

diff --git a/test/snapshot/__snapshots__/assign.test.js.snap b/test/snapshot/__snapshots__/assign.test.js.snap
@@ -402,16 +402,14 @@ exports[`assign with ref 1`] = `
 Program {
   "children": Array [
     ExpressionStatement {
-      "expression": Assign {
-        "kind": "assign",
+      "expression": AssignRef {
+        "kind": "assignref",
         "left": Variable {
           "curly": false,
           "kind": "variable",
           "name": "bar",
         },
-        "operator": "=",
         "right": Variable {
-          "byref": true,
           "curly": false,
           "kind": "variable",
           "name": "foo",