From 2c09138600a57f3a0bbfb1563177a18a2de063fd Mon Sep 17 00:00:00 2001
From: Vadym Slizov <z7zmey@gmail.com>
Date: Sun, 27 Dec 2020 21:55:36 +0200
Subject: [PATCH] refactoring: update ast structure of "Variable" node

---
 internal/php5/parser_test.go      | 108 ++++++++++++++----------------
 internal/php5/php5.go             | Bin 264722 -> 264502 bytes
 internal/php5/php5.y              |  26 +++----
 internal/php7/parser_test.go      | 108 ++++++++++++++----------------
 internal/php7/php7.go             | Bin 219201 -> 219091 bytes
 internal/php7/php7.y              |  13 ++--
 pkg/ast/node.go                   |   8 ++-
 pkg/ast/visitor/dumper.go         |   2 +
 pkg/ast/visitor/formatter.go      |  10 +++
 pkg/ast/visitor/formatter_test.go |  23 +++++++
 pkg/ast/visitor/printer.go        |   2 +
 pkg/ast/visitor/printer_test.go   |   8 ++-
 12 files changed, 164 insertions(+), 144 deletions(-)

diff --git a/internal/php5/parser_test.go b/internal/php5/parser_test.go
index f4b35d8..889fb3c 100644
--- a/internal/php5/parser_test.go
+++ b/internal/php5/parser_test.go
@@ -16726,90 +16726,82 @@ func TestStmtGlobal_Vars(t *testing.T) {
 								},
 							},
 						},
-						VarName: &ast.ParserBrackets{
+						OpenCurlyBracketTkn: &token.Token{
+							ID:    token.ID(123),
+							Value: []byte("{"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  24,
-								EndPos:    31,
+								EndPos:    25,
 							},
-							OpenBracketTkn: &token.Token{
-								ID:    token.ID(123),
-								Value: []byte("{"),
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  24,
-									EndPos:    25,
-								},
+						},
+						VarName: &ast.ExprFunctionCall{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  25,
+								EndPos:    30,
 							},
-							Child: &ast.ExprFunctionCall{
+							Function: &ast.NameName{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  25,
-									EndPos:    30,
+									EndPos:    28,
 								},
-								Function: &ast.NameName{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  25,
-										EndPos:    28,
-									},
-									Parts: []ast.Vertex{
-										&ast.NameNamePart{
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  25,
+											EndPos:    28,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("foo"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  25,
 												EndPos:    28,
 											},
-											StringTkn: &token.Token{
-												ID:    token.T_STRING,
-												Value: []byte("foo"),
-												Position: &position.Position{
-													StartLine: 1,
-													EndLine:   1,
-													StartPos:  25,
-													EndPos:    28,
-												},
-											},
-											Value: []byte("foo"),
 										},
-									},
-								},
-								OpenParenthesisTkn: &token.Token{
-									ID:    token.ID(40),
-									Value: []byte("("),
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  28,
-										EndPos:    29,
-									},
-								},
-								CloseParenthesisTkn: &token.Token{
-									ID:    token.ID(41),
-									Value: []byte(")"),
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  29,
-										EndPos:    30,
+										Value: []byte("foo"),
 									},
 								},
 							},
-							CloseBracketTkn: &token.Token{
-								ID:    token.ID(125),
-								Value: []byte("}"),
+							OpenParenthesisTkn: &token.Token{
+								ID:    token.ID(40),
+								Value: []byte("("),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
-									StartPos:  30,
-									EndPos:    31,
+									StartPos:  28,
+									EndPos:    29,
 								},
 							},
+							CloseParenthesisTkn: &token.Token{
+								ID:    token.ID(41),
+								Value: []byte(")"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  29,
+									EndPos:    30,
+								},
+							},
+						},
+						CloseCurlyBracketTkn: &token.Token{
+							ID:    token.ID(125),
+							Value: []byte("}"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  30,
+								EndPos:    31,
+							},
 						},
 					},
 				},
diff --git a/internal/php5/php5.go b/internal/php5/php5.go
index 09a19308ced0fc3ff5d7791a98ff3fc56485e676..9cc409a8f4aa551c370ddaf821d5df6d8dd76199 100644
GIT binary patch
delta 6544
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

delta 6431
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

