[refactoring] update ast structure of "Root" and "Class" nodes

2020-12-04 11:02:38 +02:00
parent d19b3f609e
commit df1626b7dc
11 changed files with 1098 additions and 1106 deletions
--- a/internal/php5/php5.go
+++ b/internal/php5/php5.go
--- a/internal/php5/php5.y
+++ b/internal/php5/php5.y
@@ -267,10 +267,13 @@ import (
 start:
        top_statement_list
            {
-                yylex.(*Parser).rootNode = &ast.Root{ast.Node{}, $1}
-                yylex.(*Parser).rootNode.GetNode().Position = position.NewNodeListPosition($1)
-
-                yylex.(*Parser).setFreeFloating(yylex.(*Parser).rootNode, token.End, yylex.(*Parser).currentToken.SkippedTokens)
+                yylex.(*Parser).rootNode = &ast.Root{
+                    Node: ast.Node{
+                        Position: position.NewNodeListPosition($1),
+                    },
+                    Stmts:  $1,
+                    EndTkn: yylex.(*Parser).currentToken,
+                }
            }
 ;