[refactoring] update ast structure of "Nullable"

2020-11-20 22:07:58 +02:00
parent bf3ae74d56
commit 43ace92875
4 changed files with 1029 additions and 1028 deletions
--- a/internal/php5/php5.go
+++ b/internal/php5/php5.go
--- a/internal/php7/php7.go
+++ b/internal/php7/php7.go
--- a/internal/php7/php7.y
+++ b/internal/php7/php7.y
@@ -1948,13 +1948,13 @@ type_expr:
            }
    |   '?' type
            {
-                $$ = &ast.Nullable{ast.Node{}, $2}
-
-                // save position
-                $$.GetNode().Position = position.NewTokenNodePosition($1, $2)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
+                $$ = &ast.Nullable{
+                    Node: ast.Node{
+                        Position: position.NewTokenNodePosition($1, $2),
+                    },
+                    QuestionTkn: $1,
+                    Expr:        $2,
+                }
            }
 ;