maride/php-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[refactoring] fix typo

Browse Source
This commit is contained in:
Vadym Slizov 2020-12-11 17:29:22 +02:00
parent 45ded326d0
commit 5291529a37
No known key found for this signature in database
GPG Key ID: AEA2A9388EF42A4A
8 changed files with 231 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
internal/php5/php5.go generated
View File

@ -2430,9 +2430,9 @@ yydefault:
Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items,
SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns,
},
OpenCurlyBracket: yyDollar[3].token,
Stmts: yyDollar[4].list,
CloseCurlyBracket: yyDollar[5].token,
OpenCurlyBracketTkn: yyDollar[3].token,
Stmts: yyDollar[4].list,
CloseCurlyBracketTkn: yyDollar[5].token,
}
}
case 13:
@ -2440,11 +2440,11 @@ yydefault:
// line internal/php5/php5.y:375
{
yyVAL.node = &ast.StmtNamespace{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
NsTkn: yyDollar[1].token,
OpenCurlyBracket: yyDollar[2].token,
Stmts: yyDollar[3].list,
CloseCurlyBracket: yyDollar[4].token,
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
NsTkn: yyDollar[1].token,
OpenCurlyBracketTkn: yyDollar[2].token,
Stmts: yyDollar[3].list,
CloseCurlyBracketTkn: yyDollar[4].token,
}
}
case 14:
@ -2867,10 +2867,10 @@ yydefault:
// line internal/php5/php5.y:769
{
yyVAL.node = &ast.StmtStmtList{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
OpenCurlyBracket: yyDollar[1].token,
Stmts: yyDollar[2].list,
CloseCurlyBracket: yyDollar[3].token,
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
OpenCurlyBracketTkn: yyDollar[1].token,
Stmts: yyDollar[2].list,
CloseCurlyBracketTkn: yyDollar[3].token,
}
}
case 48:
@ -3193,13 +3193,13 @@ yydefault:
}
yyVAL.node = &ast.StmtTry{
Position: pos,
TryTkn: yyDollar[1].token,
OpenCurlyBracket: yyDollar[2].token,
Stmts: yyDollar[3].list,
CloseCurlyBracket: yyDollar[4].token,
Catches: yyDollar[5].list,
Finally: yyDollar[6].node,
Position: pos,
TryTkn: yyDollar[1].token,
OpenCurlyBracketTkn: yyDollar[2].token,
Stmts: yyDollar[3].list,
CloseCurlyBracketTkn: yyDollar[4].token,
Catches: yyDollar[5].list,
Finally: yyDollar[6].node,
}
}
case 73:
@ -3418,9 +3418,9 @@ yydefault:
}
n.Extends = yyDollar[3].node
n.Implements = yyDollar[4].node
n.OpenCurlyBracket = yyDollar[5].token
n.OpenCurlyBracketTkn = yyDollar[5].token
n.Stmts = yyDollar[6].list
n.CloseCurlyBracket = yyDollar[7].token
n.CloseCurlyBracketTkn = yyDollar[7].token
case *ast.StmtTrait:
n.Position = yylex.(*Parser).builder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[7].token)
n.TraitName = &ast.Identifier{
@ -3430,9 +3430,9 @@ yydefault:
}
n.Extends = yyDollar[3].node
n.Implements = yyDollar[4].node
n.OpenCurlyBracket = yyDollar[5].token
n.OpenCurlyBracketTkn = yyDollar[5].token
n.Stmts = yyDollar[6].list
n.CloseCurlyBracket = yyDollar[7].token
n.CloseCurlyBracketTkn = yyDollar[7].token
}
yyVAL.node = yyDollar[1].node
@ -4557,10 +4557,10 @@ yydefault:
// line internal/php5/php5.y:2353
{
yyVAL.node = &ast.StmtStmtList{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
OpenCurlyBracket: yyDollar[1].token,
Stmts: yyDollar[2].list,
CloseCurlyBracket: yyDollar[3].token,
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
OpenCurlyBracketTkn: yyDollar[1].token,
Stmts: yyDollar[2].list,
CloseCurlyBracketTkn: yyDollar[3].token,
}
}
case 198:
@ -7027,10 +7027,10 @@ yydefault:
// line internal/php5/php5.y:4498
{
yyVAL.node = &ast.ScalarEncapsed{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
OpenQoteTkn: yyDollar[1].token,
Parts: yyDollar[2].list,
CloseQoteTkn: yyDollar[3].token,
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
OpenQuoteTkn: yyDollar[1].token,
Parts: yyDollar[2].list,
CloseQuoteTkn: yyDollar[3].token,
}
}
case 419:

