From 47c51ea0223e539c907b776e772b61febcf9cc68 Mon Sep 17 00:00:00 2001
From: z7zmey <z7zmey@gmail.com>
Date: Thu, 5 Apr 2018 12:03:32 +0300
Subject: [PATCH] rename AssignRef to Reference

---
 node/expr/assign/n_assign_ref.go     | 14 +++++++-------
 node/expr/assign/t_assign_op_test.go | 12 ++++++------
 node/expr/assign/t_visitor_test.go   |  2 +-
 php5/php5.go                         |  4 ++--
 php5/php5.y                          |  4 ++--
 php5/php5_test.go                    |  6 +++---
 php7/php7.go                         |  2 +-
 php7/php7.y                          |  2 +-
 php7/php7_test.go                    |  2 +-
 printer/printer.go                   |  8 ++++----
 printer/printer_test.go              |  4 ++--
 11 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/node/expr/assign/n_assign_ref.go b/node/expr/assign/n_assign_ref.go
index 7998cc4..37dc745 100644
--- a/node/expr/assign/n_assign_ref.go
+++ b/node/expr/assign/n_assign_ref.go
@@ -5,28 +5,28 @@ import (
 	"github.com/z7zmey/php-parser/walker"
 )
 
-// AssignRef node
-type AssignRef struct {
+// Reference node
+type Reference struct {
 	Variable   node.Node
 	Expression node.Node
 }
 
-// NewAssignRef node constuctor
-func NewAssignRef(Variable node.Node, Expression node.Node) *AssignRef {
-	return &AssignRef{
+// NewReference node constuctor
+func NewReference(Variable node.Node, Expression node.Node) *Reference {
+	return &Reference{
 		Variable,
 		Expression,
 	}
 }
 
 // Attributes returns node attributes as map
-func (n *AssignRef) Attributes() map[string]interface{} {
+func (n *Reference) Attributes() map[string]interface{} {
 	return nil
 }
 
 // Walk traverses nodes
 // Walk is invoked recursively until v.EnterNode returns true
-func (n *AssignRef) Walk(v walker.Visitor) {
+func (n *Reference) Walk(v walker.Visitor) {
 	if v.EnterNode(n) == false {
 		return
 	}
diff --git a/node/expr/assign/t_assign_op_test.go b/node/expr/assign/t_assign_op_test.go
index 684b8f7..eb4af84 100644
--- a/node/expr/assign/t_assign_op_test.go
+++ b/node/expr/assign/t_assign_op_test.go
@@ -29,13 +29,13 @@ func assertEqual(t *testing.T, expected interface{}, actual interface{}) {
 	}
 }
 
-func TestAssignRef(t *testing.T) {
+func TestReference(t *testing.T) {
 	src := `<? $a =& $b;`
 
 	expected := &stmt.StmtList{
 		Stmts: []node.Node{
 			&stmt.Expression{
-				Expr: &assign.AssignRef{
+				Expr: &assign.Reference{
 					Variable:   &expr.Variable{VarName: &node.Identifier{Value: "a"}},
 					Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}},
 				},
@@ -50,13 +50,13 @@ func TestAssignRef(t *testing.T) {
 	assertEqual(t, expected, actual)
 }
 
-func TestAssignRefNew(t *testing.T) {
+func TestReferenceNew(t *testing.T) {
 	src := `<? $a =& new Foo;`
 
 	expected := &stmt.StmtList{
 		Stmts: []node.Node{
 			&stmt.Expression{
-				Expr: &assign.AssignRef{
+				Expr: &assign.Reference{
 					Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
 					Expression: &expr.New{
 						Class: &name.Name{
@@ -77,13 +77,13 @@ func TestAssignRefNew(t *testing.T) {
 	assertEqual(t, expected, actual)
 }
 
-func TestAssignRefArgs(t *testing.T) {
+func TestReferenceArgs(t *testing.T) {
 	src := `<? $a =& new Foo($b);`
 
 	expected := &stmt.StmtList{
 		Stmts: []node.Node{
 			&stmt.Expression{
-				Expr: &assign.AssignRef{
+				Expr: &assign.Reference{
 					Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
 					Expression: &expr.New{
 						Class: &name.Name{
diff --git a/node/expr/assign/t_visitor_test.go b/node/expr/assign/t_visitor_test.go
index cb98b17..643d158 100644
--- a/node/expr/assign/t_visitor_test.go
+++ b/node/expr/assign/t_visitor_test.go
@@ -19,7 +19,7 @@ var nodesToTest = []struct {
 	expectedAttributes  map[string]interface{}
 }{
 	{
-		&assign.AssignRef{
+		&assign.Reference{
 			Variable:   &expr.Variable{VarName: &node.Identifier{Value: "a"}},
 			Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}},
 		},
diff --git a/php5/php5.go b/php5/php5.go
index 1ccc04a..3143b5f 100644
--- a/php5/php5.go
+++ b/php5/php5.go
@@ -4257,7 +4257,7 @@ yydefault:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		//line php5/php5.y:1866
 		{
-			yyVAL.node = assign.NewAssignRef(yyDollar[1].node, yyDollar[4].node)
+			yyVAL.node = assign.NewReference(yyDollar[1].node, yyDollar[4].node)
 			positions.AddPosition(yyVAL.node, positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node))
 			comments.AddComments(yyVAL.node, comments[yyDollar[1].node])
 		}
@@ -4274,7 +4274,7 @@ yydefault:
 			}
 			comments.AddComments(_new, comments[yyDollar[1].node])
 
-			yyVAL.node = assign.NewAssignRef(yyDollar[1].node, _new)
+			yyVAL.node = assign.NewReference(yyDollar[1].node, _new)
 			positions.AddPosition(yyVAL.node, positionBuilder.NewNodesPosition(yyDollar[1].node, _new))
 			comments.AddComments(yyVAL.node, comments[yyDollar[1].node])
 		}
diff --git a/php5/php5.y b/php5/php5.y
index 255568a..e07a884 100644
--- a/php5/php5.y
+++ b/php5/php5.y
@@ -1864,7 +1864,7 @@ expr_without_variable:
             }
     |   variable '=' '&' variable
             {
-                $$ = assign.NewAssignRef($1, $4)
+                $$ = assign.NewReference($1, $4)
                 positions.AddPosition($$, positionBuilder.NewNodesPosition($1, $4))
                 comments.AddComments($$, comments[$1])
             }
@@ -1879,7 +1879,7 @@ expr_without_variable:
                 }
                 comments.AddComments(_new, comments[$1])
 
-                $$ = assign.NewAssignRef($1, _new)
+                $$ = assign.NewReference($1, _new)
                 positions.AddPosition($$, positionBuilder.NewNodesPosition($1, _new))
                 comments.AddComments($$, comments[$1])
             }
diff --git a/php5/php5_test.go b/php5/php5_test.go
index 8d2fe59..a86e5dc 100644
--- a/php5/php5_test.go
+++ b/php5/php5_test.go
@@ -2849,13 +2849,13 @@ CAD;
 				},
 			},
 			&stmt.Expression{
-				Expr: &assign.AssignRef{
+				Expr: &assign.Reference{
 					Variable:   &expr.Variable{VarName: &node.Identifier{Value: "a"}},
 					Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}},
 				},
 			},
 			&stmt.Expression{
-				Expr: &assign.AssignRef{
+				Expr: &assign.Reference{
 					Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
 					Expression: &expr.New{
 						Class: &name.Name{
@@ -2867,7 +2867,7 @@ CAD;
 				},
 			},
 			&stmt.Expression{
-				Expr: &assign.AssignRef{
+				Expr: &assign.Reference{
 					Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
 					Expression: &expr.New{
 						Class: &name.Name{
diff --git a/php7/php7.go b/php7/php7.go
index b5da850..8d3bc18 100644
--- a/php7/php7.go
+++ b/php7/php7.go
@@ -4223,7 +4223,7 @@ yydefault:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		//line php7/php7.y:1512
 		{
-			yyVAL.node = assign.NewAssignRef(yyDollar[1].node, yyDollar[4].node)
+			yyVAL.node = assign.NewReference(yyDollar[1].node, yyDollar[4].node)
 			positions.AddPosition(yyVAL.node, positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node))
 			comments.AddComments(yyVAL.node, comments[yyDollar[1].node])
 		}
diff --git a/php7/php7.y b/php7/php7.y
index 1054622..522e436 100644
--- a/php7/php7.y
+++ b/php7/php7.y
@@ -1510,7 +1510,7 @@ expr_without_variable:
         }
     |   variable '=' '&' expr
         {
-            $$ = assign.NewAssignRef($1, $4)
+            $$ = assign.NewReference($1, $4)
             positions.AddPosition($$, positionBuilder.NewNodesPosition($1, $4))
             comments.AddComments($$, comments[$1])
         }
diff --git a/php7/php7_test.go b/php7/php7_test.go
index 315bfbc..3a8cfca 100644
--- a/php7/php7_test.go
+++ b/php7/php7_test.go
@@ -2890,7 +2890,7 @@ CAD;
 				},
 			},
 			&stmt.Expression{
-				Expr: &assign.AssignRef{
+				Expr: &assign.Reference{
 					Variable:   &expr.Variable{VarName: &node.Identifier{Value: "a"}},
 					Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}},
 				},
diff --git a/printer/printer.go b/printer/printer.go
index cd0b29e..84aa71f 100644
--- a/printer/printer.go
+++ b/printer/printer.go
@@ -106,8 +106,8 @@ func (p *Printer) printNode(n node.Node) {
 
 	case *assign.Assign:
 		p.printAssign(n)
-	case *assign.AssignRef:
-		p.printAssignRef(n)
+	case *assign.Reference:
+		p.printReference(n)
 	case *assign.BitwiseAnd:
 		p.printAssignBitwiseAnd(n)
 	case *assign.BitwiseOr:
@@ -544,8 +544,8 @@ func (p *Printer) printAssign(n node.Node) {
 	p.Print(nn.Expression)
 }
 
-func (p *Printer) printAssignRef(n node.Node) {
-	nn := n.(*assign.AssignRef)
+func (p *Printer) printReference(n node.Node) {
+	nn := n.(*assign.Reference)
 	p.Print(nn.Variable)
 	io.WriteString(p.w, " =& ")
 	p.Print(nn.Expression)
diff --git a/printer/printer_test.go b/printer/printer_test.go
index 34169ce..ced8a87 100644
--- a/printer/printer_test.go
+++ b/printer/printer_test.go
@@ -288,11 +288,11 @@ func TestPrintAssign(t *testing.T) {
 	}
 }
 
-func TestPrintAssignRef(t *testing.T) {
+func TestPrintReference(t *testing.T) {
 	o := bytes.NewBufferString("")
 
 	p := printer.NewPrinter(o, "    ")
-	p.Print(&assign.AssignRef{
+	p.Print(&assign.Reference{
 		Variable:   &expr.Variable{VarName: &node.Identifier{Value: "a"}},
 		Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}},
 	})