diff --git a/internal/php5/php5.y b/internal/php5/php5.y
index f08fbff..ac247f2 100644
--- a/internal/php5/php5.y
+++ b/internal/php5/php5.y
@@ -2022,14 +2022,11 @@ global_var:
     |   '$' '{' expr '}'
             {
                 $$ = &ast.ExprVariable{
-                    Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
-                    DollarTkn: $1,
-                    VarName: &ast.ParserBrackets{
-                        Position: yylex.(*Parser).builder.NewTokensPosition($2, $4),
-                        OpenBracketTkn:  $2,
-                        Child:           $3,
-                        CloseBracketTkn: $4,
-                    },
+                    Position:             yylex.(*Parser).builder.NewTokensPosition($1, $4),
+                    DollarTkn:            $1,
+                    OpenCurlyBracketTkn:  $2,
+                    VarName:              $3,
+                    CloseCurlyBracketTkn: $4,
                 }
             }
 ;
@@ -5017,14 +5014,11 @@ compound_variable:
     |   '$' '{' expr '}'
             {
                 $$ = &ast.ExprVariable{
-                    Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
-                    DollarTkn: $1,
-                    VarName: &ast.ParserBrackets{
-                        Position: yylex.(*Parser).builder.NewTokensPosition($2, $4),
-                        OpenBracketTkn:  $2,
-                        Child:           $3,
-                        CloseBracketTkn: $4,
-                    },
+                    Position:             yylex.(*Parser).builder.NewTokensPosition($1, $4),
+                    DollarTkn:            $1,
+                    OpenCurlyBracketTkn:  $2,
+                    VarName:              $3,
+                    CloseCurlyBracketTkn: $4,
                 }
             }
 ;
diff --git a/internal/php7/parser_test.go b/internal/php7/parser_test.go
index 2854d9a..b2bf948 100644
--- a/internal/php7/parser_test.go
+++ b/internal/php7/parser_test.go
@@ -18412,90 +18412,82 @@ func TestStmtGlobal_Vars(t *testing.T) {
 								},
 							},
 						},