44
internal/php5/php5.y
View File

@ -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

102
internal/php7/php7.go generated
View File

@ -2730,9 +2730,9 @@ yydefault:
Parts: yyDollar[2].node.(*ast.ParserSeparatedList).Items,
SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns,
},
OpenCurlyBracket: yyDollar[3].token,
Stmts: yyDollar[4].list,
CloseCurlyBracket: yyDollar[5].token,
OpenCurlyBracketTkn: yyDollar[3].token,
Stmts: yyDollar[4].list,
CloseCurlyBracketTkn: yyDollar[5].token,
}
}
case 95:
@ -2740,11 +2740,11 @@ yydefault:
// line internal/php7/php7.y:459
{
yyVAL.node = &ast.StmtNamespace{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
NsTkn: yyDollar[1].token,
OpenCurlyBracket: yyDollar[2].token,
Stmts: yyDollar[3].list,
CloseCurlyBracket: yyDollar[4].token,
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
NsTkn: yyDollar[1].token,
OpenCurlyBracketTkn: yyDollar[2].token,
Stmts: yyDollar[3].list,
CloseCurlyBracketTkn: yyDollar[4].token,
}
}
case 96:
@ -3127,10 +3127,10 @@ yydefault:
// line internal/php7/php7.y:813
{
yyVAL.node = &ast.StmtStmtList{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
OpenCurlyBracket: yyDollar[1].token,
Stmts: yyDollar[2].list,
CloseCurlyBracket: yyDollar[3].token,
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
OpenCurlyBracketTkn: yyDollar[1].token,
Stmts: yyDollar[2].list,
CloseCurlyBracketTkn: yyDollar[3].token,
}
}
case 133:
@ -3363,13 +3363,13 @@ yydefault:
}
yyVAL.node = &ast.StmtTry{
Position: pos,
TryTkn: yyDollar[1].token,
OpenCurlyBracket: yyDollar[2].token,
Stmts: yyDollar[3].list,
CloseCurlyBracket: yyDollar[4].token,
Catches: yyDollar[5].list,
Finally: yyDollar[6].node,
Position: pos,
TryTkn: yyDollar[1].token,
OpenCurlyBracketTkn: yyDollar[2].token,
Stmts: yyDollar[3].list,
CloseCurlyBracketTkn: yyDollar[4].token,
Catches: yyDollar[5].list,
Finally: yyDollar[6].node,
}
}
case 153:
@ -3560,11 +3560,11 @@ yydefault:
IdentifierTkn: yyDollar[3].token,
Value: yyDollar[3].token.Value,
},
Extends: yyDollar[4].node,
Implements: yyDollar[5].node,
OpenCurlyBracket: yyDollar[7].token,
Stmts: yyDollar[8].list,
CloseCurlyBracket: yyDollar[9].token,
Extends: yyDollar[4].node,
Implements: yyDollar[5].node,
OpenCurlyBracketTkn: yyDollar[7].token,
Stmts: yyDollar[8].list,
CloseCurlyBracketTkn: yyDollar[9].token,
}
}
case 171:
@ -3579,11 +3579,11 @@ yydefault:
IdentifierTkn: yyDollar[2].token,
Value: yyDollar[2].token.Value,
},
Extends: yyDollar[3].node,
Implements: yyDollar[4].node,
OpenCurlyBracket: yyDollar[6].token,
Stmts: yyDollar[7].list,
CloseCurlyBracket: yyDollar[8].token,
Extends: yyDollar[3].node,
Implements: yyDollar[4].node,
OpenCurlyBracketTkn: yyDollar[6].token,
Stmts: yyDollar[7].list,
CloseCurlyBracketTkn: yyDollar[8].token,
}
}
case 172:
@ -3630,9 +3630,9 @@ yydefault:
IdentifierTkn: yyDollar[2].token,
Value: yyDollar[2].token.Value,
},
OpenCurlyBracket: yyDollar[4].token,
Stmts: yyDollar[5].list,
CloseCurlyBracket: yyDollar[6].token,
OpenCurlyBracketTkn: yyDollar[4].token,
Stmts: yyDollar[5].list,
CloseCurlyBracketTkn: yyDollar[6].token,
}
}
case 177:
@ -4614,10 +4614,10 @@ yydefault:
// line internal/php7/php7.y:2191
{
yyVAL.node = &ast.StmtStmtList{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
OpenCurlyBracket: yyDollar[1].token,
Stmts: yyDollar[2].list,
CloseCurlyBracket: yyDollar[3].token,
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
OpenCurlyBracketTkn: yyDollar[1].token,
Stmts: yyDollar[2].list,
CloseCurlyBracketTkn: yyDollar[3].token,
}
}
case 266:
@ -4878,17 +4878,17 @@ yydefault:
// line internal/php7/php7.y:2441
{
yyVAL.node = &ast.StmtClass{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[8].token),
ClassTkn: yyDollar[1].token,
OpenParenthesisTkn: yyDollar[2].node.(*ast.ArgumentList).OpenParenthesisTkn,
Arguments: yyDollar[2].node.(*ast.ArgumentList).Arguments,
SeparatorTkns: yyDollar[2].node.(*ast.ArgumentList).SeparatorTkns,
CloseParenthesisTkn: yyDollar[2].node.(*ast.ArgumentList).CloseParenthesisTkn,
Extends: yyDollar[3].node,
Implements: yyDollar[4].node,
OpenCurlyBracket: yyDollar[6].token,
Stmts: yyDollar[7].list,
CloseCurlyBracket: yyDollar[8].token,
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[8].token),
ClassTkn: yyDollar[1].token,
OpenParenthesisTkn: yyDollar[2].node.(*ast.ArgumentList).OpenParenthesisTkn,
Arguments: yyDollar[2].node.(*ast.ArgumentList).Arguments,
SeparatorTkns: yyDollar[2].node.(*ast.ArgumentList).SeparatorTkns,
CloseParenthesisTkn: yyDollar[2].node.(*ast.ArgumentList).CloseParenthesisTkn,
Extends: yyDollar[3].node,
Implements: yyDollar[4].node,
OpenCurlyBracketTkn: yyDollar[6].token,
Stmts: yyDollar[7].list,
CloseCurlyBracketTkn: yyDollar[8].token,
}
}
case 294:
@ -6178,10 +6178,10 @@ yydefault:
// line internal/php7/php7.y:3550
{
yyVAL.node = &ast.ScalarEncapsed{
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
OpenQoteTkn: yyDollar[1].token,
Parts: yyDollar[2].list,
CloseQoteTkn: yyDollar[3].token,
Position: yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
OpenQuoteTkn: yyDollar[1].token,
Parts: yyDollar[2].list,
CloseQuoteTkn: yyDollar[3].token,
}
}
case 415:

90
internal/php7/php7.y
View File

@ -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

86
pkg/ast/node.go
View File

@ -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) {

24
pkg/ast/visitor/dump.go
View File

@ -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")

2
pkg/ast/visitor/dump_test.go
View File

@ -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,

52
pkg/ast/visitor/printer.go
View File

@ -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) {