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

[refactoring] update ast structure of "Goto" and "Label" nodes

Browse Source
This commit is contained in:
Vadym Slizov 2020-09-17 16:49:54 +03:00
parent 48aaa7cc47
commit 94aa9cf829
7 changed files with 55 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
internal/php5/php5.go generated
View File

Binary file not shown.

26
internal/php5/php5.y
View File

@ -829,15 +829,19 @@ statement:
| T_STRING ':'
{
label := &ast.Identifier{ast.Node{}, $1.Value}
$$ = &ast.StmtLabel{ast.Node{}, label}
$$ = &ast.StmtLabel{
Node: ast.Node{
Position: position.NewTokensPosition($1, $2),
},
LabelName: label,
ColonTkn: $2,
}
// save position
label.GetNode().Position = position.NewTokenPosition($1)
$$.GetNode().Position = position.NewTokensPosition($1, $2)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloating($$, token.Label, $2.SkippedTokens)
yylex.(*Parser).setFreeFloating(label, token.Start, $1.SkippedTokens)
}
;
@ -1179,17 +1183,21 @@ unticked_statement:
| T_GOTO T_STRING ';'
{
label := &ast.Identifier{ast.Node{}, $2.Value}
$$ = &ast.StmtGoto{ast.Node{}, label}
$$ = &ast.StmtGoto{
Node: ast.Node{
Position: position.NewTokensPosition($1, $3),
},
GotoTkn: $1,
Label: label,
SemiColonTkn: $3,
}
// save position
label.GetNode().Position = position.NewTokenPosition($2)
$$.GetNode().Position = position.NewTokensPosition($1, $3)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloating(label, token.Start, $2.SkippedTokens)
yylex.(*Parser).setFreeFloating($$, token.Label, $3.SkippedTokens)
yylex.(*Parser).setToken($$, token.SemiColon, $3.SkippedTokens)
}
;

BIN
internal/php7/php7.go generated
View File

Binary file not shown.

26
internal/php7/php7.y
View File

@ -1089,30 +1089,38 @@ statement:
| T_GOTO T_STRING ';'
{
label := &ast.Identifier{ast.Node{}, $2.Value}
$$ = &ast.StmtGoto{ast.Node{}, label}
$$ = &ast.StmtGoto{
Node: ast.Node{
Position: position.NewTokensPosition($1, $3),
},
GotoTkn: $1,
Label: label,
SemiColonTkn: $3,
}
// save position
label.GetNode().Position = position.NewTokenPosition($2)
$$.GetNode().Position = position.NewTokensPosition($1, $3)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloating(label, token.Start, $2.SkippedTokens)
yylex.(*Parser).setFreeFloating($$, token.Label, $3.SkippedTokens)
yylex.(*Parser).setToken($$, token.SemiColon, $3.SkippedTokens)
}
| T_STRING ':'
{
label := &ast.Identifier{ast.Node{}, $1.Value}
$$ = &ast.StmtLabel{ast.Node{}, label}
$$ = &ast.StmtLabel{
Node: ast.Node{
Position: position.NewTokensPosition($1, $2),
},
LabelName: label,
ColonTkn: $2,
}
// save position
label.GetNode().Position = position.NewTokenPosition($1)
$$.GetNode().Position = position.NewTokensPosition($1, $2)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloating($$, token.Label, $2.SkippedTokens)
yylex.(*Parser).setFreeFloating(label, token.Start, $1.SkippedTokens)
}
catch_list:

5
pkg/ast/node.go
View File

@ -505,7 +505,9 @@ func (n *StmtGlobal) Accept(v NodeVisitor) {
// StmtGoto node
type StmtGoto struct {
Node
Label Vertex
GotoTkn *token.Token
Label Vertex
SemiColonTkn *token.Token
}
func (n *StmtGoto) Accept(v NodeVisitor) {
@ -582,6 +584,7 @@ func (n *StmtInterfaceExtends) Accept(v NodeVisitor) {
type StmtLabel struct {
Node
LabelName Vertex
ColonTkn *token.Token
}
func (n *StmtLabel) Accept(v NodeVisitor) {

9
pkg/ast/visitor/filter_tokens.go
View File

@ -265,3 +265,12 @@ func (v *FilterTokens) StmtThrow(n *ast.StmtThrow) {
n.ThrowTkn = nil
n.SemiColonTkn = nil
}
func (v *FilterTokens) StmtGoto(n *ast.StmtGoto) {
n.GotoTkn = nil
n.SemiColonTkn = nil
}
func (v *FilterTokens) StmtLabel(n *ast.StmtLabel) {
n.ColonTkn = nil
}

35
pkg/printer/printer.go
View File

@ -2425,23 +2425,11 @@ func (p *Printer) printStmtGlobal(n *ast.StmtGlobal) {
p.printToken(n.SemiColonTkn, ";")
}
func (p *Printer) printStmtGoto(n ast.Vertex) {
nn := n.(*ast.StmtGoto)
p.printFreeFloating(nn, token.Start)
p.write([]byte("goto"))
if nn.Label.GetNode().Tokens.IsEmpty() {
p.write([]byte(" "))
}
p.Print(nn.Label)
p.printFreeFloating(nn, token.Label)
p.printFreeFloating(nn, token.SemiColon)
if nn.GetNode().Tokens.IsEmpty() {
p.write([]byte(";"))
}
p.printFreeFloating(nn, token.End)
func (p *Printer) printStmtGoto(n *ast.StmtGoto) {
p.printToken(n.GotoTkn, "goto")
p.bufStart = " "
p.Print(n.Label)
p.printToken(n.SemiColonTkn, ";")
}
func (p *Printer) printStmtHaltCompiler(n *ast.StmtHaltCompiler) {
@ -2527,16 +2515,9 @@ func (p *Printer) printStmtInterface(n ast.Vertex) {
p.printFreeFloating(nn, token.End)
}
func (p *Printer) printStmtLabel(n ast.Vertex) {
nn := n.(*ast.StmtLabel)
p.printFreeFloating(nn, token.Start)
p.Print(nn.LabelName)
p.printFreeFloating(nn, token.Label)
p.write([]byte(":"))
p.printFreeFloating(nn, token.End)
func (p *Printer) printStmtLabel(n *ast.StmtLabel) {
p.Print(n.LabelName)
p.printToken(n.ColonTkn, ":")
}
func (p *Printer) printStmtNamespace(n *ast.StmtNamespace) {