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

save expr.Exit and expr.Die comments

Browse Source
This commit is contained in:
z7zmey 2018-06-03 13:43:27 +03:00
parent 22cca215df
commit deccf266d9
2 changed files with 182 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

289
php7/php7.go
View File

File diff suppressed because it is too large Load Diff

31
php7/php7.y
View File

@ -3109,16 +3109,30 @@ expr_without_variable:
| T_EXIT exit_expr | T_EXIT exit_expr
{ {
if (strings.EqualFold($1.Value, "die")) { if (strings.EqualFold($1.Value, "die")) {
$$ = expr.NewDie($2) $$ = expr.NewDie(nil)
if $2 != nil {
$$.(*expr.Die).Expr = $2.(*expr.Exit).Expr
}
} else { } else {
$$ = expr.NewExit($2) $$ = expr.NewExit(nil)
if $2 != nil {
$$.(*expr.Exit).Expr = $2.(*expr.Exit).Expr
}
} }
// save position // save position
yylex.(*Parser).positions.AddPosition($$, yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)) if $2 == nil {
yylex.(*Parser).positions.AddPosition($$, yylex.(*Parser).positionBuilder.NewTokenPosition($1))
} else {
yylex.(*Parser).positions.AddPosition($$, yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2))
}
// save comments // save comments
yylex.(*Parser).comments.AddFromToken($$, $1, comment.ExitToken) yylex.(*Parser).comments.AddFromToken($$, $1, comment.ExitToken)
if $2 != nil {
yylex.(*Parser).comments.AddFromChildNode($$, $2)
}
} }
| '@' expr | '@' expr
{ {
@ -3368,7 +3382,16 @@ exit_expr:
/* empty */ /* empty */
{ $$ = nil } { $$ = nil }
| '(' optional_expr ')' | '(' optional_expr ')'
{ $$ = $2; } {
$$ = expr.NewExit($2);
// save position
yylex.(*Parser).positions.AddPosition($$, yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3))
// save comments
yylex.(*Parser).comments.AddFromToken($$, $1, comment.OpenParenthesisToken)
yylex.(*Parser).comments.AddFromToken($$, $3, comment.CloseParenthesisToken)
}
; ;
backticks_expr: backticks_expr: