From 5291529a37ff01cdc9a6c1e80c26769dde56118f Mon Sep 17 00:00:00 2001 From: Vadym Slizov Date: Fri, 11 Dec 2020 17:29:22 +0200 Subject: [PATCH] [refactoring] fix typo --- internal/php5/php5.go | Bin 264823 -> 264908 bytes internal/php5/php5.y | 44 ++++++++--------- internal/php7/php7.go | Bin 219258 -> 219381 bytes internal/php7/php7.y | 90 +++++++++++++++++------------------ pkg/ast/node.go | 86 ++++++++++++++++----------------- pkg/ast/visitor/dump.go | 24 +++++----- pkg/ast/visitor/dump_test.go | 2 +- pkg/ast/visitor/printer.go | 52 ++++++++++---------- 8 files changed, 149 insertions(+), 149 deletions(-) diff --git a/internal/php5/php5.go b/internal/php5/php5.go index 219f8fc92b6bc597f1d42f5e4c02f3d392fba6ba..6dd0b6554b8c461c03ad75f9c75fb816d7f5ef68 100644 GIT binary patch delta 421 zcma)&PbhE!pd7i!>Dg7#~8wIQf7`YW12TD?<`UV%z zi^9pzNjP~EKn=AssN5|{%Zovwtre?0+{Z8r4ykjYa_jSoY9`*LoqEuUeDiWe@ypZs zn1Sa9we)I{pC8~f(?Rs~R#^S?ElW53Pw+Dmhnp8gp)heNT=c!5j^$&kB)VD)=;W6h; z?BTDuc#8J5|L$Hf!ooDd@~(r%I2u`=K(~k{nNP|Pb1l{{rsL3T(d5i*j9d58!@&>~ KvuREarM>{y{g&zRp9#+frc%Ny;@TpnWU!YW-!pmL)8A=B)lFLkRB>PqP%YyuW`us8>3fzjN>68e%&5A3tq!BL&Ggq9jH%NZ z524t>Z^$G!{bDMk#Pkab7PWSr+bYLEc`}RB|=l0&YjE5wr$LwVE-o9Wv<4#5}b2^YIF@16clkoHh z%8WAGKkj5?>?Fcv?YEtow%>MUK4Un&po!6K`h#Xh{^<^xj4aH7`6bggerA-LURTb{ XH=XkgFdX_b8TlClxBHhd*G>Td=1hKH diff --git a/internal/php5/php5.y b/internal/php5/php5.y index f244655..67e127a 100644 --- a/internal/php5/php5.y +++ b/internal/php5/php5.y @@ -366,19 +366,19 @@ top_statement: Parts: $2.(*ast.ParserSeparatedList).Items, SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, }, - OpenCurlyBracket: $3, - Stmts: $4, - CloseCurlyBracket: $5, + OpenCurlyBracketTkn: $3, + Stmts: $4, + CloseCurlyBracketTkn: $5, } } | T_NAMESPACE '{' top_statement_list '}' { $$ = &ast.StmtNamespace{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), - NsTkn: $1, - OpenCurlyBracket: $2, - Stmts: $3, - CloseCurlyBracket: $4, + NsTkn: $1, + OpenCurlyBracketTkn: $2, + Stmts: $3, + CloseCurlyBracketTkn: $4, } } | T_USE use_declarations ';' @@ -769,9 +769,9 @@ unticked_statement: { $$ = &ast.StmtStmtList{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), - OpenCurlyBracket: $1, - Stmts: $2, - CloseCurlyBracket: $3, + OpenCurlyBracketTkn: $1, + Stmts: $2, + CloseCurlyBracketTkn: $3, } } | T_IF parenthesis_expr statement elseif_list else_single @@ -1045,12 +1045,12 @@ unticked_statement: $$ = &ast.StmtTry{ Position: pos, - TryTkn: $1, - OpenCurlyBracket: $2, - Stmts: $3, - CloseCurlyBracket: $4, - Catches: $5, - Finally: $6, + TryTkn: $1, + OpenCurlyBracketTkn: $2, + Stmts: $3, + CloseCurlyBracketTkn: $4, + Catches: $5, + Finally: $6, } } | T_THROW expr ';' @@ -2353,9 +2353,9 @@ method_body: { $$ = &ast.StmtStmtList{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), - OpenCurlyBracket: $1, - Stmts: $2, - CloseCurlyBracket: $3, + OpenCurlyBracketTkn: $1, + Stmts: $2, + CloseCurlyBracketTkn: $3, } } ; @@ -4498,9 +4498,9 @@ scalar: { $$ = &ast.ScalarEncapsed{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), - OpenQoteTkn: $1, - Parts: $2, - CloseQoteTkn: $3, + OpenQuoteTkn: $1, + Parts: $2, + CloseQuoteTkn: $3, } } | T_START_HEREDOC encaps_list T_END_HEREDOC diff --git a/internal/php7/php7.go b/internal/php7/php7.go index 7e9dd54a0e260e7a8a18ba547b7b3c3859391285..e2b0b1acbe29200fb2546adbc6ef6474c0ec3ca8 100644 GIT binary patch delta 642 zcmbu6Pe_w-7{~cOxg@uDzG^Fl<`M!sM1-**?T-Z#>|k4n6dmeP;Atb~r5*GV7(~4t z<~JxX-jh(0E&sQ`zaZN044I@MhV2Z=F>`7M3xW}rC7-upDc+~%z!RQgj^O|h^q{+VqZ}VFo`?*|I*y5T# z_OuDRnE8RAKQxWpK~o-V+SANR0bT4Kkr16xG;?r90^Ba3&1_Pf)$Mk_A1XHVBwiam zmOoX*Dh$hB)@0g4hha6)d-=qJZCDHA>e7a*n5x%cZFM$SJ##n~FpcNR>fdJ{K?`-B>HBZYnS+qeI&JYJVxf9Jd8#(n`YI`R?# delta 638 zcma)(F=!KU7{z(tMN2hzxu{K(rcI+nCyS(_)bp?n6rBt?!9t0UICKyS4b~#H(ArVK zP45jN3L;pG@dDzZLv6v$QlbztNp;adL>DbMRR1wn3L-du|L=Xg_kRDc75%%XUw(`$ z7Azu*7-#C(!9+&Wd8>|AE|=7ZRYbXN;X1FiXmNT+agv3w7NoZ%Ar^-abRVLF>ouia zs6pqEyNENrrmlV*g6_}R7(e*y)_s9vywfc~X5L5#%?SkP%^}3+HD$I~Lc)Jn!c>Zd z8|Y+iLOm7-VDQWk%zt>q7RvWhTY#y2$8Gb0=7;eA?!?KVuYlGOKWipcN2+nE2LeETa1 z2d(7fR+s&XN#gcds||gPE^!{4P)sAyK zC#g+{9_6Hso+Ep?vMh%=FsQH{aHQ9bDKHz8L9;4p+E#OEF!WNQ{NzZaQ9r_G9@=Q6 z8`v9|A~wP*`qF!JH@+$C+G_KstYIaSf7Pv@l2lN&QmYSZ+qPi diff --git a/internal/php7/php7.y b/internal/php7/php7.y index 1db8b0a..b69d0a3 100644 --- a/internal/php7/php7.y +++ b/internal/php7/php7.y @@ -450,19 +450,19 @@ top_statement: Parts: $2.(*ast.ParserSeparatedList).Items, SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns, }, - OpenCurlyBracket: $3, - Stmts: $4, - CloseCurlyBracket: $5, + OpenCurlyBracketTkn: $3, + Stmts: $4, + CloseCurlyBracketTkn: $5, } } | T_NAMESPACE '{' top_statement_list '}' { $$ = &ast.StmtNamespace{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), - NsTkn: $1, - OpenCurlyBracket: $2, - Stmts: $3, - CloseCurlyBracket: $4, + NsTkn: $1, + OpenCurlyBracketTkn: $2, + Stmts: $3, + CloseCurlyBracket: $4, } } | T_USE mixed_group_use_declaration ';' @@ -813,9 +813,9 @@ statement: { $$ = &ast.StmtStmtList{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), - OpenCurlyBracket: $1, - Stmts: $2, - CloseCurlyBracket: $3, + OpenCurlyBracketTkn: $1, + Stmts: $2, + CloseCurlyBracketTkn: $3, } } | if_stmt @@ -1009,12 +1009,12 @@ statement: $$ = &ast.StmtTry{ Position: pos, - TryTkn: $1, - OpenCurlyBracket: $2, - Stmts: $3, - CloseCurlyBracket: $4, - Catches: $5, - Finally: $6, + TryTkn: $1, + OpenCurlyBracketTkn: $2, + Stmts: $3, + CloseCurlyBracketTkn: $4, + Catches: $5, + Finally: $6, } } | T_THROW expr ';' @@ -1194,11 +1194,11 @@ class_declaration_statement: IdentifierTkn: $3, Value: $3.Value, }, - Extends: $4, - Implements: $5, - OpenCurlyBracket: $7, - Stmts: $8, - CloseCurlyBracket: $9, + Extends: $4, + Implements: $5, + OpenCurlyBracketTkn: $7, + Stmts: $8, + CloseCurlyBracketTkn: $9, } } | T_CLASS T_STRING extends_from implements_list backup_doc_comment '{' class_statement_list '}' @@ -1211,11 +1211,11 @@ class_declaration_statement: IdentifierTkn: $2, Value: $2.Value, }, - Extends: $3, - Implements: $4, - OpenCurlyBracket: $6, - Stmts: $7, - CloseCurlyBracket: $8, + Extends: $3, + Implements: $4, + OpenCurlyBracketTkn: $6, + Stmts: $7, + CloseCurlyBracketTkn: $8, } } ; @@ -1261,9 +1261,9 @@ trait_declaration_statement: IdentifierTkn: $2, Value: $2.Value, }, - OpenCurlyBracket: $4, - Stmts: $5, - CloseCurlyBracket: $6, + OpenCurlyBracketTkn: $4, + Stmts: $5, + CloseCurlyBracketTkn: $6, } } ; @@ -2191,9 +2191,9 @@ method_body: { $$ = &ast.StmtStmtList{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), - OpenCurlyBracket: $1, - Stmts: $2, - CloseCurlyBracket: $3, + OpenCurlyBracketTkn: $1, + Stmts: $2, + CloseCurlyBracketTkn: $3, } } ; @@ -2441,16 +2441,16 @@ anonymous_class: { $$ = &ast.StmtClass{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $8), - ClassTkn: $1, - OpenParenthesisTkn: $2.(*ast.ArgumentList).OpenParenthesisTkn, - Arguments: $2.(*ast.ArgumentList).Arguments, - SeparatorTkns: $2.(*ast.ArgumentList).SeparatorTkns, - CloseParenthesisTkn: $2.(*ast.ArgumentList).CloseParenthesisTkn, - Extends: $3, - Implements: $4, - OpenCurlyBracket: $6, - Stmts: $7, - CloseCurlyBracket: $8, + ClassTkn: $1, + OpenParenthesisTkn: $2.(*ast.ArgumentList).OpenParenthesisTkn, + Arguments: $2.(*ast.ArgumentList).Arguments, + SeparatorTkns: $2.(*ast.ArgumentList).SeparatorTkns, + CloseParenthesisTkn: $2.(*ast.ArgumentList).CloseParenthesisTkn, + Extends: $3, + Implements: $4, + OpenCurlyBracketTkn: $6, + Stmts: $7, + CloseCurlyBracketTkn: $8, } } ; @@ -3550,9 +3550,9 @@ scalar: { $$ = &ast.ScalarEncapsed{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $3), - OpenQoteTkn: $1, - Parts: $2, - CloseQoteTkn: $3, + OpenQuoteTkn: $1, + Parts: $2, + CloseQuoteTkn: $3, } } | T_START_HEREDOC encaps_list T_END_HEREDOC diff --git a/pkg/ast/node.go b/pkg/ast/node.go index 4108daa..7ba8fc6 100644 --- a/pkg/ast/node.go +++ b/pkg/ast/node.go @@ -102,10 +102,10 @@ func (n *ScalarDnumber) GetPosition() *position.Position { // ScalarEncapsed node type ScalarEncapsed struct { - Position *position.Position - OpenQoteTkn *token.Token - Parts []Vertex - CloseQoteTkn *token.Token + Position *position.Position + OpenQuoteTkn *token.Token + Parts []Vertex + CloseQuoteTkn *token.Token } func (n *ScalarEncapsed) Accept(v NodeVisitor) { @@ -250,19 +250,19 @@ func (n *StmtCatch) GetPosition() *position.Position { // StmtClass node type StmtClass struct { - Position *position.Position - Modifiers []Vertex - ClassTkn *token.Token - ClassName Vertex - OpenParenthesisTkn *token.Token - Arguments []Vertex - SeparatorTkns []*token.Token - CloseParenthesisTkn *token.Token - Extends Vertex - Implements Vertex - OpenCurlyBracket *token.Token - Stmts []Vertex - CloseCurlyBracket *token.Token + Position *position.Position + Modifiers []Vertex + ClassTkn *token.Token + ClassName Vertex + OpenParenthesisTkn *token.Token + Arguments []Vertex + SeparatorTkns []*token.Token + CloseParenthesisTkn *token.Token + Extends Vertex + Implements Vertex + OpenCurlyBracketTkn *token.Token + Stmts []Vertex + CloseCurlyBracketTkn *token.Token } func (n *StmtClass) Accept(v NodeVisitor) { @@ -761,13 +761,13 @@ func (n *StmtLabel) GetPosition() *position.Position { // StmtNamespace node type StmtNamespace struct { - Position *position.Position - NsTkn *token.Token - Name Vertex - OpenCurlyBracket *token.Token - Stmts []Vertex - CloseCurlyBracket *token.Token - SemiColonTkn *token.Token + Position *position.Position + NsTkn *token.Token + Name Vertex + OpenCurlyBracketTkn *token.Token + Stmts []Vertex + CloseCurlyBracketTkn *token.Token + SemiColonTkn *token.Token } func (n *StmtNamespace) Accept(v NodeVisitor) { @@ -877,10 +877,10 @@ func (n *StmtStaticVar) GetPosition() *position.Position { // StmtStmtList node type StmtStmtList struct { - Position *position.Position - OpenCurlyBracket *token.Token - Stmts []Vertex - CloseCurlyBracket *token.Token + Position *position.Position + OpenCurlyBracketTkn *token.Token + Stmts []Vertex + CloseCurlyBracketTkn *token.Token } func (n *StmtStmtList) Accept(v NodeVisitor) { @@ -934,14 +934,14 @@ func (n *StmtThrow) GetPosition() *position.Position { // StmtTrait node type StmtTrait struct { - Position *position.Position - TraitTkn *token.Token - TraitName Vertex - Extends Vertex - Implements Vertex - OpenCurlyBracket *token.Token - Stmts []Vertex - CloseCurlyBracket *token.Token + Position *position.Position + TraitTkn *token.Token + TraitName Vertex + Extends Vertex + Implements Vertex + OpenCurlyBracketTkn *token.Token + Stmts []Vertex + CloseCurlyBracketTkn *token.Token } func (n *StmtTrait) Accept(v NodeVisitor) { @@ -1039,13 +1039,13 @@ func (n *StmtTraitUsePrecedence) GetPosition() *position.Position { // StmtTry node type StmtTry struct { - Position *position.Position - TryTkn *token.Token - OpenCurlyBracket *token.Token - Stmts []Vertex - CloseCurlyBracket *token.Token - Catches []Vertex - Finally Vertex + Position *position.Position + TryTkn *token.Token + OpenCurlyBracketTkn *token.Token + Stmts []Vertex + CloseCurlyBracketTkn *token.Token + Catches []Vertex + Finally Vertex } func (n *StmtTry) Accept(v NodeVisitor) { diff --git a/pkg/ast/visitor/dump.go b/pkg/ast/visitor/dump.go index 5ddc306..8366e52 100644 --- a/pkg/ast/visitor/dump.go +++ b/pkg/ast/visitor/dump.go @@ -288,9 +288,9 @@ func (v *Dump) StmtClass(n *ast.StmtClass) { v.dumpToken("CloseParenthesisTkn", n.CloseParenthesisTkn) v.dumpVertex("Extends", n.Extends) v.dumpVertex("Implements", n.Implements) - v.dumpToken("OpenCurlyBracket", n.OpenCurlyBracket) + v.dumpToken("OpenCurlyBracketTkn", n.OpenCurlyBracketTkn) v.dumpVertexList("Stmts", n.Stmts) - v.dumpToken("CloseCurlyBracket", n.CloseCurlyBracket) + v.dumpToken("CloseCurlyBracketTkn", n.CloseCurlyBracketTkn) v.indent-- v.print(v.indent, "},\n") @@ -706,9 +706,9 @@ func (v *Dump) StmtNamespace(n *ast.StmtNamespace) { v.dumpPosition(n.Position) v.dumpToken("NsTkn", n.NsTkn) v.dumpVertex("Name", n.Name) - v.dumpToken("OpenCurlyBracket", n.OpenCurlyBracket) + v.dumpToken("OpenCurlyBracketTkn", n.OpenCurlyBracketTkn) v.dumpVertexList("Stmts", n.Stmts) - v.dumpToken("CloseCurlyBracket", n.CloseCurlyBracket) + v.dumpToken("CloseCurlyBracketTkn", n.CloseCurlyBracketTkn) v.dumpToken("SemiColonTkn", n.SemiColonTkn) v.indent-- @@ -799,9 +799,9 @@ func (v *Dump) StmtStmtList(n *ast.StmtStmtList) { v.indent++ v.dumpPosition(n.Position) - v.dumpToken("OpenCurlyBracket", n.OpenCurlyBracket) + v.dumpToken("OpenCurlyBracketTkn", n.OpenCurlyBracketTkn) v.dumpVertexList("Stmts", n.Stmts) - v.dumpToken("CloseCurlyBracket", n.CloseCurlyBracket) + v.dumpToken("CloseCurlyBracketTkn", n.CloseCurlyBracketTkn) v.indent-- v.print(v.indent, "},\n") @@ -850,9 +850,9 @@ func (v *Dump) StmtTrait(n *ast.StmtTrait) { v.dumpVertex("TraitName", n.TraitName) v.dumpVertex("Extends", n.Extends) v.dumpVertex("Implements", n.Implements) - v.dumpToken("OpenCurlyBracket", n.OpenCurlyBracket) + v.dumpToken("OpenCurlyBracketTkn", n.OpenCurlyBracketTkn) v.dumpVertexList("Stmts", n.Stmts) - v.dumpToken("CloseCurlyBracket", n.CloseCurlyBracket) + v.dumpToken("CloseCurlyBracketTkn", n.CloseCurlyBracketTkn) v.indent-- v.print(v.indent, "},\n") @@ -934,9 +934,9 @@ func (v *Dump) StmtTry(n *ast.StmtTry) { v.dumpPosition(n.Position) v.dumpToken("TryTkn", n.TryTkn) - v.dumpToken("OpenCurlyBracket", n.OpenCurlyBracket) + v.dumpToken("OpenCurlyBracketTkn", n.OpenCurlyBracketTkn) v.dumpVertexList("Stmts", n.Stmts) - v.dumpToken("CloseCurlyBracket", n.CloseCurlyBracket) + v.dumpToken("CloseCurlyBracketTkn", n.CloseCurlyBracketTkn) v.dumpVertexList("Catches", n.Catches) v.dumpVertex("Finally", n.Finally) @@ -2236,9 +2236,9 @@ func (v *Dump) ScalarEncapsed(n *ast.ScalarEncapsed) { v.indent++ v.dumpPosition(n.Position) - v.dumpToken("OpenQoteTkn", n.OpenQoteTkn) + v.dumpToken("OpenQuoteTkn", n.OpenQuoteTkn) v.dumpVertexList("Parts", n.Parts) - v.dumpToken("CloseQoteTkn", n.CloseQoteTkn) + v.dumpToken("CloseQuoteTkn", n.CloseQuoteTkn) v.indent-- v.print(v.indent, "},\n") diff --git a/pkg/ast/visitor/dump_test.go b/pkg/ast/visitor/dump_test.go index cc9fb09..f3a26df 100644 --- a/pkg/ast/visitor/dump_test.go +++ b/pkg/ast/visitor/dump_test.go @@ -13,7 +13,7 @@ import ( func TestDumper_root(t *testing.T) { o := bytes.NewBufferString("") - p := visitor.NewDump(o) + p := visitor.NewDump(o).WithTokens().WithPositions() n := &ast.Root{ Position: &position.Position{ StartLine: 1, diff --git a/pkg/ast/visitor/printer.go b/pkg/ast/visitor/printer.go index 3388399..ae85256 100644 --- a/pkg/ast/visitor/printer.go +++ b/pkg/ast/visitor/printer.go @@ -196,9 +196,9 @@ func (p *printer) StmtClass(n *ast.StmtClass) { p.printToken(n.CloseParenthesisTkn, p.ifNodeList(n.Arguments, []byte(")"))) p.printNode(n.Extends) p.printNode(n.Implements) - p.printToken(n.OpenCurlyBracket, []byte("{")) + p.printToken(n.OpenCurlyBracketTkn, []byte("{")) p.printList(n.Stmts) - p.printToken(n.CloseCurlyBracket, []byte("}")) + p.printToken(n.CloseCurlyBracketTkn, []byte("}")) } func (p *printer) StmtClassConstList(n *ast.StmtClassConstList) { @@ -256,9 +256,9 @@ func (p *printer) StmtDeclare(n *ast.StmtDeclare) { p.printToken(n.CloseParenthesisTkn, []byte(")")) p.printToken(n.ColonTkn, nil) if stmt, ok := n.Stmt.(*ast.StmtStmtList); ok && n.ColonTkn != nil { - p.printToken(stmt.OpenCurlyBracket, nil) + p.printToken(stmt.OpenCurlyBracketTkn, nil) p.printList(stmt.Stmts) - p.printToken(stmt.CloseCurlyBracket, nil) + p.printToken(stmt.CloseCurlyBracketTkn, nil) } else { p.printNode(n.Stmt) } @@ -293,9 +293,9 @@ func (p *printer) StmtElse(n *ast.StmtElse) { p.printToken(n.ElseTkn, []byte("else")) p.printToken(n.ColonTkn, nil) if stmt, ok := n.Stmt.(*ast.StmtStmtList); ok && n.ColonTkn != nil { - p.printToken(stmt.OpenCurlyBracket, nil) + p.printToken(stmt.OpenCurlyBracketTkn, nil) p.printList(stmt.Stmts) - p.printToken(stmt.CloseCurlyBracket, nil) + p.printToken(stmt.CloseCurlyBracketTkn, nil) } else { p.printNode(n.Stmt) } @@ -308,9 +308,9 @@ func (p *printer) StmtElseIf(n *ast.StmtElseIf) { p.printToken(n.CloseParenthesisTkn, []byte(")")) p.printToken(n.ColonTkn, nil) if stmt, ok := n.Stmt.(*ast.StmtStmtList); ok && n.ColonTkn != nil { - p.printToken(stmt.OpenCurlyBracket, nil) + p.printToken(stmt.OpenCurlyBracketTkn, nil) p.printList(stmt.Stmts) - p.printToken(stmt.CloseCurlyBracket, nil) + p.printToken(stmt.CloseCurlyBracketTkn, nil) } else { p.printNode(n.Stmt) } @@ -339,9 +339,9 @@ func (p *printer) StmtFor(n *ast.StmtFor) { p.printToken(n.CloseParenthesisTkn, []byte(")")) p.printToken(n.ColonTkn, nil) if stmt, ok := n.Stmt.(*ast.StmtStmtList); ok && n.ColonTkn != nil { - p.printToken(stmt.OpenCurlyBracket, nil) + p.printToken(stmt.OpenCurlyBracketTkn, nil) p.printList(stmt.Stmts) - p.printToken(stmt.CloseCurlyBracket, nil) + p.printToken(stmt.CloseCurlyBracketTkn, nil) } else { p.printNode(n.Stmt) } @@ -360,9 +360,9 @@ func (p *printer) StmtForeach(n *ast.StmtForeach) { p.printToken(n.CloseParenthesisTkn, []byte(")")) p.printToken(n.ColonTkn, nil) if stmt, ok := n.Stmt.(*ast.StmtStmtList); ok && n.ColonTkn != nil { - p.printToken(stmt.OpenCurlyBracket, nil) + p.printToken(stmt.OpenCurlyBracketTkn, nil) p.printList(stmt.Stmts) - p.printToken(stmt.CloseCurlyBracket, nil) + p.printToken(stmt.CloseCurlyBracketTkn, nil) } else { p.printNode(n.Stmt) } @@ -410,9 +410,9 @@ func (p *printer) StmtIf(n *ast.StmtIf) { p.printToken(n.CloseParenthesisTkn, []byte(")")) p.printToken(n.ColonTkn, nil) if stmt, ok := n.Stmt.(*ast.StmtStmtList); ok && n.ColonTkn != nil { - p.printToken(stmt.OpenCurlyBracket, nil) + p.printToken(stmt.OpenCurlyBracketTkn, nil) p.printList(stmt.Stmts) - p.printToken(stmt.CloseCurlyBracket, nil) + p.printToken(stmt.CloseCurlyBracketTkn, nil) } else { p.printNode(n.Stmt) } @@ -454,9 +454,9 @@ func (p *printer) StmtLabel(n *ast.StmtLabel) { func (p *printer) StmtNamespace(n *ast.StmtNamespace) { p.printToken(n.NsTkn, []byte("namespace")) p.printNode(n.Name) - p.printToken(n.OpenCurlyBracket, p.ifNodeList(n.Stmts, []byte("{"))) + p.printToken(n.OpenCurlyBracketTkn, p.ifNodeList(n.Stmts, []byte("{"))) p.printList(n.Stmts) - p.printToken(n.CloseCurlyBracket, p.ifNodeList(n.Stmts, []byte("}"))) + p.printToken(n.CloseCurlyBracketTkn, p.ifNodeList(n.Stmts, []byte("}"))) p.printToken(n.SemiColonTkn, p.ifNotNodeList(n.Stmts, []byte(";"))) } @@ -496,9 +496,9 @@ func (p *printer) StmtStaticVar(n *ast.StmtStaticVar) { } func (p *printer) StmtStmtList(n *ast.StmtStmtList) { - p.printToken(n.OpenCurlyBracket, []byte("{")) + p.printToken(n.OpenCurlyBracketTkn, []byte("{")) p.printList(n.Stmts) - p.printToken(n.CloseCurlyBracket, []byte("}")) + p.printToken(n.CloseCurlyBracketTkn, []byte("}")) } func (p *printer) StmtSwitch(n *ast.StmtSwitch) { @@ -526,9 +526,9 @@ func (p *printer) StmtTrait(n *ast.StmtTrait) { p.printNode(n.TraitName) p.printNode(n.Extends) p.printNode(n.Implements) - p.printToken(n.OpenCurlyBracket, []byte("{")) + p.printToken(n.OpenCurlyBracketTkn, []byte("{")) p.printList(n.Stmts) - p.printToken(n.CloseCurlyBracket, []byte("}")) + p.printToken(n.CloseCurlyBracketTkn, []byte("}")) } func (p *printer) StmtTraitAdaptationList(n *ast.StmtTraitAdaptationList) { @@ -566,9 +566,9 @@ func (p *printer) StmtTraitUsePrecedence(n *ast.StmtTraitUsePrecedence) { func (p *printer) StmtTry(n *ast.StmtTry) { p.printToken(n.TryTkn, []byte("try")) - p.printToken(n.OpenCurlyBracket, []byte("{")) + p.printToken(n.OpenCurlyBracketTkn, []byte("{")) p.printList(n.Stmts) - p.printToken(n.CloseCurlyBracket, []byte("}")) + p.printToken(n.CloseCurlyBracketTkn, []byte("}")) p.printList(n.Catches) p.printNode(n.Finally) } @@ -615,9 +615,9 @@ func (p *printer) StmtWhile(n *ast.StmtWhile) { p.printToken(n.CloseParenthesisTkn, []byte(")")) p.printToken(n.ColonTkn, nil) if stmt, ok := n.Stmt.(*ast.StmtStmtList); ok && n.ColonTkn != nil { - p.printToken(stmt.OpenCurlyBracket, nil) + p.printToken(stmt.OpenCurlyBracketTkn, nil) p.printList(stmt.Stmts) - p.printToken(stmt.CloseCurlyBracket, nil) + p.printToken(stmt.CloseCurlyBracketTkn, nil) } else { p.printNode(n.Stmt) } @@ -1181,9 +1181,9 @@ func (p *printer) ScalarDnumber(n *ast.ScalarDnumber) { } func (p *printer) ScalarEncapsed(n *ast.ScalarEncapsed) { - p.printToken(n.OpenQoteTkn, []byte("\"")) + p.printToken(n.OpenQuoteTkn, []byte("\"")) p.printList(n.Parts) - p.printToken(n.CloseQoteTkn, []byte("\"")) + p.printToken(n.CloseQuoteTkn, []byte("\"")) } func (p *printer) ScalarEncapsedStringPart(n *ast.ScalarEncapsedStringPart) {