[refactoring] update ast structure of "Return" node

2020-09-06 13:09:00 +03:00
parent e817f8dd8d
commit 59ef622082
7 changed files with 892 additions and 901 deletions
--- a/internal/php7/php7.go
+++ b/internal/php7/php7.go
--- a/internal/php7/php7.y
+++ b/internal/php7/php7.y
@@ -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 ';'
            {