-						VarName: &ast.ParserBrackets{
+						OpenCurlyBracketTkn: &token.Token{
+							ID:    token.ID(123),
+							Value: []byte("{"),
 							Position: &position.Position{
 								StartLine: 1,
 								EndLine:   1,
 								StartPos:  24,
-								EndPos:    31,
+								EndPos:    25,
 							},
-							OpenBracketTkn: &token.Token{
-								ID:    token.ID(123),
-								Value: []byte("{"),
-								Position: &position.Position{
-									StartLine: 1,
-									EndLine:   1,
-									StartPos:  24,
-									EndPos:    25,
-								},
+						},
+						VarName: &ast.ExprFunctionCall{
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  25,
+								EndPos:    30,
 							},
-							Child: &ast.ExprFunctionCall{
+							Function: &ast.NameName{
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
 									StartPos:  25,
-									EndPos:    30,
+									EndPos:    28,
 								},
-								Function: &ast.NameName{
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  25,
-										EndPos:    28,
-									},
-									Parts: []ast.Vertex{
-										&ast.NameNamePart{
+								Parts: []ast.Vertex{
+									&ast.NameNamePart{
+										Position: &position.Position{
+											StartLine: 1,
+											EndLine:   1,
+											StartPos:  25,
+											EndPos:    28,
+										},
+										StringTkn: &token.Token{
+											ID:    token.T_STRING,
+											Value: []byte("foo"),
 											Position: &position.Position{
 												StartLine: 1,
 												EndLine:   1,
 												StartPos:  25,
 												EndPos:    28,
 											},
-											StringTkn: &token.Token{
-												ID:    token.T_STRING,
-												Value: []byte("foo"),
-												Position: &position.Position{
-													StartLine: 1,
-													EndLine:   1,
-													StartPos:  25,
-													EndPos:    28,
-												},
-											},
-											Value: []byte("foo"),
 										},
-									},
-								},
-								OpenParenthesisTkn: &token.Token{
-									ID:    token.ID(40),
-									Value: []byte("("),
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  28,
-										EndPos:    29,
-									},
-								},
-								CloseParenthesisTkn: &token.Token{
-									ID:    token.ID(41),
-									Value: []byte(")"),
-									Position: &position.Position{
-										StartLine: 1,
-										EndLine:   1,
-										StartPos:  29,
-										EndPos:    30,
+										Value: []byte("foo"),
 									},
 								},
 							},
-							CloseBracketTkn: &token.Token{
-								ID:    token.ID(125),
-								Value: []byte("}"),
+							OpenParenthesisTkn: &token.Token{
+								ID:    token.ID(40),
+								Value: []byte("("),
 								Position: &position.Position{
 									StartLine: 1,
 									EndLine:   1,
-									StartPos:  30,
-									EndPos:    31,
+									StartPos:  28,
+									EndPos:    29,
 								},
 							},
+							CloseParenthesisTkn: &token.Token{
+								ID:    token.ID(41),
+								Value: []byte(")"),
+								Position: &position.Position{
+									StartLine: 1,
+									EndLine:   1,
+									StartPos:  29,
+									EndPos:    30,
+								},
+							},
+						},
+						CloseCurlyBracketTkn: &token.Token{
+							ID:    token.ID(125),
+							Value: []byte("}"),
+							Position: &position.Position{
+								StartLine: 1,
+								EndLine:   1,
+								StartPos:  30,
+								EndPos:    31,
+							},
 						},
 					},
 				},
diff --git a/internal/php7/php7.go b/internal/php7/php7.go
index 2c5e9d0db325f02e2b2c819acf5fdad03faa2be9..da378e52f82b1a5f6b914f0bf15a24ea0f49c5e7 100644
GIT binary patch
delta 979
zcmZ8fZD`G56z`nFo!P5Rv%B5xzF@40`?70h*UN_4#@y?j*~${h-dK`SOh_cA<QFNk
zB%kb3JfD_3rG3Jcl5fU0^1%#gnw<Z=L;3cc=Q-#3y`0}rG~?AkM$};^@2MjD*&;ic
zB0EP%(X*b?5chE{`uZu$wz{jmy|o+5*Gm~j`l)o<w$|<qtsQ%pVrYnqk$sY<;%2Vc
z5DHTPE``XBo#|4K+)m1a*Dr2lj<6ejVX1&8O+RVQkan~>q!8YHJOy=G@)PefWi99~
zJB^k#1pdHz=*yNp6u|wMUJv9*386kmY7vdG%c|Rng2~6KnNmmaJNe(2<G7J0b-3Rs
zP77fi6SEYd=My>1?tHP4aaT(|;dp^I^`}c7R@%gYA67XOr$T7cV-z?PE_(%gFmZ#w
z<7kn>_)&dFg(cd@tc#!t70V97p(b)5>XbcjcaRUOT~be8^X>^NwbyQKT#S>S=m5@n
z)EwVIc44GU^3glSbFuOS2XMMnHX%GuQZYDN9ZFDtTPEe`ZBd(g=E#+#Yl@L+md%x|
z^sk22xp-b8UopD<&(|BKa1*x7m+MMLNf%n|GOf;X#J+JU&Of9qqo^T<Z&*E6uolMU
z`6@5+K)pS?P$dM-%Z1WH%D%ddJctF^fex>w4b^Y>2L^o7mK-lml|_X8fl1rVi+~*C
zB*orC8j{dVb=Wms*?snL(A<2=%gE#}k%okh6^KS8@l=WUIH%)TmF)T}JqKNll!ACz
zQgCLe+{UdXswdt|HfuG-|IHemeMRs@G!XywxPDPdLO2Giq{6f<mq%<gjGBeY8fE_F
zA{Sm=BRRNNBOl3cuC0<bW?!YT)k>pa#xeCNDfCu@tmR;Z`Pd-ClQOM5n|Pxfo!m@p
zolHe<L~N!rEKKMg)l`2z%&F#5L}n5DE0cRk%nfgpBZQ4(8t#_Ol1f%aoX}&6xv)iM
ckR~sYpK06F{J><eu5Z^cY2FqfYlrxM16nIJNdN!<

delta 1107
zcmZ`&TWFML5M^ePY;)h=OX6m;*^SA@*w`ey+iao|*^P$8K;lLW@ru|7DdfSXiU=)e
zEE3QM1740uz*Rvcg4s&j&lgM5QiMK)6e$)9UJCUo7`5OfG-+r5f0gv1Z{N&+=KN>o
z%-kC<oJ<v_$~_eM%I6vOdC2%YoO*%OCJ7+0Ks88Sp<;ZLFZq}%(A=?H$;RtZUWV6o
z(tf@{KESNSWw^bIy@>7LVg&DN80cdcl9uGa6%#KeEGdM0r{?BA)YnYDbRu+@{iw*5
z6&T+nl{i)-&G@lEfcP2mqH(z_;9yY(XC4$u8^QXU!{~8K2Yrke{Twj=EO0g9fu)(I
z#hLv}r2~}-F2~3qXPYSv34>Slhe|Yu`V!?Gs+CN5x>V7Wka8s2=?=zM$Y#W^sfg*_
zl!N(Eeud&P%?-^^31T^lJ6Wa#ms=EKSB!b3lfoGKl}nJ^M%jxB^L&czjZ&#octS&J
zF;hO-PAb{1cz%d;k*t+GB>d9nG<n~zxQKc319uWWtyGS|Q`(IR+5+!N)nYfJMH>)1
z$`O>TmaP~M$}(s2?jg4Dc~x3-t+ZfdANle9OAa7hEr-w+k!n1uQt-%M96bMsf*AdV
zix3UUv&{7Ob2fgjQg2cdbQ}+B<S<@7N!#-NLr)g(#M4!BQ5&c0>^Car7USy)9kM<>
z2;}Mi(ko=9>tun{viJZkN8*<D?Wvc|)Z!%Ewd68K>m^RK7LyG!OcBI?<2Q(hWWeS#
zx+M*Sxv=9}^|{k3>^(h{-ZBTG(n{EF$#I-*Qk=a+Y4f4xmpka^A#O64e&SX#W6jb<
z4(Of971%qYiWRgL({o&az3XKcM)q)4dUQ*0pqpH9uag^CxkOj`|H_P(-6MpC7wu1m
z+P<fg-|9VWSuf3IzE!^C|7v)JpW|v;Z&1BX{;A?0KjfSEqfM8g$<%F>0p@VnTxgeW
zLFh9bx-*$bmvnHn(R|q@cQcG?RF?UqTaIM9wBxrulB-wrg%(yOq?9<)=y<oIR}K??
tDbq>Wz}c;7puJ=IbeW26Vi97i-mT!pKJ_n}S<f~7Dp^l+4KDXf_+Qd8YHa`j

diff --git a/internal/php7/php7.y b/internal/php7/php7.y
index 4e44911..ae5f176 100644
--- a/internal/php7/php7.y
+++ b/internal/php7/php7.y
@@ -3790,14 +3790,11 @@ simple_variable:
     |   '$' '{' expr '}'
             {
                 $$ = &ast.ExprVariable{
-                    Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
-                    DollarTkn: $1,
-                    VarName: &ast.ParserBrackets{
-                        Position: yylex.(*Parser).builder.NewTokensPosition($2, $4),
-                        OpenBracketTkn:  $2,
-                        Child:           $3,
-                        CloseBracketTkn: $4,
-                    },
+                    Position:             yylex.(*Parser).builder.NewTokensPosition($1, $4),
+                    DollarTkn:            $1,
+                    OpenCurlyBracketTkn:  $2,
+                    VarName:              $3,
+                    CloseCurlyBracketTkn: $4,
                 }
             }
     |   '$' simple_variable
diff --git a/pkg/ast/node.go b/pkg/ast/node.go
index e85fde6..400537f 100644
--- a/pkg/ast/node.go
+++ b/pkg/ast/node.go
@@ -1761,9 +1761,11 @@ func (n *ExprUnaryPlus) GetPosition() *position.Position {
 
 // ExprVariable node
 type ExprVariable struct {
-	Position  *position.Position
-	DollarTkn *token.Token
-	VarName   Vertex
+	Position             *position.Position
+	DollarTkn            *token.Token
+	OpenCurlyBracketTkn  *token.Token
+	VarName              Vertex
+	CloseCurlyBracketTkn *token.Token
 }
 
 func (n *ExprVariable) Accept(v NodeVisitor) {
diff --git a/pkg/ast/visitor/dumper.go b/pkg/ast/visitor/dumper.go
index dc5536d..9778215 100644
--- a/pkg/ast/visitor/dumper.go
+++ b/pkg/ast/visitor/dumper.go
@@ -1537,7 +1537,9 @@ func (v *Dumper) ExprVariable(n *ast.ExprVariable) {
 
 	v.dumpPosition(n.Position)
 	v.dumpToken("DollarTkn", n.DollarTkn)
+	v.dumpToken("OpenCurlyBracketTkn", n.OpenCurlyBracketTkn)
 	v.dumpVertex("VarName", n.VarName)
+	v.dumpToken("CloseCurlyBracketTkn", n.CloseCurlyBracketTkn)
 
 	v.indent--
 	v.print(v.indent, "},\n")
diff --git a/pkg/ast/visitor/formatter.go b/pkg/ast/visitor/formatter.go
index f66c766..7fde3cb 100644
--- a/pkg/ast/visitor/formatter.go
+++ b/pkg/ast/visitor/formatter.go
@@ -1417,6 +1417,16 @@ func (f *formatter) ExprVariable(n *ast.ExprVariable) {
 		n.DollarTkn = f.newToken('$', []byte("$"))
 	}
 
+	n.OpenCurlyBracketTkn = nil
+	n.CloseCurlyBracketTkn = nil
+	switch n.VarName.(type) {
+	case *ast.Identifier:
+	case *ast.ExprVariable:
+	default:
+		n.OpenCurlyBracketTkn = f.newToken('{', []byte("{"))
+		n.CloseCurlyBracketTkn = f.newToken('}', []byte("}"))
+	}
+
 	n.VarName.Accept(f)
 }
 
diff --git a/pkg/ast/visitor/formatter_test.go b/pkg/ast/visitor/formatter_test.go
index 6a72c6b..62580e7 100644
--- a/pkg/ast/visitor/formatter_test.go
+++ b/pkg/ast/visitor/formatter_test.go
@@ -4877,6 +4877,29 @@ func TestFormatter_ExprVariable_Variable(t *testing.T) {
 	}
 }
 
+func TestFormatter_ExprVariable_Expression(t *testing.T) {
+	o := bytes.NewBufferString("")
+
+	n := &ast.ExprVariable{
+		VarName: &ast.ScalarString{
+			Value: []byte("'foo'"),
+		},
+	}
+
+	f := visitor.NewFormatter().WithState(visitor.FormatterStatePHP).WithIndent(1)
+	n.Accept(f)
+
+	p := visitor.NewPrinter(o).WithState(visitor.PrinterStatePHP)
+	n.Accept(p)
+
+	expected := `${'foo'}`
+	actual := o.String()
+
+	if expected != actual {
+		t.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
+	}
+}
+
 func TestFormatter_ExprYield(t *testing.T) {
 	o := bytes.NewBufferString("")
 
diff --git a/pkg/ast/visitor/printer.go b/pkg/ast/visitor/printer.go
index 7fba6a1..99db93a 100644
--- a/pkg/ast/visitor/printer.go
+++ b/pkg/ast/visitor/printer.go
@@ -868,7 +868,9 @@ func (p *printer) ExprUnaryPlus(n *ast.ExprUnaryPlus) {
 
 func (p *printer) ExprVariable(n *ast.ExprVariable) {
 	p.printToken(n.DollarTkn, nil)
+	p.printToken(n.OpenCurlyBracketTkn, nil)
 	p.printNode(n.VarName)
+	p.printToken(n.CloseCurlyBracketTkn, nil)
 }
 
 func (p *printer) ExprYield(n *ast.ExprYield) {
diff --git a/pkg/ast/visitor/printer_test.go b/pkg/ast/visitor/printer_test.go
index 3f75246..621ea27 100644
--- a/pkg/ast/visitor/printer_test.go
+++ b/pkg/ast/visitor/printer_test.go
@@ -2609,13 +2609,19 @@ func TestPrinterPrintVariable(t *testing.T) {
 		DollarTkn: &token.Token{
 			Value: []byte("$"),
 		},
+		OpenCurlyBracketTkn: &token.Token{
+			Value: []byte("{"),
+		},
 		VarName: &ast.ExprVariable{
 			VarName: &ast.Identifier{Value: []byte("$var")},
 		},
+		CloseCurlyBracketTkn: &token.Token{
+			Value: []byte("}"),
+		},
 	}
 	n.Accept(p)
 
-	expected := `$$var`
+	expected := `${$var}`
 	actual := o.String()
 
 	if expected != actual {