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

[refactoring] update ast structure of "Nop" node

Browse Source
This commit is contained in:
Vadym Slizov 2020-09-14 19:34:02 +03:00
parent e78f0dc650
commit 33af1df9c4
7 changed files with 43 additions and 53 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.

41
internal/php5/php5.y
View File

@ -1141,14 +1141,12 @@ unticked_statement:
}
| ';'
{
$$ = &ast.StmtNop{ast.Node{}, }
// save position
$$.GetNode().Position = position.NewTokenPosition($1)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setToken($$, token.SemiColon, $1.SkippedTokens)
$$ = &ast.StmtNop{
Node: ast.Node{
Position: position.NewTokenPosition($1),
},
SemiColonTkn: $1,
}
}
| T_TRY '{' inner_statement_list '}' catch_statement finally_statement
{
@ -2420,13 +2418,12 @@ trait_list:
trait_adaptations:
';'
{
$$ = &ast.StmtNop{ast.Node{}, }
$$.GetNode().Position = position.NewTokenPosition($1)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setToken($$, token.SemiColon, $1.SkippedTokens)
$$ = &ast.StmtNop{
Node: ast.Node{
Position: position.NewTokenPosition($1),
},
SemiColonTkn: $1,
}
}
| '{' trait_adaptation_list '}'
{
@ -2587,14 +2584,12 @@ trait_modifiers:
method_body:
';' /* abstract method */
{
$$ = &ast.StmtNop{ast.Node{}, }
// save position
$$.GetNode().Position = position.NewTokenPosition($1)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setToken($$, token.SemiColon, $1.SkippedTokens)
$$ = &ast.StmtNop{
Node: ast.Node{
Position: position.NewTokenPosition($1),
},
SemiColonTkn: $1,
}
}
| '{' inner_statement_list '}'
{

BIN
internal/php7/php7.go generated
View File

Binary file not shown.

41
internal/php7/php7.y
View File

@ -1051,14 +1051,12 @@ statement:
}
| ';'
{
$$ = &ast.StmtNop{ast.Node{}, }
// save position
$$.GetNode().Position = position.NewTokenPosition($1)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setToken($$, token.SemiColon, $1.SkippedTokens)
$$ = &ast.StmtNop{
Node: ast.Node{
Position: position.NewTokenPosition($1),
},
SemiColonTkn: $1,
}
}
| T_TRY '{' inner_statement_list '}' catch_list finally_statement
{
@ -2203,13 +2201,12 @@ name_list:
trait_adaptations:
';'
{
$$ = &ast.StmtNop{ast.Node{}, }
$$.GetNode().Position = position.NewTokenPosition($1)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setToken($$, token.SemiColon, $1.SkippedTokens)
$$ = &ast.StmtNop{
Node: ast.Node{
Position: position.NewTokenPosition($1),
},
SemiColonTkn: $1,
}
}
| '{' '}'
{
@ -2372,14 +2369,12 @@ absolute_trait_method_reference:
method_body:
';' /* abstract method */
{
$$ = &ast.StmtNop{ast.Node{}, }
// save position
$$.GetNode().Position = position.NewTokenPosition($1)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setToken($$, token.SemiColon, $1.SkippedTokens)
$$ = &ast.StmtNop{
Node: ast.Node{
Position: position.NewTokenPosition($1),
},
SemiColonTkn: $1,
}
}
| '{' inner_statement_list '}'
{

1
pkg/ast/node.go
View File

@ -597,6 +597,7 @@ func (n *StmtNamespace) Accept(v NodeVisitor) {
// StmtNop node
type StmtNop struct {
Node
SemiColonTkn *token.Token
}
func (n *StmtNop) Accept(v NodeVisitor) {

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

@ -235,3 +235,7 @@ func (v *FilterTokens) StmtDeclare(n *ast.StmtDeclare) {
n.EndDeclareTkn = nil
n.SemiColonTkn = nil
}
func (v *FilterTokens) StmtNop(n *ast.StmtNop) {
n.SemiColonTkn = nil
}

9
pkg/printer/printer.go
View File

@ -2581,13 +2581,8 @@ func (p *Printer) printStmtNamespace(n *ast.StmtNamespace) {
p.printToken(n.SemiColonTkn, ";")
}
func (p *Printer) printStmtNop(n ast.Vertex) {
p.printFreeFloatingOrDefault(n, token.Start, p.bufStart)
p.printFreeFloating(n, token.SemiColon)
if n.GetNode().Tokens.IsEmpty() {
p.write([]byte(";"))
}
p.printFreeFloating(n, token.End)
func (p *Printer) printStmtNop(n *ast.StmtNop) {
p.printToken(n.SemiColonTkn, ";")
}
func (p *Printer) printStmtPropertyList(n ast.Vertex) {