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

[refactoring] update ast structure of "Return" node

Browse Source
This commit is contained in:
Vadym Slizov
2020-09-06 13:09:00 +03:00
parent e817f8dd8d
commit 59ef622082
7 changed files with 892 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/php5/php5.go
Generated
+486 -490
View File
File diff suppressed because it is too large Load Diff
internal/php5/php5.y
+23 -27
View File
@@ -992,39 +992,35 @@ unticked_statement:
}
| T_RETURN ';'
{
$$ = &ast.StmtReturn{ast.Node{}, nil}
// save position
$$.GetNode().Position = position.NewTokensPosition($1, $2)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloating($$, token.Expr, $2.SkippedTokens)
yylex.(*Parser).setToken($$, token.SemiColon, $2.SkippedTokens)
$$ = &ast.StmtReturn{
Node: ast.Node{
Position: position.NewTokensPosition($1, $2),
},
ReturnTkn: $1,
SemiColonTkn: $2,
}
}
| T_RETURN expr_without_variable ';'
{
$$ = &ast.StmtReturn{ast.Node{}, $2}
// save position
$$.GetNode().Position = position.NewTokensPosition($1, $3)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloating($$, token.Expr, $3.SkippedTokens)
yylex.(*Parser).setToken($$, token.SemiColon, $3.SkippedTokens)
$$ = &ast.StmtReturn{
Node: ast.Node{
Position: position.NewTokensPosition($1, $3),
},
ReturnTkn: $1,
Expr: $2,
SemiColonTkn: $3,
}
}
| T_RETURN variable ';'
{
$$ = &ast.StmtReturn{ast.Node{}, $2}
// save position
$$.GetNode().Position = position.NewTokensPosition($1, $3)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloating($$, token.Expr, $3.SkippedTokens)
yylex.(*Parser).setToken($$, token.SemiColon, $3.SkippedTokens)
$$ = &ast.StmtReturn{
Node: ast.Node{
Position: position.NewTokensPosition($1, $3),
},
ReturnTkn: $1,
Expr: $2,
SemiColonTkn: $3,
}
}
| yield_expr ';'
{
internal/php7/php7.go
Generated
+361 -362
View File
File diff suppressed because it is too large Load Diff
internal/php7/php7.y
+8 -9
View File
@@ -941,15 +941,14 @@ statement:
}
| T_RETURN optional_expr ';'
{
$$ = &ast.StmtReturn{ast.Node{}, $2}
// save position
$$.GetNode().Position = position.NewTokensPosition($1, $3)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloating($$, token.Expr, $3.SkippedTokens)
yylex.(*Parser).setToken($$, token.SemiColon, $3.SkippedTokens)
$$ = &ast.StmtReturn{
Node: ast.Node{
Position: position.NewTokensPosition($1, $3),
},
ReturnTkn: $1,
Expr: $2,
SemiColonTkn: $3,
}
}
| T_GLOBAL global_var_list ';'
{