diff --git a/internal/php5/parser.go b/internal/php5/parser.go index fe3e295..19702d0 100644 --- a/internal/php5/parser.go +++ b/internal/php5/parser.go @@ -4,7 +4,6 @@ import ( "bytes" "fmt" - "github.com/z7zmey/php-parser/internal/positionbuilder" "github.com/z7zmey/php-parser/internal/scanner" "github.com/z7zmey/php-parser/pkg/ast" "github.com/z7zmey/php-parser/pkg/errors" @@ -13,12 +12,11 @@ import ( // Parser structure type Parser struct { - Lexer *scanner.Lexer - currentToken *scanner.Token - positionBuilder *positionbuilder.PositionBuilder - rootNode ast.Vertex - errors []*errors.Error - withTokens bool + Lexer *scanner.Lexer + currentToken *scanner.Token + rootNode ast.Vertex + errors []*errors.Error + withTokens bool } // NewParser creates and returns new Parser @@ -66,7 +64,6 @@ func (p *Parser) Parse() int { // init p.errors = nil p.rootNode = nil - p.positionBuilder = &positionbuilder.PositionBuilder{} // parse diff --git a/internal/php5/php5.go b/internal/php5/php5.go index a087602..22e8d54 100644 Binary files a/internal/php5/php5.go and b/internal/php5/php5.go differ diff --git a/internal/php5/php5.y b/internal/php5/php5.y index cb70cfe..7b05f37 100644 --- a/internal/php5/php5.y +++ b/internal/php5/php5.y @@ -5,9 +5,10 @@ import ( "bytes" "strconv" - "github.com/z7zmey/php-parser/pkg/token" - "github.com/z7zmey/php-parser/internal/scanner" - "github.com/z7zmey/php-parser/pkg/ast" + "github.com/z7zmey/php-parser/internal/position" + "github.com/z7zmey/php-parser/internal/scanner" + "github.com/z7zmey/php-parser/pkg/ast" + "github.com/z7zmey/php-parser/pkg/token" ) %} @@ -275,7 +276,7 @@ start: top_statement_list { yylex.(*Parser).rootNode = &ast.Root{ast.Node{}, $1} - yylex.(*Parser).rootNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) + yylex.(*Parser).rootNode.GetNode().Position = position.NewNodeListPosition($1) yylex.(*Parser).setFreeFloating(yylex.(*Parser).rootNode, token.End, yylex.(*Parser).currentToken.Hidden) @@ -312,7 +313,7 @@ namespace_name: $$ = []ast.Vertex{namePart} // save position - namePart.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + namePart.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating(namePart, token.Start, $1.Hidden) @@ -325,7 +326,7 @@ namespace_name: $$ = append($1, namePart) // save position - namePart.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) + namePart.GetNode().Position = position.NewTokenPosition($3) // save comments yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) @@ -366,7 +367,7 @@ top_statement: $$ = &ast.StmtHaltCompiler{ast.Node{}, } // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -383,8 +384,8 @@ top_statement: $$ = &ast.StmtNamespace{ast.Node{}, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + name.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -400,8 +401,8 @@ top_statement: $$ = &ast.StmtNamespace{ast.Node{}, name, $4} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $5) + name.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $5) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -416,7 +417,7 @@ top_statement: $$ = &ast.StmtNamespace{ast.Node{}, nil, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -430,7 +431,7 @@ top_statement: $$ = &ast.StmtUseList{ast.Node{}, nil, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -445,8 +446,8 @@ top_statement: $$ = &ast.StmtUseList{ast.Node{}, useType, $3} // save position - useType.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + useType.GetNode().Position = position.NewTokenPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -462,8 +463,8 @@ top_statement: $$ = &ast.StmtUseList{ast.Node{}, useType, $3} // save position - useType.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + useType.GetNode().Position = position.NewTokenPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -478,7 +479,7 @@ top_statement: $$ = $1 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $2) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Stmts, $2.Hidden) @@ -513,8 +514,8 @@ use_declaration: $$ = &ast.StmtUse{ast.Node{}, nil, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) + name.GetNode().Position = position.NewNodeListPosition($1) + $$.GetNode().Position = position.NewNodeListPosition($1) // save comments yylex.(*Parser).MoveFreeFloating($1[0], $$) @@ -528,9 +529,9 @@ use_declaration: $$ = &ast.StmtUse{ast.Node{}, nil, name, alias} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($1, $3) + name.GetNode().Position = position.NewNodeListPosition($1) + alias.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewNodeListTokenPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1[0], $$) @@ -545,8 +546,8 @@ use_declaration: $$ = &ast.StmtUse{ast.Node{}, nil, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) + name.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewNodeListPosition($2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -562,9 +563,9 @@ use_declaration: $$ = &ast.StmtUse{ast.Node{}, nil, name, alias} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($2, $4) + name.GetNode().Position = position.NewNodeListPosition($2) + alias.GetNode().Position = position.NewTokenPosition($4) + $$.GetNode().Position = position.NewNodeListTokenPosition($2, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -602,8 +603,8 @@ use_function_declaration: $$ = &ast.StmtUse{ast.Node{}, nil, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) + name.GetNode().Position = position.NewNodeListPosition($1) + $$.GetNode().Position = position.NewNodeListPosition($1) // save comments yylex.(*Parser).MoveFreeFloating($1[0], $$) @@ -617,9 +618,9 @@ use_function_declaration: $$ = &ast.StmtUse{ast.Node{}, nil, name, alias} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($1, $3) + name.GetNode().Position = position.NewNodeListPosition($1) + alias.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewNodeListTokenPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1[0], $$) @@ -634,8 +635,8 @@ use_function_declaration: $$ = &ast.StmtUse{ast.Node{}, nil, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) + name.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewNodeListPosition($2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -651,9 +652,9 @@ use_function_declaration: $$ = &ast.StmtUse{ast.Node{}, nil, name, alias} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($2, $4) + name.GetNode().Position = position.NewNodeListPosition($2) + alias.GetNode().Position = position.NewTokenPosition($4) + $$.GetNode().Position = position.NewNodeListTokenPosition($2, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -691,8 +692,8 @@ use_const_declaration: $$ = &ast.StmtUse{ast.Node{}, nil, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) + name.GetNode().Position = position.NewNodeListPosition($1) + $$.GetNode().Position = position.NewNodeListPosition($1) // save comments yylex.(*Parser).MoveFreeFloating($1[0], $$) @@ -706,9 +707,9 @@ use_const_declaration: $$ = &ast.StmtUse{ast.Node{}, nil, name, alias} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($1, $3) + name.GetNode().Position = position.NewNodeListPosition($1) + alias.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewNodeListTokenPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1[0], $$) @@ -723,8 +724,8 @@ use_const_declaration: $$ = &ast.StmtUse{ast.Node{}, nil, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) + name.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewNodeListPosition($2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -740,9 +741,9 @@ use_const_declaration: $$ = &ast.StmtUse{ast.Node{}, nil, name, alias} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($2, $4) + name.GetNode().Position = position.NewNodeListPosition($2) + alias.GetNode().Position = position.NewTokenPosition($4) + $$.GetNode().Position = position.NewNodeListTokenPosition($2, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -766,9 +767,9 @@ constant_declaration: $$ = $1 // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - constant.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($3, $5) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeNodeListPosition($1, constList.Consts) + name.GetNode().Position = position.NewTokenPosition($3) + constant.GetNode().Position = position.NewTokenNodePosition($3, $5) + $$.GetNode().Position = position.NewNodeNodeListPosition($1, constList.Consts) // save comments yylex.(*Parser).setFreeFloating(lastConst, token.End, $2.Hidden) @@ -785,9 +786,9 @@ constant_declaration: $$ = &ast.StmtConstList{ast.Node{}, constList} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - constant.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($2, $4) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, constList) + name.GetNode().Position = position.NewTokenPosition($2) + constant.GetNode().Position = position.NewTokenNodePosition($2, $4) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, constList) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -852,7 +853,7 @@ inner_statement: $$ = &ast.StmtHaltCompiler{ast.Node{}, } // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -879,8 +880,8 @@ statement: $$ = &ast.StmtLabel{ast.Node{}, label} // save position - label.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + label.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -896,7 +897,7 @@ unticked_statement: $$ = &ast.StmtStmtList{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -910,11 +911,11 @@ unticked_statement: // save position if $5 != nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $5) + $$.GetNode().Position = position.NewTokenNodePosition($1, $5) } else if len($4) > 0 { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $4) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $4) } else { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3) + $$.GetNode().Position = position.NewTokenNodePosition($1, $3) } // save comments @@ -934,8 +935,8 @@ unticked_statement: $$ = &ast.StmtAltIf{ast.Node{}, $2, stmts, $5, $6} // save position - stmts.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($4) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $8) + stmts.GetNode().Position = position.NewNodeListPosition($4) + $$.GetNode().Position = position.NewTokensPosition($1, $8) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -964,7 +965,7 @@ unticked_statement: $$ = $3 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3) + $$.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -982,7 +983,7 @@ unticked_statement: $$ = &ast.StmtDo{ast.Node{}, $2, $4} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $5) + $$.GetNode().Position = position.NewTokensPosition($1, $5) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1014,7 +1015,7 @@ unticked_statement: $$ = $9 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $9) + $$.GetNode().Position = position.NewTokenNodePosition($1, $9) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1039,7 +1040,7 @@ unticked_statement: $$ = $3 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3) + $$.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1057,7 +1058,7 @@ unticked_statement: $$ = &ast.StmtBreak{ast.Node{}, nil} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1071,7 +1072,7 @@ unticked_statement: $$ = &ast.StmtBreak{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1085,7 +1086,7 @@ unticked_statement: $$ = &ast.StmtContinue{ast.Node{}, nil} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1099,7 +1100,7 @@ unticked_statement: $$ = &ast.StmtContinue{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1113,7 +1114,7 @@ unticked_statement: $$ = &ast.StmtReturn{ast.Node{}, nil} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1127,7 +1128,7 @@ unticked_statement: $$ = &ast.StmtReturn{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1141,7 +1142,7 @@ unticked_statement: $$ = &ast.StmtReturn{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1155,7 +1156,7 @@ unticked_statement: $$ = &ast.StmtExpression{ast.Node{}, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $2) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $2) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -1169,7 +1170,7 @@ unticked_statement: $$ = &ast.StmtGlobal{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1183,7 +1184,7 @@ unticked_statement: $$ = &ast.StmtStatic{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1197,7 +1198,7 @@ unticked_statement: $$ = &ast.StmtEcho{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1212,7 +1213,7 @@ unticked_statement: $$ = &ast.StmtInlineHtml{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1224,7 +1225,7 @@ unticked_statement: $$ = &ast.StmtExpression{ast.Node{}, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $2) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $2) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -1238,7 +1239,7 @@ unticked_statement: $$ = &ast.StmtUnset{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $5) + $$.GetNode().Position = position.NewTokensPosition($1, $5) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1276,7 +1277,7 @@ unticked_statement: $$ = $8 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $8) + $$.GetNode().Position = position.NewTokenNodePosition($1, $8) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1316,7 +1317,7 @@ unticked_statement: // save position $$ = $8 - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $8) + $$.GetNode().Position = position.NewTokenNodePosition($1, $8) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1335,7 +1336,7 @@ unticked_statement: $$.(*ast.StmtDeclare).Consts = $3 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $5) + $$.GetNode().Position = position.NewTokenNodePosition($1, $5) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1349,7 +1350,7 @@ unticked_statement: $$ = &ast.StmtNop{ast.Node{}, } // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1363,9 +1364,9 @@ unticked_statement: // save position if $6 == nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $5) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $5) } else { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $6) + $$.GetNode().Position = position.NewTokenNodePosition($1, $6) } // save comments @@ -1380,7 +1381,7 @@ unticked_statement: $$ = &ast.StmtThrow{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1395,8 +1396,8 @@ unticked_statement: $$ = &ast.StmtGoto{ast.Node{}, label} // save position - label.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + label.GetNode().Position = position.NewTokenPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1423,9 +1424,9 @@ catch_statement: $$ = append([]ast.Vertex{catchNode}, $9...) // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) - catchNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $8) + identifier.GetNode().Position = position.NewTokenPosition($4) + variable.GetNode().Position = position.NewTokenPosition($4) + catchNode.GetNode().Position = position.NewTokensPosition($1, $8) // save comments yylex.(*Parser).setFreeFloating(catchNode, token.Start, $1.Hidden) @@ -1452,7 +1453,7 @@ finally_statement: $$ = &ast.StmtFinally{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1501,9 +1502,9 @@ additional_catch: $$ = &ast.StmtCatch{ast.Node{}, []ast.Vertex{$3}, variable, $7} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $8) + identifier.GetNode().Position = position.NewTokenPosition($4) + variable.GetNode().Position = position.NewTokenPosition($4) + $$.GetNode().Position = position.NewTokensPosition($1, $8) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1592,8 +1593,8 @@ unticked_function_declaration_statement: $$ = &ast.StmtFunction{ast.Node{}, $2 != nil, name, $5, nil, $8} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $9) + name.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewTokensPosition($1, $9) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1631,8 +1632,8 @@ unticked_class_declaration_statement: $$ = $1 // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $7) + name.GetNode().Position = position.NewTokenPosition($2) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $7) // save comments yylex.(*Parser).setFreeFloating(name, token.Start, $2.Hidden) @@ -1647,8 +1648,8 @@ unticked_class_declaration_statement: $$ = &ast.StmtInterface{ast.Node{}, name, $3, $5} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $6) + name.GetNode().Position = position.NewTokenPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $6) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1667,7 +1668,7 @@ class_entry_type: $$ = &ast.StmtClass{ast.Node{}, nil, nil, nil, nil, nil, nil} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1680,8 +1681,8 @@ class_entry_type: $$ = &ast.StmtClass{ast.Node{}, nil, []ast.Vertex{classModifier}, nil, nil, nil, nil} // save position - classModifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + classModifier.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1694,7 +1695,7 @@ class_entry_type: $$ = &ast.StmtTrait{ast.Node{}, nil, nil} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1707,8 +1708,8 @@ class_entry_type: $$ = &ast.StmtClass{ast.Node{}, nil, []ast.Vertex{classModifier}, nil, nil, nil, nil} // save position - classModifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + classModifier.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1730,7 +1731,7 @@ extends_from: $$ = &ast.StmtClassExtends{ast.Node{}, $2}; // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1758,7 +1759,7 @@ interface_extends_list: $$ = &ast.StmtInterfaceExtends{ast.Node{}, $2}; // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1779,7 +1780,7 @@ implements_list: $$ = &ast.StmtClassImplements{ast.Node{}, $2}; // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1836,7 +1837,7 @@ foreach_variable: $$ = &ast.ExprReference{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1848,7 +1849,7 @@ foreach_variable: $$ = &ast.ExprList{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1865,7 +1866,7 @@ for_statement: $$ = &ast.StmtFor{ast.Node{}, nil, nil, nil, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + $$.GetNode().Position = position.NewNodePosition($1) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1875,8 +1876,8 @@ for_statement: $$ = &ast.StmtAltFor{ast.Node{}, nil, nil, nil, stmtList} // save position - stmtList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + stmtList.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) @@ -1894,7 +1895,7 @@ foreach_statement: $$ = &ast.StmtForeach{ast.Node{}, nil, nil, nil, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + $$.GetNode().Position = position.NewNodePosition($1) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1904,8 +1905,8 @@ foreach_statement: $$ = &ast.StmtAltForeach{ast.Node{}, nil, nil, nil, stmtList} // save position - stmtList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + stmtList.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) @@ -1924,7 +1925,7 @@ declare_statement: $$ = &ast.StmtDeclare{ast.Node{}, false, nil, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + $$.GetNode().Position = position.NewNodePosition($1) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1934,8 +1935,8 @@ declare_statement: $$ = &ast.StmtDeclare{ast.Node{}, true, nil, stmtList} // save position - stmtList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + stmtList.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) @@ -1956,8 +1957,8 @@ declare_list: $$ = []ast.Vertex{constant} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - constant.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3) + name.GetNode().Position = position.NewTokenPosition($1) + constant.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments yylex.(*Parser).setFreeFloating(constant, token.Start, $1.Hidden) @@ -1972,8 +1973,8 @@ declare_list: $$ = append($1, constant) // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - constant.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($3, $5) + name.GetNode().Position = position.NewTokenPosition($3) + constant.GetNode().Position = position.NewTokenNodePosition($3, $5) // save comments yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) @@ -1992,8 +1993,8 @@ switch_case_list: $$ = &ast.StmtSwitch{ast.Node{}, nil, caseList} // save position - caseList.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + caseList.GetNode().Position = position.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.Hidden) @@ -2007,8 +2008,8 @@ switch_case_list: $$ = &ast.StmtSwitch{ast.Node{}, nil, caseList} // save position - caseList.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + caseList.GetNode().Position = position.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.Hidden) @@ -2023,8 +2024,8 @@ switch_case_list: $$ = &ast.StmtAltSwitch{ast.Node{}, nil, caseList} // save position - caseList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + caseList.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) @@ -2041,8 +2042,8 @@ switch_case_list: $$ = &ast.StmtAltSwitch{ast.Node{}, nil, caseList} // save position - caseList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $5) + caseList.GetNode().Position = position.NewNodeListPosition($3) + $$.GetNode().Position = position.NewTokensPosition($1, $5) // save comments yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) @@ -2069,7 +2070,7 @@ case_list: $$ = append($1, _case) // save position - _case.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($2, $5) + _case.GetNode().Position = position.NewTokenNodeListPosition($2, $5) // save comments yylex.(*Parser).setFreeFloating(_case, token.Start, $2.Hidden) @@ -2084,7 +2085,7 @@ case_list: $$ = append($1, _default) // save position - _default.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($2, $4) + _default.GetNode().Position = position.NewTokenNodeListPosition($2, $4) // save comments yylex.(*Parser).setFreeFloating(_default, token.Start, $2.Hidden) @@ -2114,7 +2115,7 @@ while_statement: $$ = &ast.StmtWhile{ast.Node{}, nil, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + $$.GetNode().Position = position.NewNodePosition($1) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2124,8 +2125,8 @@ while_statement: $$ = &ast.StmtAltWhile{ast.Node{}, nil, stmtList} // save position - stmtList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + stmtList.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) @@ -2152,7 +2153,7 @@ elseif_list: $$ = append($1, _elseIf) // save position - _elseIf.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($2, $4) + _elseIf.GetNode().Position = position.NewTokenNodePosition($2, $4) // save comments yylex.(*Parser).setFreeFloating(_elseIf, token.Start, $2.Hidden) @@ -2182,8 +2183,8 @@ new_elseif_list: $$ = append($1, _elseIf) // save position - stmts.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($5) - _elseIf.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($2, $5) + stmts.GetNode().Position = position.NewNodeListPosition($5) + _elseIf.GetNode().Position = position.NewTokenNodeListPosition($2, $5) // save comments yylex.(*Parser).setFreeFloating(_elseIf, token.Start, $2.Hidden) @@ -2212,7 +2213,7 @@ else_single: $$ = &ast.StmtElse{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2235,8 +2236,8 @@ new_else_single: $$ = &ast.StmtAltElse{ast.Node{}, stmts} // save position - stmts.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $3) + stmts.GetNode().Position = position.NewNodeListPosition($3) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2288,16 +2289,16 @@ parameter: $$ = &ast.Parameter{ast.Node{}, $2 != nil, $3 != nil, $1, variable, nil} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) + identifier.GetNode().Position = position.NewTokenPosition($4) + variable.GetNode().Position = position.NewTokenPosition($4) if $1 != nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) } else if $2 != nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($2, $4) + $$.GetNode().Position = position.NewTokensPosition($2, $4) } else if $3 != nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($3, $4) + $$.GetNode().Position = position.NewTokensPosition($3, $4) } else { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) + $$.GetNode().Position = position.NewTokenPosition($4) } // save comments @@ -2333,16 +2334,16 @@ parameter: $$ = &ast.Parameter{ast.Node{}, $2 != nil, $3 != nil, $1, variable, $6} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) + identifier.GetNode().Position = position.NewTokenPosition($4) + variable.GetNode().Position = position.NewTokenPosition($4) if $1 != nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $6) + $$.GetNode().Position = position.NewNodesPosition($1, $6) } else if $2 != nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($2, $6) + $$.GetNode().Position = position.NewTokenNodePosition($2, $6) } else if $3 != nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($3, $6) + $$.GetNode().Position = position.NewTokenNodePosition($3, $6) } else { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($4, $6) + $$.GetNode().Position = position.NewTokenNodePosition($4, $6) } // save comments @@ -2387,7 +2388,7 @@ optional_class_type: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2399,7 +2400,7 @@ optional_class_type: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2421,7 +2422,7 @@ function_call_parameter_list: $$ = &ast.ArgumentList{ast.Node{}, nil} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2434,7 +2435,7 @@ function_call_parameter_list: $$ = &ast.ArgumentList{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2448,8 +2449,8 @@ function_call_parameter_list: $$ = &ast.ArgumentList{ast.Node{}, []ast.Vertex{arg}} // save position - arg.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + arg.GetNode().Position = position.NewNodePosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2484,7 +2485,7 @@ function_call_parameter: $$ = &ast.Argument{ast.Node{}, false, false, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + $$.GetNode().Position = position.NewNodePosition($1) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -2496,7 +2497,7 @@ function_call_parameter: $$ = &ast.Argument{ast.Node{}, false, false, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + $$.GetNode().Position = position.NewNodePosition($1) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -2508,7 +2509,7 @@ function_call_parameter: $$ = &ast.Argument{ast.Node{}, false, true, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($2) + $$.GetNode().Position = position.NewNodePosition($2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2520,7 +2521,7 @@ function_call_parameter: $$ = &ast.Argument{ast.Node{}, true, false, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2555,8 +2556,8 @@ global_var: $$ = &ast.ExprVariable{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + name.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2569,7 +2570,7 @@ global_var: $$ = &ast.ExprVariable{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2582,7 +2583,7 @@ global_var: $$ = &ast.ExprVariable{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2604,9 +2605,9 @@ static_var_list: $$ = append($1, staticVar) // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - staticVar.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) + identifier.GetNode().Position = position.NewTokenPosition($3) + variable.GetNode().Position = position.NewTokenPosition($3) + staticVar.GetNode().Position = position.NewTokenPosition($3) // save comments yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) @@ -2623,9 +2624,9 @@ static_var_list: $$ = append($1, staticVar) // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - staticVar.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($3, $5) + identifier.GetNode().Position = position.NewTokenPosition($3) + variable.GetNode().Position = position.NewTokenPosition($3) + staticVar.GetNode().Position = position.NewTokenNodePosition($3, $5) // save comments yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) @@ -2643,9 +2644,9 @@ static_var_list: $$ = []ast.Vertex{staticVar} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - staticVar.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + identifier.GetNode().Position = position.NewTokenPosition($1) + variable.GetNode().Position = position.NewTokenPosition($1) + staticVar.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).addDollarToken(variable) @@ -2661,9 +2662,9 @@ static_var_list: $$ = []ast.Vertex{staticVar} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - staticVar.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3) + identifier.GetNode().Position = position.NewTokenPosition($1) + variable.GetNode().Position = position.NewTokenPosition($1) + staticVar.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments yylex.(*Parser).addDollarToken(variable) @@ -2697,7 +2698,7 @@ class_statement: $$ = &ast.StmtPropertyList{ast.Node{}, $1, nil, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($1, $3) + $$.GetNode().Position = position.NewNodeListTokenPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1[0], $$) @@ -2711,7 +2712,7 @@ class_statement: $$ = $1 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $2) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.ConstList, $2.Hidden) @@ -2731,11 +2732,11 @@ class_statement: $$ = &ast.StmtClassMethod{ast.Node{}, $3 != nil, name, $1, $6, nil, $8} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) + name.GetNode().Position = position.NewTokenPosition($4) if $1 == nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($2, $8) + $$.GetNode().Position = position.NewTokenNodePosition($2, $8) } else { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListNodePosition($1, $8) + $$.GetNode().Position = position.NewNodeListNodePosition($1, $8) } // save comments @@ -2764,7 +2765,7 @@ trait_use_statement: $$ = &ast.StmtTraitUse{ast.Node{}, $2, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3) + $$.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2796,7 +2797,7 @@ trait_adaptations: { $$ = &ast.StmtNop{ast.Node{}, } - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2808,7 +2809,7 @@ trait_adaptations: { $$ = &ast.StmtTraitAdaptationList{ast.Node{}, $2} - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2877,7 +2878,7 @@ trait_precedence: $$ = &ast.StmtTraitUsePrecedence{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeNodeListPosition($1, $3) + $$.GetNode().Position = position.NewNodeNodeListPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -2912,8 +2913,8 @@ trait_method_reference: $$ = &ast.StmtTraitMethodRef{ast.Node{}, nil, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + name.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2935,8 +2936,8 @@ trait_method_reference_fully_qualified: $$ = &ast.StmtTraitMethodRef{ast.Node{}, $1, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $3) + target.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -2954,8 +2955,8 @@ trait_alias: $$ = &ast.StmtTraitUseAlias{ast.Node{}, $1, $3, alias} // save position - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + alias.GetNode().Position = position.NewTokenPosition($4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -2969,7 +2970,7 @@ trait_alias: $$ = &ast.StmtTraitUseAlias{ast.Node{}, $1, $3, nil} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3000,7 +3001,7 @@ method_body: $$ = &ast.StmtNop{ast.Node{}, } // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3013,7 +3014,7 @@ method_body: $$ = &ast.StmtStmtList{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3036,7 +3037,7 @@ variable_modifiers: $$ = []ast.Vertex{modifier} // save position - modifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + modifier.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating(modifier, token.Start, $1.Hidden) @@ -3081,7 +3082,7 @@ member_modifier: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3093,7 +3094,7 @@ member_modifier: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3105,7 +3106,7 @@ member_modifier: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3117,7 +3118,7 @@ member_modifier: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3129,7 +3130,7 @@ member_modifier: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3141,7 +3142,7 @@ member_modifier: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3159,9 +3160,9 @@ class_variable_declaration: $$ = append($1, property) // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - property.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) + identifier.GetNode().Position = position.NewTokenPosition($3) + variable.GetNode().Position = position.NewTokenPosition($3) + property.GetNode().Position = position.NewTokenPosition($3) // save comments yylex.(*Parser).addDollarToken(variable) @@ -3178,9 +3179,9 @@ class_variable_declaration: $$ = append($1, property) // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - property.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($3, $5) + identifier.GetNode().Position = position.NewTokenPosition($3) + variable.GetNode().Position = position.NewTokenPosition($3) + property.GetNode().Position = position.NewTokenNodePosition($3, $5) // save comments yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) @@ -3198,9 +3199,9 @@ class_variable_declaration: $$ = []ast.Vertex{property} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - property.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + identifier.GetNode().Position = position.NewTokenPosition($1) + variable.GetNode().Position = position.NewTokenPosition($1) + property.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).addDollarToken(variable) @@ -3216,9 +3217,9 @@ class_variable_declaration: $$ = []ast.Vertex{property} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - property.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3) + identifier.GetNode().Position = position.NewTokenPosition($1) + variable.GetNode().Position = position.NewTokenPosition($1) + property.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments yylex.(*Parser).addDollarToken(variable) @@ -3240,9 +3241,9 @@ class_constant_declaration: $$ = $1 // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - constant.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($3, $5) - $1.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $5) + name.GetNode().Position = position.NewTokenPosition($3) + constant.GetNode().Position = position.NewTokenNodePosition($3, $5) + $1.GetNode().Position = position.NewNodesPosition($1, $5) // save comments yylex.(*Parser).setFreeFloating(lastConst, token.End, $2.Hidden) @@ -3258,9 +3259,9 @@ class_constant_declaration: $$ = &ast.StmtClassConstList{ast.Node{}, nil, []ast.Vertex{constant}} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - constant.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($2, $4) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $4) + name.GetNode().Position = position.NewTokenPosition($2) + constant.GetNode().Position = position.NewTokenNodePosition($2, $4) + $$.GetNode().Position = position.NewTokenNodePosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3345,7 +3346,7 @@ chaining_dereference: $$ = append($1, fetch) // save position - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($3) + fetch.GetNode().Position = position.NewNodePosition($3) // save comments yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) @@ -3359,7 +3360,7 @@ chaining_dereference: $$ = []ast.Vertex{fetch} // save position - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($2) + fetch.GetNode().Position = position.NewNodePosition($2) // save comments yylex.(*Parser).setFreeFloating(fetch, token.Var, append($1.Hidden, yylex.(*Parser).GetFreeFloatingToken($1)...)) @@ -3411,10 +3412,10 @@ new_expr: if $3 != nil { $$ = &ast.ExprNew{ast.Node{}, $2, $3.(*ast.ArgumentList)} - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3) + $$.GetNode().Position = position.NewTokenNodePosition($1, $3) } else { $$ = &ast.ExprNew{ast.Node{}, $2, nil} - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) } // save comments @@ -3431,8 +3432,8 @@ expr_without_variable: $$ = &ast.ExprAssign{ast.Node{}, listNode, $6} // save position - listNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $6) + listNode.GetNode().Position = position.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokenNodePosition($1, $6) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3447,7 +3448,7 @@ expr_without_variable: $$ = &ast.ExprAssign{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3460,7 +3461,7 @@ expr_without_variable: $$ = &ast.ExprAssignReference{ast.Node{}, $1, $4} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $4) + $$.GetNode().Position = position.NewNodesPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3482,11 +3483,11 @@ expr_without_variable: // save position if $6 != nil { - _new.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($4, $6) + _new.GetNode().Position = position.NewTokenNodePosition($4, $6) } else { - _new.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($4, $5) + _new.GetNode().Position = position.NewTokenNodePosition($4, $5) } - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, _new) + $$.GetNode().Position = position.NewNodesPosition($1, _new) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3501,7 +3502,7 @@ expr_without_variable: $$ = &ast.ExprClone{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3513,7 +3514,7 @@ expr_without_variable: $$ = &ast.ExprAssignPlus{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) yylex.(*Parser).MoveFreeFloating($1, $$) yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) @@ -3525,7 +3526,7 @@ expr_without_variable: $$ = &ast.ExprAssignMinus{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3538,7 +3539,7 @@ expr_without_variable: $$ = &ast.ExprAssignMul{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3551,7 +3552,7 @@ expr_without_variable: $$ = &ast.ExprAssignPow{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3564,7 +3565,7 @@ expr_without_variable: $$ = &ast.ExprAssignDiv{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3577,7 +3578,7 @@ expr_without_variable: $$ = &ast.ExprAssignConcat{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3590,7 +3591,7 @@ expr_without_variable: $$ = &ast.ExprAssignMod{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3603,7 +3604,7 @@ expr_without_variable: $$ = &ast.ExprAssignBitwiseAnd{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3616,7 +3617,7 @@ expr_without_variable: $$ = &ast.ExprAssignBitwiseOr{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3629,7 +3630,7 @@ expr_without_variable: $$ = &ast.ExprAssignBitwiseXor{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3642,7 +3643,7 @@ expr_without_variable: $$ = &ast.ExprAssignShiftLeft{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3655,7 +3656,7 @@ expr_without_variable: $$ = &ast.ExprAssignShiftRight{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3668,7 +3669,7 @@ expr_without_variable: $$ = &ast.ExprPostInc{ast.Node{}, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $2) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $2) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3681,7 +3682,7 @@ expr_without_variable: $$ = &ast.ExprPreInc{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3693,7 +3694,7 @@ expr_without_variable: $$ = &ast.ExprPostDec{ast.Node{}, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $2) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $2) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3706,7 +3707,7 @@ expr_without_variable: $$ = &ast.ExprPreDec{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3718,7 +3719,7 @@ expr_without_variable: $$ = &ast.ExprBinaryBooleanOr{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3731,7 +3732,7 @@ expr_without_variable: $$ = &ast.ExprBinaryBooleanAnd{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3744,7 +3745,7 @@ expr_without_variable: $$ = &ast.ExprBinaryLogicalOr{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3757,7 +3758,7 @@ expr_without_variable: $$ = &ast.ExprBinaryLogicalAnd{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3770,7 +3771,7 @@ expr_without_variable: $$ = &ast.ExprBinaryLogicalXor{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3783,7 +3784,7 @@ expr_without_variable: $$ = &ast.ExprBinaryBitwiseOr{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3796,7 +3797,7 @@ expr_without_variable: $$ = &ast.ExprBinaryBitwiseAnd{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3809,7 +3810,7 @@ expr_without_variable: $$ = &ast.ExprBinaryBitwiseXor{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3822,7 +3823,7 @@ expr_without_variable: $$ = &ast.ExprBinaryConcat{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3835,7 +3836,7 @@ expr_without_variable: $$ = &ast.ExprBinaryPlus{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3848,7 +3849,7 @@ expr_without_variable: $$ = &ast.ExprBinaryMinus{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3861,7 +3862,7 @@ expr_without_variable: $$ = &ast.ExprBinaryMul{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3874,7 +3875,7 @@ expr_without_variable: $$ = &ast.ExprBinaryPow{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3887,7 +3888,7 @@ expr_without_variable: $$ = &ast.ExprBinaryDiv{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3900,7 +3901,7 @@ expr_without_variable: $$ = &ast.ExprBinaryMod{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3913,7 +3914,7 @@ expr_without_variable: $$ = &ast.ExprBinaryShiftLeft{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3926,7 +3927,7 @@ expr_without_variable: $$ = &ast.ExprBinaryShiftRight{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3939,7 +3940,7 @@ expr_without_variable: $$ = &ast.ExprUnaryPlus{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3951,7 +3952,7 @@ expr_without_variable: $$ = &ast.ExprUnaryMinus{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3963,7 +3964,7 @@ expr_without_variable: $$ = &ast.ExprBooleanNot{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3975,7 +3976,7 @@ expr_without_variable: $$ = &ast.ExprBitwiseNot{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3987,7 +3988,7 @@ expr_without_variable: $$ = &ast.ExprBinaryIdentical{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4000,7 +4001,7 @@ expr_without_variable: $$ = &ast.ExprBinaryNotIdentical{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4013,7 +4014,7 @@ expr_without_variable: $$ = &ast.ExprBinaryEqual{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4026,7 +4027,7 @@ expr_without_variable: $$ = &ast.ExprBinaryNotEqual{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4040,7 +4041,7 @@ expr_without_variable: $$ = &ast.ExprBinarySmaller{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4053,7 +4054,7 @@ expr_without_variable: $$ = &ast.ExprBinarySmallerOrEqual{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4066,7 +4067,7 @@ expr_without_variable: $$ = &ast.ExprBinaryGreater{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4079,7 +4080,7 @@ expr_without_variable: $$ = &ast.ExprBinaryGreaterOrEqual{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4092,7 +4093,7 @@ expr_without_variable: $$ = &ast.ExprInstanceOf{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4142,7 +4143,7 @@ expr_without_variable: } // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($$, n) + $$.GetNode().Position = position.NewNodesPosition($$, n) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -4152,7 +4153,7 @@ expr_without_variable: $$ = &ast.ExprTernary{ast.Node{}, $1, $3, $5} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $5) + $$.GetNode().Position = position.NewNodesPosition($1, $5) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4166,7 +4167,7 @@ expr_without_variable: $$ = &ast.ExprTernary{ast.Node{}, $1, nil, $4} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $4) + $$.GetNode().Position = position.NewNodesPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4186,7 +4187,7 @@ expr_without_variable: $$ = &ast.ExprCastInt{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4199,7 +4200,7 @@ expr_without_variable: $$ = &ast.ExprCastDouble{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4212,7 +4213,7 @@ expr_without_variable: $$ = &ast.ExprCastString{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4225,7 +4226,7 @@ expr_without_variable: $$ = &ast.ExprCastArray{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4238,7 +4239,7 @@ expr_without_variable: $$ = &ast.ExprCastObject{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4251,7 +4252,7 @@ expr_without_variable: $$ = &ast.ExprCastBool{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4264,7 +4265,7 @@ expr_without_variable: $$ = &ast.ExprCastUnset{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4283,9 +4284,9 @@ expr_without_variable: // save position if $2.GetNode().Position == nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) } else { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) } // save comments @@ -4298,7 +4299,7 @@ expr_without_variable: $$ = &ast.ExprErrorSuppress{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4328,7 +4329,7 @@ expr_without_variable: $$ = &ast.ExprShellExec{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4340,7 +4341,7 @@ expr_without_variable: $$ = &ast.ExprPrint{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4352,7 +4353,7 @@ expr_without_variable: $$ = &ast.ExprYield{ast.Node{}, nil, nil} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4364,7 +4365,7 @@ expr_without_variable: $$ = &ast.ExprClosure{ast.Node{}, $2 != nil, false, $4, $6, nil, $8} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $9) + $$.GetNode().Position = position.NewTokensPosition($1, $9) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4390,7 +4391,7 @@ expr_without_variable: $$ = &ast.ExprClosure{ast.Node{}, $3 != nil, true, $5, $7, nil, $9} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $10) + $$.GetNode().Position = position.NewTokensPosition($1, $10) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4420,7 +4421,7 @@ yield_expr: $$ = &ast.ExprYield{ast.Node{}, nil, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4432,7 +4433,7 @@ yield_expr: $$ = &ast.ExprYield{ast.Node{}, nil, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4444,7 +4445,7 @@ yield_expr: $$ = &ast.ExprYield{ast.Node{}, $2, $4} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $4) + $$.GetNode().Position = position.NewTokenNodePosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4457,7 +4458,7 @@ yield_expr: $$ = &ast.ExprYield{ast.Node{}, $2, $4} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $4) + $$.GetNode().Position = position.NewTokenNodePosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4473,7 +4474,7 @@ combined_scalar_offset: $$ = &ast.ExprArrayDimFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4487,7 +4488,7 @@ combined_scalar_offset: $$ = &ast.ExprArrayDimFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4502,8 +4503,8 @@ combined_scalar_offset: $$ = &ast.ExprArrayDimFetch{ast.Node{}, str, $3} // save position - str.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(str, $4) + str.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewNodeTokenPosition(str, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4517,7 +4518,7 @@ combined_scalar_offset: $$ = &ast.ExprArrayDimFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4534,7 +4535,7 @@ combined_scalar: $$ = &ast.ExprArray{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4548,7 +4549,7 @@ combined_scalar: $$ = &ast.ExprShortArray{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4577,7 +4578,7 @@ lexical_vars: $$ = &ast.ExprClosureUse{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4596,8 +4597,8 @@ lexical_var_list: $$ = append($1, variable) // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) + identifier.GetNode().Position = position.NewTokenPosition($3) + variable.GetNode().Position = position.NewTokenPosition($3) // save comments yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) @@ -4614,9 +4615,9 @@ lexical_var_list: $$ = append($1, reference) // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) - reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($3, $4) + identifier.GetNode().Position = position.NewTokenPosition($4) + variable.GetNode().Position = position.NewTokenPosition($4) + reference.GetNode().Position = position.NewTokensPosition($3, $4) // save comments yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) @@ -4633,8 +4634,8 @@ lexical_var_list: $$ = []ast.Vertex{variable} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + identifier.GetNode().Position = position.NewTokenPosition($1) + variable.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating(variable, token.Start, $1.Hidden) @@ -4650,9 +4651,9 @@ lexical_var_list: $$ = []ast.Vertex{reference} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + identifier.GetNode().Position = position.NewTokenPosition($2) + variable.GetNode().Position = position.NewTokenPosition($2) + reference.GetNode().Position = position.NewTokensPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating(reference, token.Start, $1.Hidden) @@ -4670,8 +4671,8 @@ function_call: $$ = &ast.ExprFunctionCall{ast.Node{}, name, $2.(*ast.ArgumentList)} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(name, $2) + name.GetNode().Position = position.NewNodeListPosition($1) + $$.GetNode().Position = position.NewNodesPosition(name, $2) // save comments yylex.(*Parser).MoveFreeFloating($1[0], $$) @@ -4684,8 +4685,8 @@ function_call: $$ = &ast.ExprFunctionCall{ast.Node{}, funcName, $4.(*ast.ArgumentList)} // save position - funcName.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(funcName, $4) + funcName.GetNode().Position = position.NewTokenNodeListPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition(funcName, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4699,8 +4700,8 @@ function_call: $$ = &ast.ExprFunctionCall{ast.Node{}, funcName, $3.(*ast.ArgumentList)} // save position - funcName.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(funcName, $3) + funcName.GetNode().Position = position.NewTokenNodeListPosition($1, $2) + $$.GetNode().Position = position.NewNodesPosition(funcName, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4712,7 +4713,7 @@ function_call: $$ = &ast.ExprStaticCall{ast.Node{}, $1, $3, $4.(*ast.ArgumentList)} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $4) + $$.GetNode().Position = position.NewNodesPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4725,7 +4726,7 @@ function_call: $$ = &ast.ExprStaticCall{ast.Node{}, $1, $3, $4.(*ast.ArgumentList)} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $4) + $$.GetNode().Position = position.NewNodesPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4738,7 +4739,7 @@ function_call: $$ = &ast.ExprStaticCall{ast.Node{}, $1, $3, $4.(*ast.ArgumentList)} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $4) + $$.GetNode().Position = position.NewNodesPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4751,7 +4752,7 @@ function_call: $$ = &ast.ExprStaticCall{ast.Node{}, $1, $3, $4.(*ast.ArgumentList)} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $4) + $$.GetNode().Position = position.NewNodesPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4764,7 +4765,7 @@ function_call: $$ = &ast.ExprFunctionCall{ast.Node{}, $1, $2.(*ast.ArgumentList)} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $2) + $$.GetNode().Position = position.NewNodesPosition($1, $2) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4779,7 +4780,7 @@ class_name: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4791,7 +4792,7 @@ class_name: $$ = &ast.NameName{ast.Node{}, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) + $$.GetNode().Position = position.NewNodeListPosition($1) // save comments yylex.(*Parser).MoveFreeFloating($1[0], $$) @@ -4803,7 +4804,7 @@ class_name: $$ = &ast.NameRelative{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $3) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4816,7 +4817,7 @@ class_name: $$ = &ast.NameFullyQualified{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4831,7 +4832,7 @@ fully_qualified_class_name: $$ = &ast.NameName{ast.Node{}, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) + $$.GetNode().Position = position.NewNodeListPosition($1) // save comments yylex.(*Parser).MoveFreeFloating($1[0], $$) @@ -4843,7 +4844,7 @@ fully_qualified_class_name: $$ = &ast.NameRelative{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $3) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4856,7 +4857,7 @@ fully_qualified_class_name: $$ = &ast.NameFullyQualified{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4892,13 +4893,13 @@ dynamic_class_name_reference: switch nn := n.(type) { case *ast.ExprArrayDimFetch: nn.Var = $$ - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn) + $$.GetNode().Position = position.NewNodesPosition($$, nn) $$ = nn yylex.(*Parser).MoveFreeFloating(nn.Var, $$) case *ast.ExprPropertyFetch: nn.Var = $$ - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn) + $$.GetNode().Position = position.NewNodesPosition($$, nn) $$ = nn yylex.(*Parser).MoveFreeFloating(nn.Var, $$) } @@ -4908,13 +4909,13 @@ dynamic_class_name_reference: switch nn := n.(type) { case *ast.ExprArrayDimFetch: nn.Var = $$ - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn) + $$.GetNode().Position = position.NewNodesPosition($$, nn) $$ = nn yylex.(*Parser).MoveFreeFloating(nn.Var, $$) case *ast.ExprPropertyFetch: nn.Var = $$ - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn) + $$.GetNode().Position = position.NewNodesPosition($$, nn) $$ = nn yylex.(*Parser).MoveFreeFloating(nn.Var, $$) } @@ -4971,7 +4972,7 @@ exit_expr: $$ = &ast.ExprExit{ast.Node{}, false, nil}; // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Exit, append($1.Hidden, yylex.(*Parser).GetFreeFloatingToken($1)...)) @@ -4985,9 +4986,9 @@ exit_expr: // save position if bytes.Compare(yylex.(*Parser).currentToken.Value, []byte(")")) == 0 { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yylex.(*Parser).currentToken) + $$.GetNode().Position = position.NewTokenPosition(yylex.(*Parser).currentToken) } else { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + $$.GetNode().Position = position.NewNodePosition($1) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -5011,7 +5012,7 @@ backticks_expr: $$ = []ast.Vertex{part} // save position - part.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + part.GetNode().Position = position.NewTokenPosition($1) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5044,7 +5045,7 @@ common_scalar: $$ = &ast.ScalarLnumber{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5056,7 +5057,7 @@ common_scalar: $$ = &ast.ScalarDnumber{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5068,7 +5069,7 @@ common_scalar: $$ = &ast.ScalarString{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5080,7 +5081,7 @@ common_scalar: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5092,7 +5093,7 @@ common_scalar: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5104,7 +5105,7 @@ common_scalar: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5116,7 +5117,7 @@ common_scalar: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5128,7 +5129,7 @@ common_scalar: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5140,7 +5141,7 @@ common_scalar: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5152,7 +5153,7 @@ common_scalar: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5165,8 +5166,8 @@ common_scalar: $$ = &ast.ScalarHeredoc{ast.Node{}, $1.Value, []ast.Vertex{encapsed}} // save position - encapsed.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + encapsed.GetNode().Position = position.NewTokenPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5178,7 +5179,7 @@ common_scalar: $$ = &ast.ScalarHeredoc{ast.Node{}, $1.Value, nil} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5194,8 +5195,8 @@ static_class_constant: $$ = &ast.ExprClassConstFetch{ast.Node{}, $1, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $3) + target.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5234,8 +5235,8 @@ static_scalar_value: $$ = &ast.ExprConstFetch{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(name) + name.GetNode().Position = position.NewNodeListPosition($1) + $$.GetNode().Position = position.NewNodePosition(name) // save comments yylex.(*Parser).MoveFreeFloating($1[0], $$) @@ -5248,8 +5249,8 @@ static_scalar_value: $$ = &ast.ExprConstFetch{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $3) + name.GetNode().Position = position.NewTokenNodeListPosition($1, $3) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5263,8 +5264,8 @@ static_scalar_value: $$ = &ast.ExprConstFetch{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2) + name.GetNode().Position = position.NewTokenNodeListPosition($1, $2) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5276,7 +5277,7 @@ static_scalar_value: $$ = &ast.ExprArray{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5290,7 +5291,7 @@ static_scalar_value: $$ = &ast.ExprShortArray{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5309,7 +5310,7 @@ static_scalar_value: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5330,7 +5331,7 @@ static_operation: $$ = &ast.ExprArrayDimFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5344,7 +5345,7 @@ static_operation: $$ = &ast.ExprBinaryPlus{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5357,7 +5358,7 @@ static_operation: $$ = &ast.ExprBinaryMinus{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5370,7 +5371,7 @@ static_operation: $$ = &ast.ExprBinaryMul{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5383,7 +5384,7 @@ static_operation: $$ = &ast.ExprBinaryPow{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5396,7 +5397,7 @@ static_operation: $$ = &ast.ExprBinaryDiv{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5409,7 +5410,7 @@ static_operation: $$ = &ast.ExprBinaryMod{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5422,7 +5423,7 @@ static_operation: $$ = &ast.ExprBooleanNot{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5434,7 +5435,7 @@ static_operation: $$ = &ast.ExprBitwiseNot{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5446,7 +5447,7 @@ static_operation: $$ = &ast.ExprBinaryBitwiseOr{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5459,7 +5460,7 @@ static_operation: $$ = &ast.ExprBinaryBitwiseAnd{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5472,7 +5473,7 @@ static_operation: $$ = &ast.ExprBinaryBitwiseXor{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5485,7 +5486,7 @@ static_operation: $$ = &ast.ExprBinaryShiftLeft{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5498,7 +5499,7 @@ static_operation: $$ = &ast.ExprBinaryShiftRight{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5511,7 +5512,7 @@ static_operation: $$ = &ast.ExprBinaryConcat{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5524,7 +5525,7 @@ static_operation: $$ = &ast.ExprBinaryLogicalXor{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5537,7 +5538,7 @@ static_operation: $$ = &ast.ExprBinaryLogicalAnd{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5550,7 +5551,7 @@ static_operation: $$ = &ast.ExprBinaryLogicalOr{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5563,7 +5564,7 @@ static_operation: $$ = &ast.ExprBinaryBooleanAnd{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5576,7 +5577,7 @@ static_operation: $$ = &ast.ExprBinaryBooleanOr{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5589,7 +5590,7 @@ static_operation: $$ = &ast.ExprBinaryIdentical{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5602,7 +5603,7 @@ static_operation: $$ = &ast.ExprBinaryNotIdentical{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5615,7 +5616,7 @@ static_operation: $$ = &ast.ExprBinaryEqual{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5628,7 +5629,7 @@ static_operation: $$ = &ast.ExprBinaryNotEqual{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5642,7 +5643,7 @@ static_operation: $$ = &ast.ExprBinarySmaller{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5655,7 +5656,7 @@ static_operation: $$ = &ast.ExprBinaryGreater{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5668,7 +5669,7 @@ static_operation: $$ = &ast.ExprBinarySmallerOrEqual{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5681,7 +5682,7 @@ static_operation: $$ = &ast.ExprBinaryGreaterOrEqual{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5694,7 +5695,7 @@ static_operation: $$ = &ast.ExprTernary{ast.Node{}, $1, nil, $4} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $4) + $$.GetNode().Position = position.NewNodesPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5708,7 +5709,7 @@ static_operation: $$ = &ast.ExprTernary{ast.Node{}, $1, $3, $5} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $5) + $$.GetNode().Position = position.NewNodesPosition($1, $5) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5722,7 +5723,7 @@ static_operation: $$ = &ast.ExprUnaryPlus{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5734,7 +5735,7 @@ static_operation: $$ = &ast.ExprUnaryMinus{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5766,8 +5767,8 @@ general_constant: $$ = &ast.ExprConstFetch{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(name) + name.GetNode().Position = position.NewNodeListPosition($1) + $$.GetNode().Position = position.NewNodePosition(name) // save comments yylex.(*Parser).MoveFreeFloating($1[0], $$) @@ -5780,8 +5781,8 @@ general_constant: $$ = &ast.ExprConstFetch{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(name) + name.GetNode().Position = position.NewTokenNodeListPosition($1, $3) + $$.GetNode().Position = position.NewNodePosition(name) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5795,8 +5796,8 @@ general_constant: $$ = &ast.ExprConstFetch{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(name) + name.GetNode().Position = position.NewTokenNodeListPosition($1, $2) + $$.GetNode().Position = position.NewNodePosition(name) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5812,8 +5813,8 @@ scalar: $$ = &ast.ExprVariable{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + name.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5843,7 +5844,7 @@ scalar: $$ = &ast.ScalarEncapsed{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5855,7 +5856,7 @@ scalar: $$ = &ast.ScalarHeredoc{ast.Node{}, $1.Value, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5867,7 +5868,7 @@ scalar: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5914,7 +5915,7 @@ non_empty_static_array_pair_list: $$ = append($1, arrayItem) // save position - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($3, $5) + arrayItem.GetNode().Position = position.NewNodesPosition($3, $5) // save comments yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) @@ -5929,7 +5930,7 @@ non_empty_static_array_pair_list: $$ = append($1, arrayItem) // save position - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($3) + arrayItem.GetNode().Position = position.NewNodePosition($3) // save comments yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) @@ -5943,7 +5944,7 @@ non_empty_static_array_pair_list: $$ = []ast.Vertex{arrayItem} // save position - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + arrayItem.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, arrayItem) @@ -5957,7 +5958,7 @@ non_empty_static_array_pair_list: $$ = []ast.Vertex{arrayItem} // save position - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + arrayItem.GetNode().Position = position.NewNodePosition($1) // save comments yylex.(*Parser).MoveFreeFloating($1, arrayItem) @@ -6062,19 +6063,19 @@ variable: switch nn := n.(type) { case *ast.ExprArrayDimFetch: nn.Var = $$ - nn.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn) + nn.GetNode().Position = position.NewNodesPosition($$, nn) $$ = nn yylex.(*Parser).MoveFreeFloating(nn.Var, $$) case *ast.ExprPropertyFetch: nn.Var = $$ - nn.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn) + nn.GetNode().Position = position.NewNodesPosition($$, nn) $$ = nn yylex.(*Parser).MoveFreeFloating(nn.Var, $$) case *ast.ExprMethodCall: nn.Var = $$ - nn.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn) + nn.GetNode().Position = position.NewNodesPosition($$, nn) $$ = nn yylex.(*Parser).MoveFreeFloating(nn.Var, $$) } @@ -6084,19 +6085,19 @@ variable: switch nn := n.(type) { case *ast.ExprArrayDimFetch: nn.Var = $$ - nn.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn) + nn.GetNode().Position = position.NewNodesPosition($$, nn) $$ = nn yylex.(*Parser).MoveFreeFloating(nn.Var, $$) case *ast.ExprPropertyFetch: nn.Var = $$ - nn.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn) + nn.GetNode().Position = position.NewNodesPosition($$, nn) $$ = nn yylex.(*Parser).MoveFreeFloating(nn.Var, $$) case *ast.ExprMethodCall: nn.Var = $$ - nn.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn) + nn.GetNode().Position = position.NewNodesPosition($$, nn) $$ = nn yylex.(*Parser).MoveFreeFloating(nn.Var, $$) } @@ -6152,7 +6153,7 @@ array_method_dereference: $$ = append($1, fetch) // save position - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($3) + fetch.GetNode().Position = position.NewNodePosition($3) // save comments yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) @@ -6166,7 +6167,7 @@ array_method_dereference: $$ = []ast.Vertex{$1, fetch} // save position - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($3) + fetch.GetNode().Position = position.NewNodePosition($3) // save comments yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) @@ -6182,7 +6183,7 @@ method: $$ = &ast.ExprMethodCall{ast.Node{}, nil, nil, $1.(*ast.ArgumentList)} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + $$.GetNode().Position = position.NewNodePosition($1) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6221,7 +6222,7 @@ variable_without_objects: $1.last.VarName = $2 for _, n := range($1.all) { - n.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(n, $2) + n.GetNode().Position = position.NewNodesPosition(n, $2) } $$ = $1.all[0] @@ -6236,7 +6237,7 @@ static_member: $$ = &ast.ExprStaticPropertyFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -6249,7 +6250,7 @@ static_member: $$ = &ast.ExprStaticPropertyFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -6274,7 +6275,7 @@ array_function_dereference: $$ = &ast.ExprArrayDimFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -6288,7 +6289,7 @@ array_function_dereference: $$ = &ast.ExprArrayDimFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -6333,7 +6334,7 @@ base_variable: $1.last.VarName = $2 for _, n := range($1.all) { - n.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(n, $2) + n.GetNode().Position = position.NewNodesPosition(n, $2) } $$ = $1.all[0] @@ -6354,7 +6355,7 @@ reference_variable: $$ = &ast.ExprArrayDimFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -6368,7 +6369,7 @@ reference_variable: $$ = &ast.ExprArrayDimFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -6393,8 +6394,8 @@ compound_variable: $$ = &ast.ExprVariable{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + name.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -6407,7 +6408,7 @@ compound_variable: $$ = &ast.ExprVariable{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -6448,7 +6449,7 @@ object_property: $$ = []ast.Vertex{fetch} // save position - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + fetch.GetNode().Position = position.NewNodePosition($1) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6461,7 +6462,7 @@ object_dim_list: $$ = append($1, fetch) // save position - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($3) + fetch.GetNode().Position = position.NewNodePosition($3) // save comments yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) @@ -6475,7 +6476,7 @@ object_dim_list: $$ = append($1, fetch) // save position - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($3) + fetch.GetNode().Position = position.NewNodePosition($3) // save comments yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) @@ -6489,7 +6490,7 @@ object_dim_list: $$ = []ast.Vertex{fetch} // save position - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + fetch.GetNode().Position = position.NewNodePosition($1) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6501,7 +6502,7 @@ variable_name: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -6513,7 +6514,7 @@ variable_name: $$ = $2 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...)) @@ -6530,7 +6531,7 @@ simple_indirect_reference: $$ = simpleIndirectReference{[]*ast.ExprVariable{n}, n} // save position - n.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + n.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating(n, token.Start, $1.Hidden) @@ -6548,7 +6549,7 @@ simple_indirect_reference: $$ = $1 // save position - n.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) + n.GetNode().Position = position.NewTokenPosition($2) // save comments yylex.(*Parser).setFreeFloating(n, token.Start, $2.Hidden) @@ -6591,7 +6592,7 @@ assignment_list_element: $$ = &ast.ExprArrayItem{ast.Node{}, false, nil, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + $$.GetNode().Position = position.NewNodePosition($1) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -6604,8 +6605,8 @@ assignment_list_element: $$ = &ast.ExprArrayItem{ast.Node{}, false, nil, listNode} // save position - listNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(listNode) + listNode.GetNode().Position = position.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewNodePosition(listNode) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -6654,7 +6655,7 @@ non_empty_array_pair_list: $$ = append($1, arrayItem) // save position - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($3, $5) + arrayItem.GetNode().Position = position.NewNodesPosition($3, $5) // save comments yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) @@ -6669,7 +6670,7 @@ non_empty_array_pair_list: $$ = append($1, arrayItem) // save position - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($3) + arrayItem.GetNode().Position = position.NewNodePosition($3) // save comments yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) @@ -6683,7 +6684,7 @@ non_empty_array_pair_list: $$ = []ast.Vertex{arrayItem} // save position - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + arrayItem.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, arrayItem) @@ -6697,7 +6698,7 @@ non_empty_array_pair_list: $$ = []ast.Vertex{arrayItem} // save position - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + arrayItem.GetNode().Position = position.NewNodePosition($1) // save comments yylex.(*Parser).MoveFreeFloating($1, arrayItem) @@ -6711,8 +6712,8 @@ non_empty_array_pair_list: $$ = append($1, arrayItem) // save position - reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($5, $6) - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($3, $6) + reference.GetNode().Position = position.NewTokenNodePosition($5, $6) + arrayItem.GetNode().Position = position.NewNodesPosition($3, $6) // save comments yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) @@ -6729,8 +6730,8 @@ non_empty_array_pair_list: $$ = append($1, arrayItem) // save position - reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($3, $4) - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($3, $4) + reference.GetNode().Position = position.NewTokenNodePosition($3, $4) + arrayItem.GetNode().Position = position.NewTokenNodePosition($3, $4) // save comments yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) @@ -6745,8 +6746,8 @@ non_empty_array_pair_list: $$ = []ast.Vertex{arrayItem} // save position - reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($3, $4) - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $4) + reference.GetNode().Position = position.NewTokenNodePosition($3, $4) + arrayItem.GetNode().Position = position.NewNodesPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, arrayItem) @@ -6762,8 +6763,8 @@ non_empty_array_pair_list: $$ = []ast.Vertex{arrayItem} // save position - reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + reference.GetNode().Position = position.NewTokenNodePosition($1, $2) + arrayItem.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating(arrayItem, token.Start, $1.Hidden) @@ -6785,7 +6786,7 @@ encaps_list: $$ = append($1, encapsed) // save position - encapsed.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) + encapsed.GetNode().Position = position.NewTokenPosition($2) // save comments yylex.(*Parser).setFreeFloating(encapsed, token.Start, $2.Hidden) @@ -6804,7 +6805,7 @@ encaps_list: $$ = []ast.Vertex{encapsed, $2} // save position - encapsed.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + encapsed.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating(encapsed, token.Start, $1.Hidden) @@ -6820,8 +6821,8 @@ encaps_var: $$ = &ast.ExprVariable{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + name.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -6836,9 +6837,9 @@ encaps_var: $$ = &ast.ExprArrayDimFetch{ast.Node{}, variable, $3} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + identifier.GetNode().Position = position.NewTokenPosition($1) + variable.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).addDollarToken(variable) @@ -6855,10 +6856,10 @@ encaps_var: $$ = &ast.ExprPropertyFetch{ast.Node{}, variable, fetch} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + identifier.GetNode().Position = position.NewTokenPosition($1) + variable.GetNode().Position = position.NewTokenPosition($1) + fetch.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).addDollarToken(variable) @@ -6874,7 +6875,7 @@ encaps_var: $$ = variable // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1)) @@ -6890,8 +6891,8 @@ encaps_var: $$ = variable // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + name.GetNode().Position = position.NewTokenPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1)) @@ -6906,9 +6907,9 @@ encaps_var: $$ = &ast.ExprArrayDimFetch{ast.Node{}, variable, $4} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $6) + identifier.GetNode().Position = position.NewTokenPosition($2) + variable.GetNode().Position = position.NewTokenPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $6) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1)) @@ -6936,7 +6937,7 @@ encaps_var_offset: $$ = &ast.ScalarString{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -6953,7 +6954,7 @@ encaps_var_offset: } // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -6966,8 +6967,8 @@ encaps_var_offset: $$ = &ast.ExprVariable{ast.Node{}, identifier} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + identifier.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -6983,7 +6984,7 @@ internal_functions_in_yacc: $$ = &ast.ExprIsset{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -6997,7 +6998,7 @@ internal_functions_in_yacc: $$ = &ast.ExprEmpty{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -7011,7 +7012,7 @@ internal_functions_in_yacc: $$ = &ast.ExprEmpty{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -7025,7 +7026,7 @@ internal_functions_in_yacc: $$ = &ast.ExprInclude{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -7037,7 +7038,7 @@ internal_functions_in_yacc: $$ = &ast.ExprIncludeOnce{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -7049,7 +7050,7 @@ internal_functions_in_yacc: $$ = &ast.ExprEval{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -7063,7 +7064,7 @@ internal_functions_in_yacc: $$ = &ast.ExprRequire{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -7075,7 +7076,7 @@ internal_functions_in_yacc: $$ = &ast.ExprRequireOnce{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -7124,8 +7125,8 @@ class_constant: $$ = &ast.ExprClassConstFetch{ast.Node{}, $1, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $3) + target.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -7140,8 +7141,8 @@ class_constant: $$ = &ast.ExprClassConstFetch{ast.Node{}, $1, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $3) + target.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -7159,8 +7160,8 @@ static_class_name_scalar: $$ = &ast.ExprClassConstFetch{ast.Node{}, $1, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $3) + target.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -7178,8 +7179,8 @@ class_name_scalar: $$ = &ast.ExprClassConstFetch{ast.Node{}, $1, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $3) + target.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) diff --git a/internal/php7/parser.go b/internal/php7/parser.go index 1b3c0a6..25f28d5 100644 --- a/internal/php7/parser.go +++ b/internal/php7/parser.go @@ -3,7 +3,6 @@ package php7 import ( "bytes" - "github.com/z7zmey/php-parser/internal/positionbuilder" "github.com/z7zmey/php-parser/internal/scanner" "github.com/z7zmey/php-parser/pkg/ast" "github.com/z7zmey/php-parser/pkg/errors" @@ -12,12 +11,11 @@ import ( // Parser structure type Parser struct { - Lexer *scanner.Lexer - currentToken *scanner.Token - positionBuilder *positionbuilder.PositionBuilder - rootNode ast.Vertex - errors []*errors.Error - withTokens bool + Lexer *scanner.Lexer + currentToken *scanner.Token + rootNode ast.Vertex + errors []*errors.Error + withTokens bool } // NewParser creates and returns new Parser @@ -64,7 +62,6 @@ func (l *Parser) Parse() int { // init l.errors = nil l.rootNode = nil - l.positionBuilder = &positionbuilder.PositionBuilder{} // parse diff --git a/internal/php7/php7.go b/internal/php7/php7.go index ff4af9b..cccb6d9 100644 Binary files a/internal/php7/php7.go and b/internal/php7/php7.go differ diff --git a/internal/php7/php7.y b/internal/php7/php7.y index a929753..16e3936 100644 --- a/internal/php7/php7.y +++ b/internal/php7/php7.y @@ -5,9 +5,10 @@ import ( "bytes" "strconv" - "github.com/z7zmey/php-parser/pkg/token" - "github.com/z7zmey/php-parser/internal/scanner" - "github.com/z7zmey/php-parser/pkg/ast" + "github.com/z7zmey/php-parser/internal/position" + "github.com/z7zmey/php-parser/internal/scanner" + "github.com/z7zmey/php-parser/pkg/ast" + "github.com/z7zmey/php-parser/pkg/token" ) %} @@ -294,7 +295,7 @@ start: yylex.(*Parser).rootNode = &ast.Root{ast.Node{}, $1} // save position - yylex.(*Parser).rootNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) + yylex.(*Parser).rootNode.GetNode().Position = position.NewNodeListPosition($1) yylex.(*Parser).setFreeFloating(yylex.(*Parser).rootNode, token.End, yylex.(*Parser).currentToken.Hidden) @@ -360,7 +361,7 @@ namespace_name: $$ = []ast.Vertex{namePart} // save position - namePart.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + namePart.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating(namePart, token.Start, $1.Hidden) @@ -373,7 +374,7 @@ namespace_name: $$ = append($1, namePart) // save position - namePart.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) + namePart.GetNode().Position = position.NewTokenPosition($3) // save comments yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) @@ -389,7 +390,7 @@ name: $$ = &ast.NameName{ast.Node{}, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) + $$.GetNode().Position = position.NewNodeListPosition($1) // save comments yylex.(*Parser).MoveFreeFloating($1[0], $$) @@ -401,7 +402,7 @@ name: $$ = &ast.NameRelative{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $3) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -414,7 +415,7 @@ name: $$ = &ast.NameFullyQualified{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -466,7 +467,7 @@ top_statement: $$ = &ast.StmtHaltCompiler{ast.Node{}} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -483,8 +484,8 @@ top_statement: $$ = &ast.StmtNamespace{ast.Node{}, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + name.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -500,8 +501,8 @@ top_statement: $$ = &ast.StmtNamespace{ast.Node{}, name, $4} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $5) + name.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $5) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -516,7 +517,7 @@ top_statement: $$ = &ast.StmtNamespace{ast.Node{}, nil, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -530,7 +531,7 @@ top_statement: $$ = $2 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -545,7 +546,7 @@ top_statement: $$ = $3 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -559,7 +560,7 @@ top_statement: $$ = &ast.StmtUseList{ast.Node{}, nil, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -573,7 +574,7 @@ top_statement: $$ = &ast.StmtUseList{ast.Node{}, $2, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -587,7 +588,7 @@ top_statement: $$ = &ast.StmtConstList{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -604,7 +605,7 @@ use_type: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -616,7 +617,7 @@ use_type: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -632,8 +633,8 @@ group_use_declaration: $$ = &ast.StmtGroupUse{ast.Node{}, nil, name, $4} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($1, $6) + name.GetNode().Position = position.NewNodeListPosition($1) + $$.GetNode().Position = position.NewNodeListTokenPosition($1, $6) // save comments yylex.(*Parser).MoveFreeFloating($1[0], name) @@ -653,8 +654,8 @@ group_use_declaration: $$ = &ast.StmtGroupUse{ast.Node{}, nil, name, $5} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $7) + name.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $7) // save comments yylex.(*Parser).setFreeFloating($$, token.UseType, $1.Hidden) @@ -678,8 +679,8 @@ mixed_group_use_declaration: $$ = &ast.StmtGroupUse{ast.Node{}, nil, name, $4} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($1, $6) + name.GetNode().Position = position.NewNodeListPosition($1) + $$.GetNode().Position = position.NewNodeListTokenPosition($1, $6) // save comments yylex.(*Parser).MoveFreeFloating($1[0], name) @@ -699,8 +700,8 @@ mixed_group_use_declaration: $$ = &ast.StmtGroupUse{ast.Node{}, nil, name, $5} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $7) + name.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $7) // save comments yylex.(*Parser).setFreeFloating($$, token.Use, append($1.Hidden, yylex.(*Parser).GetFreeFloatingToken($1)...)) @@ -805,8 +806,8 @@ unprefixed_use_declaration: $$ = &ast.StmtUse{ast.Node{}, nil, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) + name.GetNode().Position = position.NewNodeListPosition($1) + $$.GetNode().Position = position.NewNodeListPosition($1) // save comments yylex.(*Parser).MoveFreeFloating($1[0], name) @@ -820,9 +821,9 @@ unprefixed_use_declaration: $$ = &ast.StmtUse{ast.Node{}, nil, name, alias} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1) - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($1, $3) + name.GetNode().Position = position.NewNodeListPosition($1) + alias.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewNodeListTokenPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1[0], name) @@ -941,7 +942,7 @@ inner_statement: $$ = &ast.StmtHaltCompiler{ast.Node{}, } // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -959,7 +960,7 @@ statement: $$ = &ast.StmtStmtList{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -991,7 +992,7 @@ statement: $$ = $5 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $5) + $$.GetNode().Position = position.NewTokenNodePosition($1, $5) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1005,7 +1006,7 @@ statement: $$ = &ast.StmtDo{ast.Node{}, $2, $5} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $7) + $$.GetNode().Position = position.NewTokensPosition($1, $7) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1033,7 +1034,7 @@ statement: $$ = $9 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $9) + $$.GetNode().Position = position.NewTokenNodePosition($1, $9) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1058,7 +1059,7 @@ statement: $$ = $5 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $5) + $$.GetNode().Position = position.NewTokenNodePosition($1, $5) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1072,7 +1073,7 @@ statement: $$ = &ast.StmtBreak{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1086,7 +1087,7 @@ statement: $$ = &ast.StmtContinue{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1100,7 +1101,7 @@ statement: $$ = &ast.StmtReturn{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1114,7 +1115,7 @@ statement: $$ = &ast.StmtGlobal{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1128,7 +1129,7 @@ statement: $$ = &ast.StmtStatic{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1142,7 +1143,7 @@ statement: $$ = &ast.StmtEcho{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1157,7 +1158,7 @@ statement: $$ = &ast.StmtInlineHtml{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1169,7 +1170,7 @@ statement: $$ = &ast.StmtExpression{ast.Node{}, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $2) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $2) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -1183,7 +1184,7 @@ statement: $$ = &ast.StmtUnset{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $6) + $$.GetNode().Position = position.NewTokensPosition($1, $6) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1212,7 +1213,7 @@ statement: $$ = $7 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $7) + $$.GetNode().Position = position.NewTokenNodePosition($1, $7) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1239,7 +1240,7 @@ statement: $$ = $9 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $9) + $$.GetNode().Position = position.NewTokenNodePosition($1, $9) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1256,7 +1257,7 @@ statement: $$.(*ast.StmtDeclare).Consts = $3 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $5) + $$.GetNode().Position = position.NewTokenNodePosition($1, $5) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1270,7 +1271,7 @@ statement: $$ = &ast.StmtNop{ast.Node{}, } // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1282,10 +1283,10 @@ statement: { if $6 == nil { $$ = &ast.StmtTry{ast.Node{}, $3, $5, $6} - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $5) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $5) } else { $$ = &ast.StmtTry{ast.Node{}, $3, $5, $6} - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $6) + $$.GetNode().Position = position.NewTokenNodePosition($1, $6) } // save comments @@ -1300,7 +1301,7 @@ statement: $$ = &ast.StmtThrow{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1315,8 +1316,8 @@ statement: $$ = &ast.StmtGoto{ast.Node{}, label} // save position - label.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + label.GetNode().Position = position.NewTokenPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1332,8 +1333,8 @@ statement: $$ = &ast.StmtLabel{ast.Node{}, label} // save position - label.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + label.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1357,9 +1358,9 @@ catch_list: $$ = append($1, catch) // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($5) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($5) - catch.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($2, $9) + identifier.GetNode().Position = position.NewTokenPosition($5) + variable.GetNode().Position = position.NewTokenPosition($5) + catch.GetNode().Position = position.NewTokensPosition($2, $9) // save comments yylex.(*Parser).setFreeFloating(catch, token.Start, $2.Hidden) @@ -1403,7 +1404,7 @@ finally_statement: $$ = &ast.StmtFinally{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1448,8 +1449,8 @@ function_declaration_statement: $$ = &ast.StmtFunction{ast.Node{}, $2 != nil, name, $6, $8, $10} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $11) + name.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewTokensPosition($1, $11) // save comments @@ -1506,8 +1507,8 @@ class_declaration_statement: $$ = &ast.StmtClass{ast.Node{}, name, $1, nil, $4, $5, $8} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewOptionalListTokensPosition($1, $2, $9) + name.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewOptionalListTokensPosition($1, $2, $9) // save comments yylex.(*Parser).MoveFreeFloating($1[0], $$) @@ -1524,8 +1525,8 @@ class_declaration_statement: $$ = &ast.StmtClass{ast.Node{}, name, nil, nil, $3, $4, $7} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $8) + name.GetNode().Position = position.NewTokenPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $8) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1558,7 +1559,7 @@ class_modifier: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1570,7 +1571,7 @@ class_modifier: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1586,8 +1587,8 @@ trait_declaration_statement: $$ = &ast.StmtTrait{ast.Node{}, name, $5} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $6) + name.GetNode().Position = position.NewTokenPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $6) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1606,8 +1607,8 @@ interface_declaration_statement: $$ = &ast.StmtInterface{ast.Node{}, name, $3, $6} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $7) + name.GetNode().Position = position.NewTokenPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $7) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1631,7 +1632,7 @@ extends_from: $$ = &ast.StmtClassExtends{ast.Node{}, $2}; // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1652,7 +1653,7 @@ interface_extends_list: $$ = &ast.StmtInterfaceExtends{ast.Node{}, $2}; // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1673,7 +1674,7 @@ implements_list: $$ = &ast.StmtClassImplements{ast.Node{}, $2}; // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1694,7 +1695,7 @@ foreach_variable: $$ = &ast.ExprReference{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1706,7 +1707,7 @@ foreach_variable: $$ = &ast.ExprList{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1720,7 +1721,7 @@ foreach_variable: $$ = &ast.ExprShortList{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save commentsc yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1736,7 +1737,7 @@ for_statement: $$ = &ast.StmtFor{ast.Node{}, nil, nil, nil, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + $$.GetNode().Position = position.NewNodePosition($1) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1746,8 +1747,8 @@ for_statement: $$ = &ast.StmtAltFor{ast.Node{}, nil, nil, nil, stmtList} // save position - stmtList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + stmtList.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) @@ -1765,7 +1766,7 @@ foreach_statement: $$ = &ast.StmtForeach{ast.Node{}, nil, nil, nil, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + $$.GetNode().Position = position.NewNodePosition($1) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1775,8 +1776,8 @@ foreach_statement: $$ = &ast.StmtAltForeach{ast.Node{}, nil, nil, nil, stmtList} // save position - stmtList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + stmtList.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) @@ -1794,7 +1795,7 @@ declare_statement: $$ = &ast.StmtDeclare{ast.Node{}, false, nil, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + $$.GetNode().Position = position.NewNodePosition($1) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1804,8 +1805,8 @@ declare_statement: $$ = &ast.StmtDeclare{ast.Node{}, true, nil, stmtList} // save position - stmtList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + stmtList.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) @@ -1824,8 +1825,8 @@ switch_case_list: $$ = &ast.StmtSwitch{ast.Node{}, nil, caseList} // save position - caseList.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + caseList.GetNode().Position = position.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.Hidden) @@ -1839,8 +1840,8 @@ switch_case_list: $$ = &ast.StmtSwitch{ast.Node{}, nil, caseList} // save position - caseList.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + caseList.GetNode().Position = position.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.Hidden) @@ -1855,8 +1856,8 @@ switch_case_list: $$ = &ast.StmtAltSwitch{ast.Node{}, nil, caseList} // save position - caseList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + caseList.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) @@ -1873,8 +1874,8 @@ switch_case_list: $$ = &ast.StmtAltSwitch{ast.Node{}, nil, caseList} // save position - caseList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $5) + caseList.GetNode().Position = position.NewNodeListPosition($3) + $$.GetNode().Position = position.NewTokensPosition($1, $5) // save comments yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) @@ -1900,7 +1901,7 @@ case_list: $$ = append($1, _case) // save position - _case.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($2, $5) + _case.GetNode().Position = position.NewTokenNodeListPosition($2, $5) // save comments yylex.(*Parser).setFreeFloating(_case, token.Start, $2.Hidden) @@ -1915,7 +1916,7 @@ case_list: $$ = append($1, _default) // save position - _default.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($2, $4) + _default.GetNode().Position = position.NewTokenNodeListPosition($2, $4) // save comments yylex.(*Parser).setFreeFloating(_default, token.Start, $2.Hidden) @@ -1943,7 +1944,7 @@ while_statement: $$ = &ast.StmtWhile{ast.Node{}, nil, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + $$.GetNode().Position = position.NewNodePosition($1) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1953,8 +1954,8 @@ while_statement: $$ = &ast.StmtAltWhile{ast.Node{}, nil, stmtList} // save position - stmtList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + stmtList.GetNode().Position = position.NewNodeListPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) @@ -1972,7 +1973,7 @@ if_stmt_without_else: $$ = &ast.StmtIf{ast.Node{}, $3, $5, nil, nil} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $5) + $$.GetNode().Position = position.NewTokenNodePosition($1, $5) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -1989,8 +1990,8 @@ if_stmt_without_else: $$ = $1 // save position - _elseIf.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($2, $6) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $6) + _elseIf.GetNode().Position = position.NewTokenNodePosition($2, $6) + $$.GetNode().Position = position.NewNodesPosition($1, $6) // save comments yylex.(*Parser).setFreeFloating(_elseIf, token.Start, $2.Hidden) @@ -2016,8 +2017,8 @@ if_stmt: $$ = $1 // save position - _else.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($2, $3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + _else.GetNode().Position = position.NewTokenNodePosition($2, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating(_else, token.Start, $2.Hidden) @@ -2033,8 +2034,8 @@ alt_if_stmt_without_else: $$ = &ast.StmtAltIf{ast.Node{}, $3, stmts, nil, nil} // save position - stmts.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($6) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $6) + stmts.GetNode().Position = position.NewNodeListPosition($6) + $$.GetNode().Position = position.NewTokenNodeListPosition($1, $6) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2053,8 +2054,8 @@ alt_if_stmt_without_else: $$ = $1 // save position - stmts.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($7) - _elseIf.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($2, $7) + stmts.GetNode().Position = position.NewNodeListPosition($7) + _elseIf.GetNode().Position = position.NewTokenNodeListPosition($2, $7) // save comments yylex.(*Parser).setFreeFloating(_elseIf, token.Start, $2.Hidden) @@ -2072,7 +2073,7 @@ alt_if_stmt: $$ = $1 // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $3) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Stmts, $2.Hidden) @@ -2090,9 +2091,9 @@ alt_if_stmt: $$ = $1 // save position - stmts.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($4) - _else.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($2, $4) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $6) + stmts.GetNode().Position = position.NewNodeListPosition($4) + _else.GetNode().Position = position.NewTokenNodeListPosition($2, $4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $6) // save comments yylex.(*Parser).setFreeFloating(_else, token.Start, $2.Hidden) @@ -2146,16 +2147,16 @@ parameter: $$ = &ast.Parameter{ast.Node{}, $2 != nil, $3 != nil, $1, variable, nil} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) + identifier.GetNode().Position = position.NewTokenPosition($4) + variable.GetNode().Position = position.NewTokenPosition($4) if $1 != nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) } else if $2 != nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($2, $4) + $$.GetNode().Position = position.NewTokensPosition($2, $4) } else if $3 != nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($3, $4) + $$.GetNode().Position = position.NewTokensPosition($3, $4) } else { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) + $$.GetNode().Position = position.NewTokenPosition($4) } // save comments @@ -2192,16 +2193,16 @@ parameter: $$ = &ast.Parameter{ast.Node{}, $2 != nil, $3 != nil, $1, variable, $6} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) + identifier.GetNode().Position = position.NewTokenPosition($4) + variable.GetNode().Position = position.NewTokenPosition($4) if $1 != nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $6) + $$.GetNode().Position = position.NewNodesPosition($1, $6) } else if $2 != nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($2, $6) + $$.GetNode().Position = position.NewTokenNodePosition($2, $6) } else if $3 != nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($3, $6) + $$.GetNode().Position = position.NewTokenNodePosition($3, $6) } else { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($4, $6) + $$.GetNode().Position = position.NewTokenNodePosition($4, $6) } // save comments @@ -2261,7 +2262,7 @@ type_expr: $$ = &ast.Nullable{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2276,7 +2277,7 @@ type: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2288,7 +2289,7 @@ type: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2327,7 +2328,7 @@ argument_list: $$ = &ast.ArgumentList{ast.Node{}, nil} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2340,7 +2341,7 @@ argument_list: $$ = &ast.ArgumentList{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2378,7 +2379,7 @@ argument: $$ = &ast.Argument{ast.Node{}, false, false, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + $$.GetNode().Position = position.NewNodePosition($1) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -2390,7 +2391,7 @@ argument: $$ = &ast.Argument{ast.Node{}, true, false, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2452,9 +2453,9 @@ static_var: $$ = &ast.StmtStaticVar{ast.Node{}, variable, nil} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + identifier.GetNode().Position = position.NewTokenPosition($1) + variable.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2469,9 +2470,9 @@ static_var: $$ = &ast.StmtStaticVar{ast.Node{}, variable, $3} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3) + identifier.GetNode().Position = position.NewTokenPosition($1) + variable.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2503,7 +2504,7 @@ class_statement: $$ = &ast.StmtPropertyList{ast.Node{}, $1, $2, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($1, $4) + $$.GetNode().Position = position.NewNodeListTokenPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1[0], $$) @@ -2517,7 +2518,7 @@ class_statement: $$ = &ast.StmtClassConstList{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewOptionalListTokensPosition($1, $2, $4) + $$.GetNode().Position = position.NewOptionalListTokensPosition($1, $2, $4) // save comments if len($1) > 0 { @@ -2536,7 +2537,7 @@ class_statement: $$ = &ast.StmtTraitUse{ast.Node{}, $2, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3) + $$.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2549,11 +2550,11 @@ class_statement: $$ = &ast.StmtClassMethod{ast.Node{}, $3 != nil, name, $1, $7, $9, $10} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) + name.GetNode().Position = position.NewTokenPosition($4) if $1 == nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($2, $10) + $$.GetNode().Position = position.NewTokenNodePosition($2, $10) } else { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListNodePosition($1, $10) + $$.GetNode().Position = position.NewNodeListNodePosition($1, $10) } // save comments @@ -2602,7 +2603,7 @@ trait_adaptations: { $$ = &ast.StmtNop{ast.Node{}, } - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2615,7 +2616,7 @@ trait_adaptations: { $$ = &ast.StmtTraitAdaptationList{ast.Node{}, nil} - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2627,7 +2628,7 @@ trait_adaptations: { $$ = &ast.StmtTraitAdaptationList{ast.Node{}, $2} - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2681,7 +2682,7 @@ trait_precedence: $$ = &ast.StmtTraitUsePrecedence{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeNodeListPosition($1, $3) + $$.GetNode().Position = position.NewNodeNodeListPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -2698,8 +2699,8 @@ trait_alias: $$ = &ast.StmtTraitUseAlias{ast.Node{}, $1, nil, alias} // save position - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $3) + alias.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -2714,8 +2715,8 @@ trait_alias: $$ = &ast.StmtTraitUseAlias{ast.Node{}, $1, nil, alias} // save position - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $3) + alias.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -2730,8 +2731,8 @@ trait_alias: $$ = &ast.StmtTraitUseAlias{ast.Node{}, $1, $3, alias} // save position - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($4) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + alias.GetNode().Position = position.NewTokenPosition($4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -2745,7 +2746,7 @@ trait_alias: $$ = &ast.StmtTraitUseAlias{ast.Node{}, $1, $3, nil} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -2762,8 +2763,8 @@ trait_method_reference: $$ = &ast.StmtTraitMethodRef{ast.Node{}, nil, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + name.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2785,8 +2786,8 @@ absolute_trait_method_reference: $$ = &ast.StmtTraitMethodRef{ast.Node{}, $1, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $3) + target.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -2803,7 +2804,7 @@ method_body: $$ = &ast.StmtNop{ast.Node{}, } // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2816,7 +2817,7 @@ method_body: $$ = &ast.StmtStmtList{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2839,7 +2840,7 @@ variable_modifiers: $$ = []ast.Vertex{modifier} // save position - modifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + modifier.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating(modifier, token.Start, $1.Hidden) @@ -2884,7 +2885,7 @@ member_modifier: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2896,7 +2897,7 @@ member_modifier: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2908,7 +2909,7 @@ member_modifier: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2920,7 +2921,7 @@ member_modifier: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2932,7 +2933,7 @@ member_modifier: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2944,7 +2945,7 @@ member_modifier: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2979,9 +2980,9 @@ property: $$ = &ast.StmtProperty{ast.Node{}, variable, nil} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + identifier.GetNode().Position = position.NewTokenPosition($1) + variable.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -2996,9 +2997,9 @@ property: $$ = &ast.StmtProperty{ast.Node{}, variable, $3} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3) + identifier.GetNode().Position = position.NewTokenPosition($1) + variable.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3034,8 +3035,8 @@ class_const_decl: $$ = &ast.StmtConstant{ast.Node{}, name, $3} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3) + name.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3052,8 +3053,8 @@ const_decl: $$ = &ast.StmtConstant{ast.Node{}, name, $3} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3) + name.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3133,7 +3134,7 @@ anonymous_class: } // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $8) + $$.GetNode().Position = position.NewTokensPosition($1, $8) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3149,10 +3150,10 @@ new_expr: { if $3 != nil { $$ = &ast.ExprNew{ast.Node{}, $2, $3.(*ast.ArgumentList)} - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3) + $$.GetNode().Position = position.NewTokenNodePosition($1, $3) } else { $$ = &ast.ExprNew{ast.Node{}, $2, nil} - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) } // save comments @@ -3165,7 +3166,7 @@ new_expr: $$ = &ast.ExprNew{ast.Node{}, $2, nil} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3181,8 +3182,8 @@ expr_without_variable: $$ = &ast.ExprAssign{ast.Node{}, listNode, $6} // save position - listNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $6) + listNode.GetNode().Position = position.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokenNodePosition($1, $6) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3198,8 +3199,8 @@ expr_without_variable: $$ = &ast.ExprAssign{ast.Node{}, shortList, $5} // save position - shortList.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $5) + shortList.GetNode().Position = position.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokenNodePosition($1, $5) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3213,7 +3214,7 @@ expr_without_variable: $$ = &ast.ExprAssign{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3226,7 +3227,7 @@ expr_without_variable: $$ = &ast.ExprAssignReference{ast.Node{}, $1, $4} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $4) + $$.GetNode().Position = position.NewNodesPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3240,7 +3241,7 @@ expr_without_variable: $$ = &ast.ExprClone{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3252,7 +3253,7 @@ expr_without_variable: $$ = &ast.ExprAssignPlus{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3265,7 +3266,7 @@ expr_without_variable: $$ = &ast.ExprAssignMinus{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3278,7 +3279,7 @@ expr_without_variable: $$ = &ast.ExprAssignMul{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3291,7 +3292,7 @@ expr_without_variable: $$ = &ast.ExprAssignPow{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3304,7 +3305,7 @@ expr_without_variable: $$ = &ast.ExprAssignDiv{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3317,7 +3318,7 @@ expr_without_variable: $$ = &ast.ExprAssignConcat{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3330,7 +3331,7 @@ expr_without_variable: $$ = &ast.ExprAssignMod{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3343,7 +3344,7 @@ expr_without_variable: $$ = &ast.ExprAssignBitwiseAnd{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3356,7 +3357,7 @@ expr_without_variable: $$ = &ast.ExprAssignBitwiseOr{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3369,7 +3370,7 @@ expr_without_variable: $$ = &ast.ExprAssignBitwiseXor{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3382,7 +3383,7 @@ expr_without_variable: $$ = &ast.ExprAssignShiftLeft{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3395,7 +3396,7 @@ expr_without_variable: $$ = &ast.ExprAssignShiftRight{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3408,7 +3409,7 @@ expr_without_variable: $$ = &ast.ExprAssignCoalesce{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3421,7 +3422,7 @@ expr_without_variable: $$ = &ast.ExprPostInc{ast.Node{}, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $2) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $2) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3434,7 +3435,7 @@ expr_without_variable: $$ = &ast.ExprPreInc{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3446,7 +3447,7 @@ expr_without_variable: $$ = &ast.ExprPostDec{ast.Node{}, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $2) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $2) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3459,7 +3460,7 @@ expr_without_variable: $$ = &ast.ExprPreDec{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3471,7 +3472,7 @@ expr_without_variable: $$ = &ast.ExprBinaryBooleanOr{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3484,7 +3485,7 @@ expr_without_variable: $$ = &ast.ExprBinaryBooleanAnd{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3497,7 +3498,7 @@ expr_without_variable: $$ = &ast.ExprBinaryLogicalOr{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3510,7 +3511,7 @@ expr_without_variable: $$ = &ast.ExprBinaryLogicalAnd{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3523,7 +3524,7 @@ expr_without_variable: $$ = &ast.ExprBinaryLogicalXor{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3536,7 +3537,7 @@ expr_without_variable: $$ = &ast.ExprBinaryBitwiseOr{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3549,7 +3550,7 @@ expr_without_variable: $$ = &ast.ExprBinaryBitwiseAnd{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3562,7 +3563,7 @@ expr_without_variable: $$ = &ast.ExprBinaryBitwiseXor{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3575,7 +3576,7 @@ expr_without_variable: $$ = &ast.ExprBinaryConcat{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3588,7 +3589,7 @@ expr_without_variable: $$ = &ast.ExprBinaryPlus{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3601,7 +3602,7 @@ expr_without_variable: $$ = &ast.ExprBinaryMinus{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3614,7 +3615,7 @@ expr_without_variable: $$ = &ast.ExprBinaryMul{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3627,7 +3628,7 @@ expr_without_variable: $$ = &ast.ExprBinaryPow{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3640,7 +3641,7 @@ expr_without_variable: $$ = &ast.ExprBinaryDiv{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3653,7 +3654,7 @@ expr_without_variable: $$ = &ast.ExprBinaryMod{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3666,7 +3667,7 @@ expr_without_variable: $$ = &ast.ExprBinaryShiftLeft{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3679,7 +3680,7 @@ expr_without_variable: $$ = &ast.ExprBinaryShiftRight{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3692,7 +3693,7 @@ expr_without_variable: $$ = &ast.ExprUnaryPlus{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3704,7 +3705,7 @@ expr_without_variable: $$ = &ast.ExprUnaryMinus{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3716,7 +3717,7 @@ expr_without_variable: $$ = &ast.ExprBooleanNot{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3728,7 +3729,7 @@ expr_without_variable: $$ = &ast.ExprBitwiseNot{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3740,7 +3741,7 @@ expr_without_variable: $$ = &ast.ExprBinaryIdentical{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3753,7 +3754,7 @@ expr_without_variable: $$ = &ast.ExprBinaryNotIdentical{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3766,7 +3767,7 @@ expr_without_variable: $$ = &ast.ExprBinaryEqual{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3779,7 +3780,7 @@ expr_without_variable: $$ = &ast.ExprBinaryNotEqual{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3793,7 +3794,7 @@ expr_without_variable: $$ = &ast.ExprBinarySmaller{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3806,7 +3807,7 @@ expr_without_variable: $$ = &ast.ExprBinarySmallerOrEqual{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3819,7 +3820,7 @@ expr_without_variable: $$ = &ast.ExprBinaryGreater{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3832,7 +3833,7 @@ expr_without_variable: $$ = &ast.ExprBinaryGreaterOrEqual{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3845,7 +3846,7 @@ expr_without_variable: $$ = &ast.ExprBinarySpaceship{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3858,7 +3859,7 @@ expr_without_variable: $$ = &ast.ExprInstanceOf{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3887,7 +3888,7 @@ expr_without_variable: $$ = &ast.ExprTernary{ast.Node{}, $1, $3, $5} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $5) + $$.GetNode().Position = position.NewNodesPosition($1, $5) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3901,7 +3902,7 @@ expr_without_variable: $$ = &ast.ExprTernary{ast.Node{}, $1, nil, $4} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $4) + $$.GetNode().Position = position.NewNodesPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3915,7 +3916,7 @@ expr_without_variable: $$ = &ast.ExprBinaryCoalesce{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -3934,7 +3935,7 @@ expr_without_variable: $$ = &ast.ExprCastInt{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3947,7 +3948,7 @@ expr_without_variable: $$ = &ast.ExprCastDouble{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3960,7 +3961,7 @@ expr_without_variable: $$ = &ast.ExprCastString{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3973,7 +3974,7 @@ expr_without_variable: $$ = &ast.ExprCastArray{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3986,7 +3987,7 @@ expr_without_variable: $$ = &ast.ExprCastObject{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -3999,7 +4000,7 @@ expr_without_variable: $$ = &ast.ExprCastBool{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4012,7 +4013,7 @@ expr_without_variable: $$ = &ast.ExprCastUnset{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4037,9 +4038,9 @@ expr_without_variable: // save position if $2 == nil { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) } else { - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) } // save comments @@ -4052,7 +4053,7 @@ expr_without_variable: $$ = &ast.ExprErrorSuppress{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4070,7 +4071,7 @@ expr_without_variable: $$ = &ast.ExprShellExec{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4082,7 +4083,7 @@ expr_without_variable: $$ = &ast.ExprPrint{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4094,7 +4095,7 @@ expr_without_variable: $$ = &ast.ExprYield{ast.Node{}, nil, nil} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4106,7 +4107,7 @@ expr_without_variable: $$ = &ast.ExprYield{ast.Node{}, nil, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4118,7 +4119,7 @@ expr_without_variable: $$ = &ast.ExprYield{ast.Node{}, $2, $4} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $4) + $$.GetNode().Position = position.NewTokenNodePosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4131,7 +4132,7 @@ expr_without_variable: $$ = &ast.ExprYieldFrom{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4156,7 +4157,7 @@ expr_without_variable: }; // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Static, $$.GetNode().Tokens[token.Start]); delete($$.GetNode().Tokens, token.Start) @@ -4172,7 +4173,7 @@ inline_function: $$ = &ast.ExprClosure{ast.Node{}, $2 != nil, false, $5, $7, $8, $10} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $11) + $$.GetNode().Position = position.NewTokensPosition($1, $11) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4204,7 +4205,7 @@ inline_function: $$ = &ast.ExprArrowFunction{ast.Node{}, $2 != nil, false, $4, $6, $9} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $9) + $$.GetNode().Position = position.NewTokenNodePosition($1, $9) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4256,7 +4257,7 @@ lexical_vars: $$ = &ast.ExprClosureUse{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4292,8 +4293,8 @@ lexical_var: $$ = &ast.ExprVariable{ast.Node{}, identifier} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + identifier.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4308,9 +4309,9 @@ lexical_var: $$ = &ast.ExprReference{ast.Node{}, variable} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + identifier.GetNode().Position = position.NewTokenPosition($2) + variable.GetNode().Position = position.NewTokenPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4327,7 +4328,7 @@ function_call: $$ = &ast.ExprFunctionCall{ast.Node{}, $1, $2.(*ast.ArgumentList)} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $2) + $$.GetNode().Position = position.NewNodesPosition($1, $2) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4339,7 +4340,7 @@ function_call: $$ = &ast.ExprStaticCall{ast.Node{}, $1, $3, $4.(*ast.ArgumentList)} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $4) + $$.GetNode().Position = position.NewNodesPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4352,7 +4353,7 @@ function_call: $$ = &ast.ExprStaticCall{ast.Node{}, $1, $3, $4.(*ast.ArgumentList)} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $4) + $$.GetNode().Position = position.NewNodesPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4365,7 +4366,7 @@ function_call: $$ = &ast.ExprFunctionCall{ast.Node{}, $1, $2.(*ast.ArgumentList)} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $2) + $$.GetNode().Position = position.NewNodesPosition($1, $2) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4380,7 +4381,7 @@ class_name: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4422,7 +4423,7 @@ exit_expr: $$ = &ast.ExprExit{ast.Node{}, false, $2}; // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Exit, append($1.Hidden, yylex.(*Parser).GetFreeFloatingToken($1)...)) @@ -4445,7 +4446,7 @@ backticks_expr: $$ = []ast.Vertex{part} // save position - part.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + part.GetNode().Position = position.NewTokenPosition($1) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4478,7 +4479,7 @@ dereferencable_scalar: $$ = &ast.ExprArray{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4492,7 +4493,7 @@ dereferencable_scalar: $$ = &ast.ExprShortArray{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4505,7 +4506,7 @@ dereferencable_scalar: $$ = &ast.ScalarString{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4520,7 +4521,7 @@ scalar: $$ = &ast.ScalarLnumber{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4532,7 +4533,7 @@ scalar: $$ = &ast.ScalarDnumber{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4544,7 +4545,7 @@ scalar: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4556,7 +4557,7 @@ scalar: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4568,7 +4569,7 @@ scalar: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4580,7 +4581,7 @@ scalar: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4592,7 +4593,7 @@ scalar: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4604,7 +4605,7 @@ scalar: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4616,7 +4617,7 @@ scalar: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4628,7 +4629,7 @@ scalar: $$ = &ast.ScalarMagicConstant{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4641,8 +4642,8 @@ scalar: $$ = &ast.ScalarHeredoc{ast.Node{}, $1.Value, []ast.Vertex{encapsed}} // save position - encapsed.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + encapsed.GetNode().Position = position.NewTokenPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4654,7 +4655,7 @@ scalar: $$ = &ast.ScalarHeredoc{ast.Node{}, $1.Value, nil} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4666,7 +4667,7 @@ scalar: $$ = &ast.ScalarEncapsed{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4678,7 +4679,7 @@ scalar: $$ = &ast.ScalarHeredoc{ast.Node{}, $1.Value, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4705,7 +4706,7 @@ constant: $$ = &ast.ExprConstFetch{ast.Node{}, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + $$.GetNode().Position = position.NewNodePosition($1) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4718,8 +4719,8 @@ constant: $$ = &ast.ExprClassConstFetch{ast.Node{}, $1, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $3) + target.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4734,8 +4735,8 @@ constant: $$ = &ast.ExprClassConstFetch{ast.Node{}, $1, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $3) + target.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4847,7 +4848,7 @@ callable_variable: $$ = &ast.ExprArrayDimFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4861,7 +4862,7 @@ callable_variable: $$ = &ast.ExprArrayDimFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4875,7 +4876,7 @@ callable_variable: $$ = &ast.ExprArrayDimFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4889,7 +4890,7 @@ callable_variable: $$ = &ast.ExprMethodCall{ast.Node{}, $1, $3, $4.(*ast.ArgumentList)} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $4) + $$.GetNode().Position = position.NewNodesPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4923,7 +4924,7 @@ variable: $$ = &ast.ExprPropertyFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4940,8 +4941,8 @@ simple_variable: $$ = &ast.ExprVariable{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + name.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4954,7 +4955,7 @@ simple_variable: $$ = &ast.ExprVariable{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4969,7 +4970,7 @@ simple_variable: $$ = &ast.ExprVariable{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -4985,7 +4986,7 @@ static_member: $$ = &ast.ExprStaticPropertyFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -4998,7 +4999,7 @@ static_member: $$ = &ast.ExprStaticPropertyFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5020,7 +5021,7 @@ new_variable: $$ = &ast.ExprArrayDimFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5034,7 +5035,7 @@ new_variable: $$ = &ast.ExprArrayDimFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $4) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5048,7 +5049,7 @@ new_variable: $$ = &ast.ExprPropertyFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5061,7 +5062,7 @@ new_variable: $$ = &ast.ExprStaticPropertyFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5074,7 +5075,7 @@ new_variable: $$ = &ast.ExprStaticPropertyFetch{ast.Node{}, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5090,7 +5091,7 @@ member_name: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5121,7 +5122,7 @@ property_name: $$ = &ast.Identifier{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5202,7 +5203,7 @@ array_pair: $$ = &ast.ExprArrayItem{ast.Node{}, false, $1, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3) + $$.GetNode().Position = position.NewNodesPosition($1, $3) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5215,7 +5216,7 @@ array_pair: $$ = &ast.ExprArrayItem{ast.Node{}, false, nil, $1} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($1) + $$.GetNode().Position = position.NewNodePosition($1) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5228,8 +5229,8 @@ array_pair: $$ = &ast.ExprArrayItem{ast.Node{}, false, $1, reference} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $4) - reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($3, $4) + $$.GetNode().Position = position.NewNodesPosition($1, $4) + reference.GetNode().Position = position.NewTokenNodePosition($3, $4) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5244,8 +5245,8 @@ array_pair: $$ = &ast.ExprArrayItem{ast.Node{}, false, nil, reference} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) - reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) + reference.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5257,7 +5258,7 @@ array_pair: $$ = &ast.ExprArrayItem{ast.Node{}, true, nil, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5271,8 +5272,8 @@ array_pair: $$ = &ast.ExprArrayItem{ast.Node{}, false, $1, listNode} // save position - listNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($3, $6) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $6) + listNode.GetNode().Position = position.NewTokensPosition($3, $6) + $$.GetNode().Position = position.NewNodeTokenPosition($1, $6) // save comments yylex.(*Parser).MoveFreeFloating($1, $$) @@ -5290,8 +5291,8 @@ array_pair: $$ = &ast.ExprArrayItem{ast.Node{}, false, nil, listNode} // save position - listNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + listNode.GetNode().Position = position.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5315,7 +5316,7 @@ encaps_list: $$ = append($1, encapsed) // save position - encapsed.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) + encapsed.GetNode().Position = position.NewTokenPosition($2) // save comments yylex.(*Parser).setFreeFloating(encapsed, token.Start, $2.Hidden) @@ -5334,7 +5335,7 @@ encaps_list: $$ = []ast.Vertex{encapsed, $2} // save position - encapsed.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + encapsed.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating(encapsed, token.Start, $1.Hidden) @@ -5350,8 +5351,8 @@ encaps_var: $$ = &ast.ExprVariable{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + name.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5366,9 +5367,9 @@ encaps_var: $$ = &ast.ExprArrayDimFetch{ast.Node{}, variable, $3} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + identifier.GetNode().Position = position.NewTokenPosition($1) + variable.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).addDollarToken(variable) @@ -5385,10 +5386,10 @@ encaps_var: $$ = &ast.ExprPropertyFetch{ast.Node{}, variable, fetch} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + identifier.GetNode().Position = position.NewTokenPosition($1) + variable.GetNode().Position = position.NewTokenPosition($1) + fetch.GetNode().Position = position.NewTokenPosition($3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).addDollarToken(variable) @@ -5404,7 +5405,7 @@ encaps_var: $$ = variable // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1)) @@ -5420,8 +5421,8 @@ encaps_var: $$ = variable // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3) + name.GetNode().Position = position.NewTokenPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1)) @@ -5436,9 +5437,9 @@ encaps_var: $$ = &ast.ExprArrayDimFetch{ast.Node{}, variable, $4} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $6) + identifier.GetNode().Position = position.NewTokenPosition($2) + variable.GetNode().Position = position.NewTokenPosition($2) + $$.GetNode().Position = position.NewTokensPosition($1, $6) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1)) @@ -5466,7 +5467,7 @@ encaps_var_offset: $$ = &ast.ScalarString{ast.Node{}, $1.Value} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5483,7 +5484,7 @@ encaps_var_offset: } // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5507,9 +5508,9 @@ encaps_var_offset: // save position if isInt { - lnumber.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + lnumber.GetNode().Position = position.NewTokensPosition($1, $2) } - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2) + $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5522,8 +5523,8 @@ encaps_var_offset: $$ = &ast.ExprVariable{ast.Node{}, identifier} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1) + identifier.GetNode().Position = position.NewTokenPosition($1) + $$.GetNode().Position = position.NewTokenPosition($1) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5539,7 +5540,7 @@ internal_functions_in_yacc: $$ = &ast.ExprIsset{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $5) + $$.GetNode().Position = position.NewTokensPosition($1, $5) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5557,7 +5558,7 @@ internal_functions_in_yacc: $$ = &ast.ExprEmpty{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5571,7 +5572,7 @@ internal_functions_in_yacc: $$ = &ast.ExprInclude{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5583,7 +5584,7 @@ internal_functions_in_yacc: $$ = &ast.ExprIncludeOnce{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5595,7 +5596,7 @@ internal_functions_in_yacc: $$ = &ast.ExprEval{ast.Node{}, $3} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4) + $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5609,7 +5610,7 @@ internal_functions_in_yacc: $$ = &ast.ExprRequire{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) @@ -5621,7 +5622,7 @@ internal_functions_in_yacc: $$ = &ast.ExprRequireOnce{ast.Node{}, $2} // save position - $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2) + $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) diff --git a/internal/position/position.go b/internal/position/position.go new file mode 100644 index 0000000..cbcc309 --- /dev/null +++ b/internal/position/position.go @@ -0,0 +1,204 @@ +package position + +import ( + "github.com/z7zmey/php-parser/internal/scanner" + "github.com/z7zmey/php-parser/pkg/ast" + "github.com/z7zmey/php-parser/pkg/position" +) + +type startPos struct { + startLine int + startPos int +} + +type endPos struct { + endLine int + endPos int +} + +func getListStartPos(l []ast.Vertex) startPos { + if l == nil { + return startPos{-1, -1} + } + + if len(l) == 0 { + return startPos{-1, -1} + } + + return getNodeStartPos(l[0]) +} + +func getNodeStartPos(n ast.Vertex) startPos { + sl := -1 + sp := -1 + + if n == nil { + return startPos{-1, -1} + } + + p := n.GetNode().Position + if p != nil { + sl = p.StartLine + sp = p.StartPos + } + + return startPos{sl, sp} +} + +func getListEndPos(l []ast.Vertex) endPos { + if l == nil { + return endPos{-1, -1} + } + + if len(l) == 0 { + return endPos{-1, -1} + } + + return getNodeEndPos(l[len(l)-1]) +} + +func getNodeEndPos(n ast.Vertex) endPos { + el := -1 + ep := -1 + + if n == nil { + return endPos{-1, -1} + } + + p := n.GetNode().Position + if p != nil { + el = p.EndLine + ep = p.EndPos + } + + return endPos{el, ep} +} + +// NewNodeListPosition returns new Position +func NewNodeListPosition(list []ast.Vertex) *position.Position { + return &position.Position{ + StartLine: getListStartPos(list).startLine, + EndLine: getListEndPos(list).endLine, + StartPos: getListStartPos(list).startPos, + EndPos: getListEndPos(list).endPos, + } +} + +// NewNodePosition returns new Position +func NewNodePosition(n ast.Vertex) *position.Position { + return &position.Position{ + StartLine: getNodeStartPos(n).startLine, + EndLine: getNodeEndPos(n).endLine, + StartPos: getNodeStartPos(n).startPos, + EndPos: getNodeEndPos(n).endPos, + } +} + +// NewTokenPosition returns new Position +func NewTokenPosition(t *scanner.Token) *position.Position { + return &position.Position{ + StartLine: t.Position.StartLine, + EndLine: t.Position.EndLine, + StartPos: t.Position.StartPos, + EndPos: t.Position.EndPos, + } +} + +// NewTokensPosition returns new Position +func NewTokensPosition(startToken *scanner.Token, endToken *scanner.Token) *position.Position { + return &position.Position{ + StartLine: startToken.Position.StartLine, + EndLine: endToken.Position.EndLine, + StartPos: startToken.Position.StartPos, + EndPos: endToken.Position.EndPos, + } +} + +// NewTokenNodePosition returns new Position +func NewTokenNodePosition(t *scanner.Token, n ast.Vertex) *position.Position { + return &position.Position{ + StartLine: t.Position.StartLine, + EndLine: getNodeEndPos(n).endLine, + StartPos: t.Position.StartPos, + EndPos: getNodeEndPos(n).endPos, + } +} + +// NewNodeTokenPosition returns new Position +func NewNodeTokenPosition(n ast.Vertex, t *scanner.Token) *position.Position { + return &position.Position{ + StartLine: getNodeStartPos(n).startLine, + EndLine: t.Position.EndLine, + StartPos: getNodeStartPos(n).startPos, + EndPos: t.Position.EndPos, + } +} + +// NewNodesPosition returns new Position +func NewNodesPosition(startNode ast.Vertex, endNode ast.Vertex) *position.Position { + return &position.Position{ + StartLine: getNodeStartPos(startNode).startLine, + EndLine: getNodeEndPos(endNode).endLine, + StartPos: getNodeStartPos(startNode).startPos, + EndPos: getNodeEndPos(endNode).endPos, + } +} + +// NewNodeListTokenPosition returns new Position +func NewNodeListTokenPosition(list []ast.Vertex, t *scanner.Token) *position.Position { + return &position.Position{ + StartLine: getListStartPos(list).startLine, + EndLine: t.Position.EndLine, + StartPos: getListStartPos(list).startPos, + EndPos: t.Position.EndPos, + } +} + +// NewTokenNodeListPosition returns new Position +func NewTokenNodeListPosition(t *scanner.Token, list []ast.Vertex) *position.Position { + return &position.Position{ + StartLine: t.Position.StartLine, + EndLine: getListEndPos(list).endLine, + StartPos: t.Position.StartPos, + EndPos: getListEndPos(list).endPos, + } +} + +// NewNodeNodeListPosition returns new Position +func NewNodeNodeListPosition(n ast.Vertex, list []ast.Vertex) *position.Position { + return &position.Position{ + StartLine: getNodeStartPos(n).startLine, + EndLine: getListEndPos(list).endLine, + StartPos: getNodeStartPos(n).startPos, + EndPos: getListEndPos(list).endPos, + } +} + +// NewNodeListNodePosition returns new Position +func NewNodeListNodePosition(list []ast.Vertex, n ast.Vertex) *position.Position { + return &position.Position{ + StartLine: getListStartPos(list).startLine, + EndLine: getNodeEndPos(n).endLine, + StartPos: getListStartPos(list).startPos, + EndPos: getNodeEndPos(n).endPos, + } +} + +// NewOptionalListTokensPosition returns new Position +func NewOptionalListTokensPosition(list []ast.Vertex, t *scanner.Token, endToken *scanner.Token) *position.Position { + if list == nil { + return &position.Position{ + StartLine: t.Position.StartLine, + EndLine: endToken.Position.EndLine, + StartPos: t.Position.StartPos, + EndPos: endToken.Position.EndPos, + } + } + + return &position.Position{ + StartLine: getListStartPos(list).startLine, + EndLine: endToken.Position.EndLine, + StartPos: getListStartPos(list).startPos, + EndPos: endToken.Position.EndPos, + } +} diff --git a/internal/positionbuilder/position_builder_test.go b/internal/position/position_test.go similarity index 90% rename from internal/positionbuilder/position_builder_test.go rename to internal/position/position_test.go index 24652d9..f932f2d 100644 --- a/internal/positionbuilder/position_builder_test.go +++ b/internal/position/position_test.go @@ -1,18 +1,16 @@ -package positionbuilder_test +package position_test import ( "gotest.tools/assert" "testing" - "github.com/z7zmey/php-parser/internal/positionbuilder" + builder "github.com/z7zmey/php-parser/internal/position" "github.com/z7zmey/php-parser/internal/scanner" "github.com/z7zmey/php-parser/pkg/ast" "github.com/z7zmey/php-parser/pkg/position" ) func TestNewTokenPosition(t *testing.T) { - builder := positionbuilder.PositionBuilder{} - tkn := &scanner.Token{ Value: []byte(`foo`), Position: position.Position{ @@ -31,8 +29,6 @@ func TestNewTokenPosition(t *testing.T) { } func TestNewTokensPosition(t *testing.T) { - builder := positionbuilder.PositionBuilder{} - token1 := &scanner.Token{ Value: []byte(`foo`), Position: position.Position{ @@ -69,8 +65,6 @@ func TestNewNodePosition(t *testing.T) { }, } - builder := positionbuilder.PositionBuilder{} - pos := builder.NewNodePosition(n) assert.DeepEqual(t, &position.Position{1, 1, 0, 3}, pos) @@ -97,8 +91,6 @@ func TestNewTokenNodePosition(t *testing.T) { }, } - builder := positionbuilder.PositionBuilder{} - pos := builder.NewTokenNodePosition(tkn, n) assert.DeepEqual(t, &position.Position{1, 2, 0, 12}, pos) @@ -126,8 +118,6 @@ func TestNewNodeTokenPosition(t *testing.T) { }, } - builder := positionbuilder.PositionBuilder{} - pos := builder.NewNodeTokenPosition(n, tkn) assert.DeepEqual(t, &position.Position{1, 2, 0, 12}, pos) @@ -156,8 +146,6 @@ func TestNewNodeListPosition(t *testing.T) { }, } - builder := positionbuilder.PositionBuilder{} - pos := builder.NewNodeListPosition([]ast.Vertex{n1, n2}) assert.DeepEqual(t, &position.Position{1, 2, 0, 19}, pos) @@ -186,8 +174,6 @@ func TestNewNodesPosition(t *testing.T) { }, } - builder := positionbuilder.PositionBuilder{} - pos := builder.NewNodesPosition(n1, n2) assert.DeepEqual(t, &position.Position{1, 2, 0, 19}, pos) @@ -226,8 +212,6 @@ func TestNewNodeListTokenPosition(t *testing.T) { }, } - builder := positionbuilder.PositionBuilder{} - pos := builder.NewNodeListTokenPosition([]ast.Vertex{n1, n2}, tkn) assert.DeepEqual(t, &position.Position{1, 3, 0, 22}, pos) @@ -266,8 +250,6 @@ func TestNewTokenNodeListPosition(t *testing.T) { }, } - builder := positionbuilder.PositionBuilder{} - pos := builder.NewTokenNodeListPosition(tkn, []ast.Vertex{n1, n2}) assert.DeepEqual(t, &position.Position{1, 3, 0, 20}, pos) @@ -307,8 +289,6 @@ func TestNewNodeNodeListPosition(t *testing.T) { }, } - builder := positionbuilder.PositionBuilder{} - pos := builder.NewNodeNodeListPosition(n1, []ast.Vertex{n2, n3}) assert.DeepEqual(t, &position.Position{1, 3, 0, 26}, pos) @@ -346,16 +326,12 @@ func TestNewNodeListNodePosition(t *testing.T) { }, } - builder := positionbuilder.PositionBuilder{} - pos := builder.NewNodeListNodePosition([]ast.Vertex{n1, n2}, n3) assert.DeepEqual(t, &position.Position{1, 3, 0, 26}, pos) } func TestNewOptionalListTokensPosition(t *testing.T) { - builder := positionbuilder.PositionBuilder{} - token1 := &scanner.Token{ Value: []byte(`foo`), Position: position.Position{ @@ -402,8 +378,6 @@ func TestNewOptionalListTokensPosition2(t *testing.T) { }, } - builder := positionbuilder.PositionBuilder{} - token1 := &scanner.Token{ Value: []byte(`foo`), Position: position.Position{ @@ -429,8 +403,6 @@ func TestNewOptionalListTokensPosition2(t *testing.T) { } func TestNilNodePos(t *testing.T) { - builder := positionbuilder.PositionBuilder{} - pos := builder.NewNodesPosition(nil, nil) assert.DeepEqual(t, &position.Position{-1, -1, -1, -1}, pos) @@ -448,8 +420,6 @@ func TestNilNodeListPos(t *testing.T) { }, } - builder := positionbuilder.PositionBuilder{} - pos := builder.NewNodeNodeListPosition(n1, nil) assert.DeepEqual(t, &position.Position{1, -1, 0, -1}, pos) @@ -466,8 +436,6 @@ func TestNilNodeListTokenPos(t *testing.T) { }, } - builder := positionbuilder.PositionBuilder{} - pos := builder.NewNodeListTokenPosition(nil, token) assert.DeepEqual(t, &position.Position{-1, 1, -1, 3}, pos) @@ -485,8 +453,6 @@ func TestEmptyNodeListPos(t *testing.T) { }, } - builder := positionbuilder.PositionBuilder{} - pos := builder.NewNodeNodeListPosition(n1, []ast.Vertex{}) assert.DeepEqual(t, &position.Position{1, -1, 0, -1}, pos) @@ -503,8 +469,6 @@ func TestEmptyNodeListTokenPos(t *testing.T) { }, } - builder := positionbuilder.PositionBuilder{} - pos := builder.NewNodeListTokenPosition([]ast.Vertex{}, token) assert.DeepEqual(t, &position.Position{-1, 1, -1, 3}, pos) diff --git a/internal/positionbuilder/position_builder.go b/internal/positionbuilder/position_builder.go deleted file mode 100644 index 4f69393..0000000 --- a/internal/positionbuilder/position_builder.go +++ /dev/null @@ -1,207 +0,0 @@ -package positionbuilder - -import ( - "github.com/z7zmey/php-parser/internal/scanner" - "github.com/z7zmey/php-parser/pkg/ast" - "github.com/z7zmey/php-parser/pkg/position" -) - -// PositionBuilder provide functions to constuct positions -type PositionBuilder struct{} - -type startPos struct { - startLine int - startPos int -} - -type endPos struct { - endLine int - endPos int -} - -func (b *PositionBuilder) getListStartPos(l []ast.Vertex) startPos { - if l == nil { - return startPos{-1, -1} - } - - if len(l) == 0 { - return startPos{-1, -1} - } - - return b.getNodeStartPos(l[0]) -} - -func (b *PositionBuilder) getNodeStartPos(n ast.Vertex) startPos { - sl := -1 - sp := -1 - - if n == nil { - return startPos{-1, -1} - } - - p := n.GetNode().Position - if p != nil { - sl = p.StartLine - sp = p.StartPos - } - - return startPos{sl, sp} -} - -func (b *PositionBuilder) getListEndPos(l []ast.Vertex) endPos { - if l == nil { - return endPos{-1, -1} - } - - if len(l) == 0 { - return endPos{-1, -1} - } - - return b.getNodeEndPos(l[len(l)-1]) -} - -func (b *PositionBuilder) getNodeEndPos(n ast.Vertex) endPos { - el := -1 - ep := -1 - - if n == nil { - return endPos{-1, -1} - } - - p := n.GetNode().Position - if p != nil { - el = p.EndLine - ep = p.EndPos - } - - return endPos{el, ep} -} - -// NewNodeListPosition returns new Position -func (b *PositionBuilder) NewNodeListPosition(list []ast.Vertex) *position.Position { - return &position.Position{ - StartLine: b.getListStartPos(list).startLine, - EndLine: b.getListEndPos(list).endLine, - StartPos: b.getListStartPos(list).startPos, - EndPos: b.getListEndPos(list).endPos, - } -} - -// NewNodePosition returns new Position -func (b *PositionBuilder) NewNodePosition(n ast.Vertex) *position.Position { - return &position.Position{ - StartLine: b.getNodeStartPos(n).startLine, - EndLine: b.getNodeEndPos(n).endLine, - StartPos: b.getNodeStartPos(n).startPos, - EndPos: b.getNodeEndPos(n).endPos, - } -} - -// NewTokenPosition returns new Position -func (b *PositionBuilder) NewTokenPosition(t *scanner.Token) *position.Position { - return &position.Position{ - StartLine: t.Position.StartLine, - EndLine: t.Position.EndLine, - StartPos: t.Position.StartPos, - EndPos: t.Position.EndPos, - } -} - -// NewTokensPosition returns new Position -func (b *PositionBuilder) NewTokensPosition(startToken *scanner.Token, endToken *scanner.Token) *position.Position { - return &position.Position{ - StartLine: startToken.Position.StartLine, - EndLine: endToken.Position.EndLine, - StartPos: startToken.Position.StartPos, - EndPos: endToken.Position.EndPos, - } -} - -// NewTokenNodePosition returns new Position -func (b *PositionBuilder) NewTokenNodePosition(t *scanner.Token, n ast.Vertex) *position.Position { - return &position.Position{ - StartLine: t.Position.StartLine, - EndLine: b.getNodeEndPos(n).endLine, - StartPos: t.Position.StartPos, - EndPos: b.getNodeEndPos(n).endPos, - } -} - -// NewNodeTokenPosition returns new Position -func (b *PositionBuilder) NewNodeTokenPosition(n ast.Vertex, t *scanner.Token) *position.Position { - return &position.Position{ - StartLine: b.getNodeStartPos(n).startLine, - EndLine: t.Position.EndLine, - StartPos: b.getNodeStartPos(n).startPos, - EndPos: t.Position.EndPos, - } -} - -// NewNodesPosition returns new Position -func (b *PositionBuilder) NewNodesPosition(startNode ast.Vertex, endNode ast.Vertex) *position.Position { - return &position.Position{ - StartLine: b.getNodeStartPos(startNode).startLine, - EndLine: b.getNodeEndPos(endNode).endLine, - StartPos: b.getNodeStartPos(startNode).startPos, - EndPos: b.getNodeEndPos(endNode).endPos, - } -} - -// NewNodeListTokenPosition returns new Position -func (b *PositionBuilder) NewNodeListTokenPosition(list []ast.Vertex, t *scanner.Token) *position.Position { - return &position.Position{ - StartLine: b.getListStartPos(list).startLine, - EndLine: t.Position.EndLine, - StartPos: b.getListStartPos(list).startPos, - EndPos: t.Position.EndPos, - } -} - -// NewTokenNodeListPosition returns new Position -func (b *PositionBuilder) NewTokenNodeListPosition(t *scanner.Token, list []ast.Vertex) *position.Position { - return &position.Position{ - StartLine: t.Position.StartLine, - EndLine: b.getListEndPos(list).endLine, - StartPos: t.Position.StartPos, - EndPos: b.getListEndPos(list).endPos, - } -} - -// NewNodeNodeListPosition returns new Position -func (b *PositionBuilder) NewNodeNodeListPosition(n ast.Vertex, list []ast.Vertex) *position.Position { - return &position.Position{ - StartLine: b.getNodeStartPos(n).startLine, - EndLine: b.getListEndPos(list).endLine, - StartPos: b.getNodeStartPos(n).startPos, - EndPos: b.getListEndPos(list).endPos, - } -} - -// NewNodeListNodePosition returns new Position -func (b *PositionBuilder) NewNodeListNodePosition(list []ast.Vertex, n ast.Vertex) *position.Position { - return &position.Position{ - StartLine: b.getListStartPos(list).startLine, - EndLine: b.getNodeEndPos(n).endLine, - StartPos: b.getListStartPos(list).startPos, - EndPos: b.getNodeEndPos(n).endPos, - } -} - -// NewOptionalListTokensPosition returns new Position -func (b *PositionBuilder) NewOptionalListTokensPosition(list []ast.Vertex, t *scanner.Token, endToken *scanner.Token) *position.Position { - if list == nil { - return &position.Position{ - StartLine: t.Position.StartLine, - EndLine: endToken.Position.EndLine, - StartPos: t.Position.StartPos, - EndPos: endToken.Position.EndPos, - } - } - - return &position.Position{ - StartLine: b.getListStartPos(list).startLine, - EndLine: endToken.Position.EndLine, - StartPos: b.getListStartPos(list).startPos, - EndPos: endToken.Position.EndPos, - } -}