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

[refactoring] update ast structure of "Break", "Continue" nodes

Browse Source
This commit is contained in:
Vadym Slizov
2020-09-06 13:02:13 +03:00
parent f6cb2bff4d
commit e817f8dd8d
9 changed files with 1089 additions and 1108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1000
internal/php5/php5.go generated
View File

File diff suppressed because it is too large Load Diff

66
internal/php5/php5.y
View File

@@ -950,51 +950,45 @@ unticked_statement:
}
| T_BREAK ';'
{
$$ = &ast.StmtBreak{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.StmtBreak{
Node: ast.Node{
Position: position.NewTokensPosition($1, $2),
},
BreakTkn: $1,
SemiColonTkn: $2,
}
}
| T_BREAK expr ';'
{
$$ = &ast.StmtBreak{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.StmtBreak{
Node: ast.Node{
Position: position.NewTokensPosition($1, $3),
},
BreakTkn: $1,
Expr: $2,
SemiColonTkn: $3,
}
}
| T_CONTINUE ';'
{
$$ = &ast.StmtContinue{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.StmtContinue{
Node: ast.Node{
Position: position.NewTokensPosition($1, $2),
},
ContinueTkn: $1,
SemiColonTkn: $2,
}
}
| T_CONTINUE expr ';'
{
$$ = &ast.StmtContinue{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.StmtContinue{
Node: ast.Node{
Position: position.NewTokensPosition($1, $3),
},
ContinueTkn: $1,
Expr: $2,
SemiColonTkn: $3,
}
}
| T_RETURN ';'
{

1022
internal/php7/php7.go generated
View File

File diff suppressed because it is too large Load Diff

34
internal/php7/php7.y
View File

@@ -919,27 +919,25 @@ statement:
}
| T_BREAK optional_expr ';'
{
$$ = &ast.StmtBreak{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.StmtBreak{
Node: ast.Node{
Position: position.NewTokensPosition($1, $3),
},
BreakTkn: $1,
Expr: $2,
SemiColonTkn: $3,
}
}
| T_CONTINUE optional_expr ';'
{
$$ = &ast.StmtContinue{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.StmtContinue{
Node: ast.Node{
Position: position.NewTokensPosition($1, $3),
},
ContinueTkn: $1,
Expr: $2,
SemiColonTkn: $3,
}
}
| T_RETURN optional_expr ';'
{