From 7eff83624ea2b9cb045ddaf46106aa6645f53a74 Mon Sep 17 00:00:00 2001 From: Vadym Slizov Date: Mon, 29 Jun 2020 14:38:10 +0300 Subject: [PATCH] [refactoring] internal position package --- internal/php5/parser.go | 13 +- internal/php5/php5.go | 2043 +++++++++-------- internal/php5/php5.y | 1005 ++++---- internal/php7/parser.go | 13 +- internal/php7/php7.go | 1703 +++++++------- internal/php7/php7.y | 719 +++--- internal/position/position.go | 204 ++ .../position_test.go} | 40 +- internal/positionbuilder/position_builder.go | 207 -- 9 files changed, 2953 insertions(+), 2994 deletions(-) create mode 100644 internal/position/position.go rename internal/{positionbuilder/position_builder_test.go => position/position_test.go} (90%) delete mode 100644 internal/positionbuilder/position_builder.go 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 --- a/internal/php5/php5.go +++ b/internal/php5/php5.go @@ -11,12 +11,13 @@ import ( "bytes" "strconv" + "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" ) -// line internal/php5/php5.y:15 +// line internal/php5/php5.y:16 type yySymType struct { yys int node ast.Vertex @@ -346,7 +347,7 @@ const yyEofCode = 1 const yyErrCode = 2 const yyInitialStackSize = 16 -// line internal/php5/php5.y:7193 +// line internal/php5/php5.y:7194 type simpleIndirectReference struct { all []*ast.ExprVariable @@ -2315,10 +2316,10 @@ yydefault: case 1: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:276 + // line internal/php5/php5.y:277 { yylex.(*Parser).rootNode = &ast.Root{ast.Node{}, yyDollar[1].list} - yylex.(*Parser).rootNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) + yylex.(*Parser).rootNode.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) yylex.(*Parser).setFreeFloating(yylex.(*Parser).rootNode, token.End, yylex.(*Parser).currentToken.Hidden) @@ -2326,7 +2327,7 @@ yydefault: } case 2: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:288 + // line internal/php5/php5.y:289 { if inlineHtmlNode, ok := yyDollar[2].node.(*ast.StmtInlineHtml); ok && len(yyDollar[1].list) > 0 { prevNode := lastNode(yyDollar[1].list) @@ -2341,7 +2342,7 @@ yydefault: } case 3: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:301 + // line internal/php5/php5.y:302 { yyVAL.list = []ast.Vertex{} @@ -2349,13 +2350,13 @@ yydefault: } case 4: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:310 + // line internal/php5/php5.y:311 { namePart := &ast.NameNamePart{ast.Node{}, yyDollar[1].token.Value} yyVAL.list = []ast.Vertex{namePart} // save position - namePart.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + namePart.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(namePart, token.Start, yyDollar[1].token.Hidden) @@ -2364,13 +2365,13 @@ yydefault: } case 5: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:323 + // line internal/php5/php5.y:324 { namePart := &ast.NameNamePart{ast.Node{}, yyDollar[3].token.Value} yyVAL.list = append(yyDollar[1].list, namePart) // save position - namePart.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) + namePart.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(lastNode(yyDollar[1].list), token.End, yyDollar[2].token.Hidden) @@ -2380,7 +2381,7 @@ yydefault: } case 6: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:340 + // line internal/php5/php5.y:341 { // error yyVAL.node = nil @@ -2389,7 +2390,7 @@ yydefault: } case 7: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:347 + // line internal/php5/php5.y:348 { yyVAL.node = yyDollar[1].node @@ -2397,7 +2398,7 @@ yydefault: } case 8: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:353 + // line internal/php5/php5.y:354 { yyVAL.node = yyDollar[1].node @@ -2405,7 +2406,7 @@ yydefault: } case 9: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:359 + // line internal/php5/php5.y:360 { yyVAL.node = yyDollar[1].node @@ -2413,12 +2414,12 @@ yydefault: } case 10: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:365 + // line internal/php5/php5.y:366 { yyVAL.node = &ast.StmtHaltCompiler{ast.Node{}} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2431,14 +2432,14 @@ yydefault: } case 11: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:381 + // line internal/php5/php5.y:382 { name := &ast.NameName{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtNamespace{ast.Node{}, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2450,14 +2451,14 @@ yydefault: } case 12: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:398 + // line internal/php5/php5.y:399 { name := &ast.NameName{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtNamespace{ast.Node{}, name, yyDollar[4].list} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[5].token) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[5].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2469,12 +2470,12 @@ yydefault: } case 13: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:415 + // line internal/php5/php5.y:416 { yyVAL.node = &ast.StmtNamespace{ast.Node{}, nil, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2485,12 +2486,12 @@ yydefault: } case 14: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:429 + // line internal/php5/php5.y:430 { yyVAL.node = &ast.StmtUseList{ast.Node{}, nil, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2501,14 +2502,14 @@ yydefault: } case 15: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:443 + // line internal/php5/php5.y:444 { useType := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} yyVAL.node = &ast.StmtUseList{ast.Node{}, useType, yyDollar[3].list} // save position - useType.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + useType.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2520,14 +2521,14 @@ yydefault: } case 16: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:460 + // line internal/php5/php5.y:461 { useType := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} yyVAL.node = &ast.StmtUseList{ast.Node{}, useType, yyDollar[3].list} // save position - useType.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + useType.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2539,12 +2540,12 @@ yydefault: } case 17: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:477 + // line internal/php5/php5.y:478 { yyVAL.node = yyDollar[1].node // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Stmts, yyDollar[2].token.Hidden) @@ -2554,7 +2555,7 @@ yydefault: } case 18: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:493 + // line internal/php5/php5.y:494 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -2565,7 +2566,7 @@ yydefault: } case 19: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:502 + // line internal/php5/php5.y:503 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -2573,14 +2574,14 @@ yydefault: } case 20: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:511 + // line internal/php5/php5.y:512 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} yyVAL.node = &ast.StmtUse{ast.Node{}, nil, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) + yyVAL.node.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], yyVAL.node) @@ -2589,16 +2590,16 @@ yydefault: } case 21: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:525 + // line internal/php5/php5.y:526 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} alias := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.StmtUse{ast.Node{}, nil, name, alias} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[3].token) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) + alias.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[3].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], yyVAL.node) @@ -2609,14 +2610,14 @@ yydefault: } case 22: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:543 + // line internal/php5/php5.y:544 { name := &ast.NameName{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtUse{ast.Node{}, nil, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2627,16 +2628,16 @@ yydefault: } case 23: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:559 + // line internal/php5/php5.y:560 { name := &ast.NameName{ast.Node{}, yyDollar[2].list} alias := &ast.Identifier{ast.Node{}, yyDollar[4].token.Value} yyVAL.node = &ast.StmtUse{ast.Node{}, nil, name, alias} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition(yyDollar[2].list, yyDollar[4].token) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + alias.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeListTokenPosition(yyDollar[2].list, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2649,7 +2650,7 @@ yydefault: } case 24: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:582 + // line internal/php5/php5.y:583 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -2660,7 +2661,7 @@ yydefault: } case 25: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:591 + // line internal/php5/php5.y:592 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -2668,14 +2669,14 @@ yydefault: } case 26: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:600 + // line internal/php5/php5.y:601 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} yyVAL.node = &ast.StmtUse{ast.Node{}, nil, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) + yyVAL.node.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], yyVAL.node) @@ -2684,16 +2685,16 @@ yydefault: } case 27: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:614 + // line internal/php5/php5.y:615 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} alias := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.StmtUse{ast.Node{}, nil, name, alias} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[3].token) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) + alias.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[3].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], yyVAL.node) @@ -2704,14 +2705,14 @@ yydefault: } case 28: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:632 + // line internal/php5/php5.y:633 { name := &ast.NameName{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtUse{ast.Node{}, nil, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2722,16 +2723,16 @@ yydefault: } case 29: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:648 + // line internal/php5/php5.y:649 { name := &ast.NameName{ast.Node{}, yyDollar[2].list} alias := &ast.Identifier{ast.Node{}, yyDollar[4].token.Value} yyVAL.node = &ast.StmtUse{ast.Node{}, nil, name, alias} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition(yyDollar[2].list, yyDollar[4].token) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + alias.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeListTokenPosition(yyDollar[2].list, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2744,7 +2745,7 @@ yydefault: } case 30: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:671 + // line internal/php5/php5.y:672 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -2755,7 +2756,7 @@ yydefault: } case 31: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:680 + // line internal/php5/php5.y:681 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -2763,14 +2764,14 @@ yydefault: } case 32: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:689 + // line internal/php5/php5.y:690 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} yyVAL.node = &ast.StmtUse{ast.Node{}, nil, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) + yyVAL.node.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], yyVAL.node) @@ -2779,16 +2780,16 @@ yydefault: } case 33: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:703 + // line internal/php5/php5.y:704 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} alias := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.StmtUse{ast.Node{}, nil, name, alias} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[3].token) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) + alias.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[3].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], yyVAL.node) @@ -2799,14 +2800,14 @@ yydefault: } case 34: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:721 + // line internal/php5/php5.y:722 { name := &ast.NameName{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtUse{ast.Node{}, nil, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2817,16 +2818,16 @@ yydefault: } case 35: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:737 + // line internal/php5/php5.y:738 { name := &ast.NameName{ast.Node{}, yyDollar[2].list} alias := &ast.Identifier{ast.Node{}, yyDollar[4].token.Value} yyVAL.node = &ast.StmtUse{ast.Node{}, nil, name, alias} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition(yyDollar[2].list, yyDollar[4].token) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + alias.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeListTokenPosition(yyDollar[2].list, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2839,7 +2840,7 @@ yydefault: } case 36: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:760 + // line internal/php5/php5.y:761 { name := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} constant := &ast.StmtConstant{ast.Node{}, name, yyDollar[5].node} @@ -2849,9 +2850,9 @@ yydefault: yyVAL.node = yyDollar[1].node // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - constant.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[3].token, yyDollar[5].node) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeNodeListPosition(yyDollar[1].node, constList.Consts) + name.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + constant.GetNode().Position = position.NewTokenNodePosition(yyDollar[3].token, yyDollar[5].node) + yyVAL.node.GetNode().Position = position.NewNodeNodeListPosition(yyDollar[1].node, constList.Consts) // save comments yylex.(*Parser).setFreeFloating(lastConst, token.End, yyDollar[2].token.Hidden) @@ -2862,7 +2863,7 @@ yydefault: } case 37: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:781 + // line internal/php5/php5.y:782 { name := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} constant := &ast.StmtConstant{ast.Node{}, name, yyDollar[4].node} @@ -2870,9 +2871,9 @@ yydefault: yyVAL.node = &ast.StmtConstList{ast.Node{}, constList} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - constant.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[2].token, yyDollar[4].node) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, constList) + name.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + constant.GetNode().Position = position.NewTokenNodePosition(yyDollar[2].token, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, constList) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2883,7 +2884,7 @@ yydefault: } case 38: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:803 + // line internal/php5/php5.y:804 { if inlineHtmlNode, ok := yyDollar[2].node.(*ast.StmtInlineHtml); ok && len(yyDollar[1].list) > 0 { prevNode := lastNode(yyDollar[1].list) @@ -2898,7 +2899,7 @@ yydefault: } case 39: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:816 + // line internal/php5/php5.y:817 { yyVAL.list = []ast.Vertex{} @@ -2906,7 +2907,7 @@ yydefault: } case 40: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:826 + // line internal/php5/php5.y:827 { // error yyVAL.node = nil @@ -2915,7 +2916,7 @@ yydefault: } case 41: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:833 + // line internal/php5/php5.y:834 { yyVAL.node = yyDollar[1].node @@ -2923,7 +2924,7 @@ yydefault: } case 42: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:839 + // line internal/php5/php5.y:840 { yyVAL.node = yyDollar[1].node @@ -2931,7 +2932,7 @@ yydefault: } case 43: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:845 + // line internal/php5/php5.y:846 { yyVAL.node = yyDollar[1].node @@ -2939,12 +2940,12 @@ yydefault: } case 44: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:851 + // line internal/php5/php5.y:852 { yyVAL.node = &ast.StmtHaltCompiler{ast.Node{}} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2957,7 +2958,7 @@ yydefault: } case 45: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:871 + // line internal/php5/php5.y:872 { yyVAL.node = yyDollar[1].node @@ -2965,14 +2966,14 @@ yydefault: } case 46: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:877 + // line internal/php5/php5.y:878 { label := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} yyVAL.node = &ast.StmtLabel{ast.Node{}, label} // save position - label.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + label.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2982,12 +2983,12 @@ yydefault: } case 47: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:895 + // line internal/php5/php5.y:896 { yyVAL.node = &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2997,17 +2998,17 @@ yydefault: } case 48: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:908 + // line internal/php5/php5.y:909 { yyVAL.node = &ast.StmtIf{ast.Node{}, yyDollar[2].node, yyDollar[3].node, yyDollar[4].list, yyDollar[5].node} // save position if yyDollar[5].node != nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node) } else if len(yyDollar[4].list) > 0 { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[4].list) + yyVAL.node.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[4].list) } else { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) } // save comments @@ -3025,14 +3026,14 @@ yydefault: } case 49: yyDollar = yyS[yypt-8 : yypt+1] - // line internal/php5/php5.y:932 + // line internal/php5/php5.y:933 { stmts := &ast.StmtStmtList{ast.Node{}, yyDollar[4].list} yyVAL.node = &ast.StmtAltIf{ast.Node{}, yyDollar[2].node, stmts, yyDollar[5].list, yyDollar[6].node} // save position - stmts.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[4].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[8].token) + stmts.GetNode().Position = position.NewNodeListPosition(yyDollar[4].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[8].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3053,7 +3054,7 @@ yydefault: } case 50: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:956 + // line internal/php5/php5.y:957 { switch n := yyDollar[3].node.(type) { case *ast.StmtWhile: @@ -3065,7 +3066,7 @@ yydefault: yyVAL.node = yyDollar[3].node // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3082,12 +3083,12 @@ yydefault: } case 51: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:981 + // line internal/php5/php5.y:982 { yyVAL.node = &ast.StmtDo{ast.Node{}, yyDollar[2].node, yyDollar[4].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[5].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[5].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3107,7 +3108,7 @@ yydefault: } case 52: yyDollar = yyS[yypt-9 : yypt+1] - // line internal/php5/php5.y:1002 + // line internal/php5/php5.y:1003 { switch n := yyDollar[9].node.(type) { case *ast.StmtFor: @@ -3123,7 +3124,7 @@ yydefault: yyVAL.node = yyDollar[9].node // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[9].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[9].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3136,7 +3137,7 @@ yydefault: } case 53: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:1029 + // line internal/php5/php5.y:1030 { switch n := yyDollar[3].node.(type) { case *ast.StmtSwitch: @@ -3150,7 +3151,7 @@ yydefault: yyVAL.node = yyDollar[3].node // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3167,12 +3168,12 @@ yydefault: } case 54: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:1056 + // line internal/php5/php5.y:1057 { yyVAL.node = &ast.StmtBreak{ast.Node{}, nil} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3183,12 +3184,12 @@ yydefault: } case 55: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:1070 + // line internal/php5/php5.y:1071 { yyVAL.node = &ast.StmtBreak{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3199,12 +3200,12 @@ yydefault: } case 56: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:1084 + // line internal/php5/php5.y:1085 { yyVAL.node = &ast.StmtContinue{ast.Node{}, nil} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3215,12 +3216,12 @@ yydefault: } case 57: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:1098 + // line internal/php5/php5.y:1099 { yyVAL.node = &ast.StmtContinue{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3231,12 +3232,12 @@ yydefault: } case 58: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:1112 + // line internal/php5/php5.y:1113 { yyVAL.node = &ast.StmtReturn{ast.Node{}, nil} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3247,12 +3248,12 @@ yydefault: } case 59: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:1126 + // line internal/php5/php5.y:1127 { yyVAL.node = &ast.StmtReturn{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3263,12 +3264,12 @@ yydefault: } case 60: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:1140 + // line internal/php5/php5.y:1141 { yyVAL.node = &ast.StmtReturn{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3279,12 +3280,12 @@ yydefault: } case 61: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:1154 + // line internal/php5/php5.y:1155 { yyVAL.node = &ast.StmtExpression{ast.Node{}, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -3295,12 +3296,12 @@ yydefault: } case 62: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:1168 + // line internal/php5/php5.y:1169 { yyVAL.node = &ast.StmtGlobal{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3311,12 +3312,12 @@ yydefault: } case 63: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:1182 + // line internal/php5/php5.y:1183 { yyVAL.node = &ast.StmtStatic{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3327,12 +3328,12 @@ yydefault: } case 64: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:1196 + // line internal/php5/php5.y:1197 { yyVAL.node = &ast.StmtEcho{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3344,12 +3345,12 @@ yydefault: } case 65: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1211 + // line internal/php5/php5.y:1212 { yyVAL.node = &ast.StmtInlineHtml{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3358,12 +3359,12 @@ yydefault: } case 66: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:1223 + // line internal/php5/php5.y:1224 { yyVAL.node = &ast.StmtExpression{ast.Node{}, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -3374,12 +3375,12 @@ yydefault: } case 67: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:1237 + // line internal/php5/php5.y:1238 { yyVAL.node = &ast.StmtUnset{ast.Node{}, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[5].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[5].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3392,7 +3393,7 @@ yydefault: } case 68: yyDollar = yyS[yypt-8 : yypt+1] - // line internal/php5/php5.y:1253 + // line internal/php5/php5.y:1254 { if yyDollar[6].node == nil { switch n := yyDollar[8].node.(type) { @@ -3419,7 +3420,7 @@ yydefault: yyVAL.node = yyDollar[8].node // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[8].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[8].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3435,7 +3436,7 @@ yydefault: } case 69: yyDollar = yyS[yypt-8 : yypt+1] - // line internal/php5/php5.y:1293 + // line internal/php5/php5.y:1294 { if yyDollar[6].node == nil { switch n := yyDollar[8].node.(type) { @@ -3462,7 +3463,7 @@ yydefault: // save position yyVAL.node = yyDollar[8].node - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[8].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[8].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3478,13 +3479,13 @@ yydefault: } case 70: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:1333 + // line internal/php5/php5.y:1334 { yyVAL.node = yyDollar[5].node yyVAL.node.(*ast.StmtDeclare).Consts = yyDollar[3].list // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3495,12 +3496,12 @@ yydefault: } case 71: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1348 + // line internal/php5/php5.y:1349 { yyVAL.node = &ast.StmtNop{ast.Node{}} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3510,15 +3511,15 @@ yydefault: } case 72: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php5/php5.y:1361 + // line internal/php5/php5.y:1362 { yyVAL.node = &ast.StmtTry{ast.Node{}, yyDollar[3].list, yyDollar[5].list, yyDollar[6].node} // save position if yyDollar[6].node == nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[5].list) + yyVAL.node.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[5].list) } else { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[6].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[6].node) } // save comments @@ -3530,12 +3531,12 @@ yydefault: } case 73: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:1379 + // line internal/php5/php5.y:1380 { yyVAL.node = &ast.StmtThrow{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3546,14 +3547,14 @@ yydefault: } case 74: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:1393 + // line internal/php5/php5.y:1394 { label := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} yyVAL.node = &ast.StmtGoto{ast.Node{}, label} // save position - label.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + label.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3565,7 +3566,7 @@ yydefault: } case 75: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:1413 + // line internal/php5/php5.y:1414 { yyVAL.list = []ast.Vertex{} @@ -3573,7 +3574,7 @@ yydefault: } case 76: yyDollar = yyS[yypt-9 : yypt+1] - // line internal/php5/php5.y:1419 + // line internal/php5/php5.y:1420 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[4].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -3581,9 +3582,9 @@ yydefault: yyVAL.list = append([]ast.Vertex{catchNode}, yyDollar[9].list...) // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) - catchNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[8].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) + catchNode.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[8].token) // save comments yylex.(*Parser).setFreeFloating(catchNode, token.Start, yyDollar[1].token.Hidden) @@ -3598,7 +3599,7 @@ yydefault: } case 77: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:1445 + // line internal/php5/php5.y:1446 { yyVAL.node = nil @@ -3606,12 +3607,12 @@ yydefault: } case 78: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:1451 + // line internal/php5/php5.y:1452 { yyVAL.node = &ast.StmtFinally{ast.Node{}, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3622,7 +3623,7 @@ yydefault: } case 79: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1468 + // line internal/php5/php5.y:1469 { yyVAL.list = yyDollar[1].list @@ -3630,7 +3631,7 @@ yydefault: } case 80: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:1474 + // line internal/php5/php5.y:1475 { yyVAL.list = []ast.Vertex{} @@ -3638,7 +3639,7 @@ yydefault: } case 81: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1483 + // line internal/php5/php5.y:1484 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3646,7 +3647,7 @@ yydefault: } case 82: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:1489 + // line internal/php5/php5.y:1490 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) @@ -3654,16 +3655,16 @@ yydefault: } case 83: yyDollar = yyS[yypt-8 : yypt+1] - // line internal/php5/php5.y:1498 + // line internal/php5/php5.y:1499 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[4].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} yyVAL.node = &ast.StmtCatch{ast.Node{}, []ast.Vertex{yyDollar[3].node}, variable, yyDollar[7].list} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[8].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[8].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3678,7 +3679,7 @@ yydefault: } case 84: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1523 + // line internal/php5/php5.y:1524 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3686,7 +3687,7 @@ yydefault: } case 85: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:1529 + // line internal/php5/php5.y:1530 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -3697,7 +3698,7 @@ yydefault: } case 86: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1541 + // line internal/php5/php5.y:1542 { yyVAL.node = yyDollar[1].node @@ -3705,7 +3706,7 @@ yydefault: } case 87: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1550 + // line internal/php5/php5.y:1551 { yyVAL.node = yyDollar[1].node @@ -3713,7 +3714,7 @@ yydefault: } case 88: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1559 + // line internal/php5/php5.y:1560 { yyVAL.node = yyDollar[1].node @@ -3721,38 +3722,38 @@ yydefault: } case 89: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:1568 + // line internal/php5/php5.y:1569 { yyVAL.token = nil } case 90: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1572 + // line internal/php5/php5.y:1573 { yyVAL.token = yyDollar[1].token } case 91: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:1579 + // line internal/php5/php5.y:1580 { yyVAL.token = nil } case 92: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1583 + // line internal/php5/php5.y:1584 { yyVAL.token = yyDollar[1].token } case 93: yyDollar = yyS[yypt-9 : yypt+1] - // line internal/php5/php5.y:1590 + // line internal/php5/php5.y:1591 { name := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.StmtFunction{ast.Node{}, yyDollar[2].token != nil, name, yyDollar[5].list, nil, yyDollar[8].list} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[9].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[9].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3771,7 +3772,7 @@ yydefault: } case 94: yyDollar = yyS[yypt-7 : yypt+1] - // line internal/php5/php5.y:1617 + // line internal/php5/php5.y:1618 { name := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} switch n := yyDollar[1].node.(type) { @@ -3789,8 +3790,8 @@ yydefault: yyVAL.node = yyDollar[1].node // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[7].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[7].token) // save comments yylex.(*Parser).setFreeFloating(name, token.Start, yyDollar[2].token.Hidden) @@ -3801,14 +3802,14 @@ yydefault: } case 95: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php5/php5.y:1645 + // line internal/php5/php5.y:1646 { name := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} yyVAL.node = &ast.StmtInterface{ast.Node{}, name, yyDollar[3].InterfaceExtends, yyDollar[5].list} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[6].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[6].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3820,12 +3821,12 @@ yydefault: } case 96: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1666 + // line internal/php5/php5.y:1667 { yyVAL.node = &ast.StmtClass{ast.Node{}, nil, nil, nil, nil, nil, nil} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3834,14 +3835,14 @@ yydefault: } case 97: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:1678 + // line internal/php5/php5.y:1679 { classModifier := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} yyVAL.node = &ast.StmtClass{ast.Node{}, nil, []ast.Vertex{classModifier}, nil, nil, nil, nil} // save position - classModifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + classModifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3851,12 +3852,12 @@ yydefault: } case 98: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1693 + // line internal/php5/php5.y:1694 { yyVAL.node = &ast.StmtTrait{ast.Node{}, nil, nil} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3865,14 +3866,14 @@ yydefault: } case 99: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:1705 + // line internal/php5/php5.y:1706 { classModifier := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} yyVAL.node = &ast.StmtClass{ast.Node{}, nil, []ast.Vertex{classModifier}, nil, nil, nil, nil} // save position - classModifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + classModifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3882,7 +3883,7 @@ yydefault: } case 100: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:1723 + // line internal/php5/php5.y:1724 { yyVAL.ClassExtends = nil @@ -3890,12 +3891,12 @@ yydefault: } case 101: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:1729 + // line internal/php5/php5.y:1730 { yyVAL.ClassExtends = &ast.StmtClassExtends{ast.Node{}, yyDollar[2].node} // save position - yyVAL.ClassExtends.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.ClassExtends.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.ClassExtends, token.Start, yyDollar[1].token.Hidden) @@ -3904,13 +3905,13 @@ yydefault: } case 102: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1744 + // line internal/php5/php5.y:1745 { yyVAL.token = yyDollar[1].token } case 103: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:1751 + // line internal/php5/php5.y:1752 { yyVAL.InterfaceExtends = nil @@ -3918,12 +3919,12 @@ yydefault: } case 104: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:1757 + // line internal/php5/php5.y:1758 { yyVAL.InterfaceExtends = &ast.StmtInterfaceExtends{ast.Node{}, yyDollar[2].list} // save position - yyVAL.InterfaceExtends.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) + yyVAL.InterfaceExtends.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.InterfaceExtends, token.Start, yyDollar[1].token.Hidden) @@ -3932,7 +3933,7 @@ yydefault: } case 105: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:1772 + // line internal/php5/php5.y:1773 { yyVAL.ClassImplements = nil @@ -3940,12 +3941,12 @@ yydefault: } case 106: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:1778 + // line internal/php5/php5.y:1779 { yyVAL.ClassImplements = &ast.StmtClassImplements{ast.Node{}, yyDollar[2].list} // save position - yyVAL.ClassImplements.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) + yyVAL.ClassImplements.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.ClassImplements, token.Start, yyDollar[1].token.Hidden) @@ -3954,7 +3955,7 @@ yydefault: } case 107: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1793 + // line internal/php5/php5.y:1794 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3962,7 +3963,7 @@ yydefault: } case 108: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:1799 + // line internal/php5/php5.y:1800 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -3973,7 +3974,7 @@ yydefault: } case 109: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:1811 + // line internal/php5/php5.y:1812 { yyVAL.node = nil @@ -3981,7 +3982,7 @@ yydefault: } case 110: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:1817 + // line internal/php5/php5.y:1818 { yyVAL.node = yyDollar[2].node @@ -3992,7 +3993,7 @@ yydefault: } case 111: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1829 + // line internal/php5/php5.y:1830 { yyVAL.node = yyDollar[1].node @@ -4000,12 +4001,12 @@ yydefault: } case 112: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:1835 + // line internal/php5/php5.y:1836 { yyVAL.node = &ast.ExprReference{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4014,12 +4015,12 @@ yydefault: } case 113: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:1847 + // line internal/php5/php5.y:1848 { yyVAL.node = &ast.ExprList{ast.Node{}, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4030,25 +4031,25 @@ yydefault: } case 114: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1864 + // line internal/php5/php5.y:1865 { yyVAL.node = &ast.StmtFor{ast.Node{}, nil, nil, nil, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[1].node) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } case 115: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:1873 + // line internal/php5/php5.y:1874 { stmtList := &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtAltFor{ast.Node{}, nil, nil, nil, stmtList} // save position - stmtList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + stmtList.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Cond, yyDollar[1].token.Hidden) @@ -4060,25 +4061,25 @@ yydefault: } case 116: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1893 + // line internal/php5/php5.y:1894 { yyVAL.node = &ast.StmtForeach{ast.Node{}, nil, nil, nil, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[1].node) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } case 117: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:1902 + // line internal/php5/php5.y:1903 { stmtList := &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtAltForeach{ast.Node{}, nil, nil, nil, stmtList} // save position - stmtList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + stmtList.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Cond, yyDollar[1].token.Hidden) @@ -4090,25 +4091,25 @@ yydefault: } case 118: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:1923 + // line internal/php5/php5.y:1924 { yyVAL.node = &ast.StmtDeclare{ast.Node{}, false, nil, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[1].node) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } case 119: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:1932 + // line internal/php5/php5.y:1933 { stmtList := &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtDeclare{ast.Node{}, true, nil, stmtList} // save position - stmtList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + stmtList.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Cond, yyDollar[1].token.Hidden) @@ -4120,15 +4121,15 @@ yydefault: } case 120: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:1953 + // line internal/php5/php5.y:1954 { name := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} constant := &ast.StmtConstant{ast.Node{}, name, yyDollar[3].node} yyVAL.list = []ast.Vertex{constant} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - constant.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) + name.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + constant.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(constant, token.Start, yyDollar[1].token.Hidden) @@ -4138,15 +4139,15 @@ yydefault: } case 121: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:1969 + // line internal/php5/php5.y:1970 { name := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} constant := &ast.StmtConstant{ast.Node{}, name, yyDollar[5].node} yyVAL.list = append(yyDollar[1].list, constant) // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - constant.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[3].token, yyDollar[5].node) + name.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + constant.GetNode().Position = position.NewTokenNodePosition(yyDollar[3].token, yyDollar[5].node) // save comments yylex.(*Parser).setFreeFloating(lastNode(yyDollar[1].list), token.End, yyDollar[2].token.Hidden) @@ -4157,14 +4158,14 @@ yydefault: } case 122: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:1990 + // line internal/php5/php5.y:1991 { caseList := &ast.StmtCaseList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtSwitch{ast.Node{}, nil, caseList} // save position - caseList.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + caseList.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(caseList, token.Start, yyDollar[1].token.Hidden) @@ -4174,14 +4175,14 @@ yydefault: } case 123: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:2005 + // line internal/php5/php5.y:2006 { caseList := &ast.StmtCaseList{ast.Node{}, yyDollar[3].list} yyVAL.node = &ast.StmtSwitch{ast.Node{}, nil, caseList} // save position - caseList.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + caseList.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(caseList, token.Start, yyDollar[1].token.Hidden) @@ -4192,14 +4193,14 @@ yydefault: } case 124: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:2021 + // line internal/php5/php5.y:2022 { caseList := &ast.StmtCaseList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtAltSwitch{ast.Node{}, nil, caseList} // save position - caseList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + caseList.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Cond, yyDollar[1].token.Hidden) @@ -4211,15 +4212,15 @@ yydefault: } case 125: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:2038 + // line internal/php5/php5.y:2039 { caseList := &ast.StmtCaseList{ast.Node{}, yyDollar[3].list} yyVAL.node = &ast.StmtAltSwitch{ast.Node{}, nil, caseList} // save position - caseList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[3].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[5].token) + caseList.GetNode().Position = position.NewNodeListPosition(yyDollar[3].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[5].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Cond, yyDollar[1].token.Hidden) @@ -4232,7 +4233,7 @@ yydefault: } case 126: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:2061 + // line internal/php5/php5.y:2062 { yyVAL.list = []ast.Vertex{} @@ -4240,13 +4241,13 @@ yydefault: } case 127: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:2067 + // line internal/php5/php5.y:2068 { _case := &ast.StmtCase{ast.Node{}, yyDollar[3].node, yyDollar[5].list} yyVAL.list = append(yyDollar[1].list, _case) // save position - _case.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[2].token, yyDollar[5].list) + _case.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[2].token, yyDollar[5].list) // save comments yylex.(*Parser).setFreeFloating(_case, token.Start, yyDollar[2].token.Hidden) @@ -4257,13 +4258,13 @@ yydefault: } case 128: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:2082 + // line internal/php5/php5.y:2083 { _default := &ast.StmtDefault{ast.Node{}, yyDollar[4].list} yyVAL.list = append(yyDollar[1].list, _default) // save position - _default.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[2].token, yyDollar[4].list) + _default.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[2].token, yyDollar[4].list) // save comments yylex.(*Parser).setFreeFloating(_default, token.Start, yyDollar[2].token.Hidden) @@ -4274,37 +4275,37 @@ yydefault: } case 129: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2101 + // line internal/php5/php5.y:2102 { yyVAL.token = yyDollar[1].token } case 130: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2105 + // line internal/php5/php5.y:2106 { yyVAL.token = yyDollar[1].token } case 131: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2113 + // line internal/php5/php5.y:2114 { yyVAL.node = &ast.StmtWhile{ast.Node{}, nil, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[1].node) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } case 132: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:2122 + // line internal/php5/php5.y:2123 { stmtList := &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtAltWhile{ast.Node{}, nil, stmtList} // save position - stmtList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + stmtList.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Cond, yyDollar[1].token.Hidden) @@ -4316,7 +4317,7 @@ yydefault: } case 133: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:2144 + // line internal/php5/php5.y:2145 { yyVAL.list = nil @@ -4324,13 +4325,13 @@ yydefault: } case 134: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:2150 + // line internal/php5/php5.y:2151 { _elseIf := &ast.StmtElseIf{ast.Node{}, yyDollar[3].node, yyDollar[4].node} yyVAL.list = append(yyDollar[1].list, _elseIf) // save position - _elseIf.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[2].token, yyDollar[4].node) + _elseIf.GetNode().Position = position.NewTokenNodePosition(yyDollar[2].token, yyDollar[4].node) // save comments yylex.(*Parser).setFreeFloating(_elseIf, token.Start, yyDollar[2].token.Hidden) @@ -4347,7 +4348,7 @@ yydefault: } case 135: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:2173 + // line internal/php5/php5.y:2174 { yyVAL.list = nil @@ -4355,15 +4356,15 @@ yydefault: } case 136: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:2179 + // line internal/php5/php5.y:2180 { stmts := &ast.StmtStmtList{ast.Node{}, yyDollar[5].list} _elseIf := &ast.StmtAltElseIf{ast.Node{}, yyDollar[3].node, stmts} yyVAL.list = append(yyDollar[1].list, _elseIf) // save position - stmts.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[5].list) - _elseIf.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[2].token, yyDollar[5].list) + stmts.GetNode().Position = position.NewNodeListPosition(yyDollar[5].list) + _elseIf.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[2].token, yyDollar[5].list) // save comments yylex.(*Parser).setFreeFloating(_elseIf, token.Start, yyDollar[2].token.Hidden) @@ -4381,7 +4382,7 @@ yydefault: } case 137: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:2205 + // line internal/php5/php5.y:2206 { yyVAL.node = nil @@ -4389,12 +4390,12 @@ yydefault: } case 138: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:2211 + // line internal/php5/php5.y:2212 { yyVAL.node = &ast.StmtElse{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4403,7 +4404,7 @@ yydefault: } case 139: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:2227 + // line internal/php5/php5.y:2228 { yyVAL.node = nil @@ -4411,14 +4412,14 @@ yydefault: } case 140: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:2233 + // line internal/php5/php5.y:2234 { stmts := &ast.StmtStmtList{ast.Node{}, yyDollar[3].list} yyVAL.node = &ast.StmtAltElse{ast.Node{}, stmts} // save position - stmts.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[3].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list) + stmts.GetNode().Position = position.NewNodeListPosition(yyDollar[3].list) + yyVAL.node.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4428,7 +4429,7 @@ yydefault: } case 141: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2252 + // line internal/php5/php5.y:2253 { yyVAL.list = yyDollar[1].list @@ -4436,7 +4437,7 @@ yydefault: } case 142: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:2258 + // line internal/php5/php5.y:2259 { yyVAL.list = nil @@ -4444,7 +4445,7 @@ yydefault: } case 143: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2267 + // line internal/php5/php5.y:2268 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -4452,7 +4453,7 @@ yydefault: } case 144: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:2273 + // line internal/php5/php5.y:2274 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -4463,23 +4464,23 @@ yydefault: } case 145: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:2285 + // line internal/php5/php5.y:2286 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[4].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} yyVAL.node = &ast.Parameter{ast.Node{}, yyDollar[2].token != nil, yyDollar[3].token != nil, yyDollar[1].node, variable, nil} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) if yyDollar[1].node != nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) } else if yyDollar[2].token != nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[2].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[2].token, yyDollar[4].token) } else if yyDollar[3].token != nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[3].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[3].token, yyDollar[4].token) } else { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) } // save comments @@ -4513,23 +4514,23 @@ yydefault: } case 146: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php5/php5.y:2330 + // line internal/php5/php5.y:2331 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[4].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} yyVAL.node = &ast.Parameter{ast.Node{}, yyDollar[2].token != nil, yyDollar[3].token != nil, yyDollar[1].node, variable, yyDollar[6].node} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) if yyDollar[1].node != nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[6].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[6].node) } else if yyDollar[2].token != nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[2].token, yyDollar[6].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[2].token, yyDollar[6].node) } else if yyDollar[3].token != nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[3].token, yyDollar[6].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[3].token, yyDollar[6].node) } else { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[4].token, yyDollar[6].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[4].token, yyDollar[6].node) } // save comments @@ -4564,7 +4565,7 @@ yydefault: } case 147: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:2380 + // line internal/php5/php5.y:2381 { yyVAL.node = nil @@ -4572,12 +4573,12 @@ yydefault: } case 148: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2386 + // line internal/php5/php5.y:2387 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4586,12 +4587,12 @@ yydefault: } case 149: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2398 + // line internal/php5/php5.y:2399 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4600,7 +4601,7 @@ yydefault: } case 150: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2410 + // line internal/php5/php5.y:2411 { yyVAL.node = yyDollar[1].node @@ -4608,12 +4609,12 @@ yydefault: } case 151: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:2420 + // line internal/php5/php5.y:2421 { yyVAL.node = &ast.ArgumentList{ast.Node{}, nil} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4623,12 +4624,12 @@ yydefault: } case 152: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:2433 + // line internal/php5/php5.y:2434 { yyVAL.node = &ast.ArgumentList{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4638,14 +4639,14 @@ yydefault: } case 153: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:2446 + // line internal/php5/php5.y:2447 { arg := &ast.Argument{ast.Node{}, false, false, yyDollar[2].node} yyVAL.node = &ast.ArgumentList{ast.Node{}, []ast.Vertex{arg}} // save position - arg.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[2].node) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + arg.GetNode().Position = position.NewNodePosition(yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4655,7 +4656,7 @@ yydefault: } case 154: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2465 + // line internal/php5/php5.y:2466 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -4663,7 +4664,7 @@ yydefault: } case 155: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:2471 + // line internal/php5/php5.y:2472 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -4674,12 +4675,12 @@ yydefault: } case 156: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2483 + // line internal/php5/php5.y:2484 { yyVAL.node = &ast.Argument{ast.Node{}, false, false, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[1].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -4688,12 +4689,12 @@ yydefault: } case 157: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2495 + // line internal/php5/php5.y:2496 { yyVAL.node = &ast.Argument{ast.Node{}, false, false, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[1].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -4702,12 +4703,12 @@ yydefault: } case 158: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:2507 + // line internal/php5/php5.y:2508 { yyVAL.node = &ast.Argument{ast.Node{}, false, true, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4716,12 +4717,12 @@ yydefault: } case 159: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:2519 + // line internal/php5/php5.y:2520 { yyVAL.node = &ast.Argument{ast.Node{}, true, false, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4730,7 +4731,7 @@ yydefault: } case 160: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:2534 + // line internal/php5/php5.y:2535 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -4741,7 +4742,7 @@ yydefault: } case 161: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2543 + // line internal/php5/php5.y:2544 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -4749,14 +4750,14 @@ yydefault: } case 162: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2553 + // line internal/php5/php5.y:2554 { name := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} yyVAL.node = &ast.ExprVariable{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4766,12 +4767,12 @@ yydefault: } case 163: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:2568 + // line internal/php5/php5.y:2569 { yyVAL.node = &ast.ExprVariable{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4781,12 +4782,12 @@ yydefault: } case 164: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:2581 + // line internal/php5/php5.y:2582 { yyVAL.node = &ast.ExprVariable{ast.Node{}, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4798,7 +4799,7 @@ yydefault: } case 165: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:2600 + // line internal/php5/php5.y:2601 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[3].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -4806,9 +4807,9 @@ yydefault: yyVAL.list = append(yyDollar[1].list, staticVar) // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - staticVar.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + staticVar.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(lastNode(yyDollar[1].list), token.End, yyDollar[2].token.Hidden) @@ -4819,7 +4820,7 @@ yydefault: } case 166: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:2619 + // line internal/php5/php5.y:2620 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[3].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -4827,9 +4828,9 @@ yydefault: yyVAL.list = append(yyDollar[1].list, staticVar) // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - staticVar.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[3].token, yyDollar[5].node) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + staticVar.GetNode().Position = position.NewTokenNodePosition(yyDollar[3].token, yyDollar[5].node) // save comments yylex.(*Parser).setFreeFloating(lastNode(yyDollar[1].list), token.End, yyDollar[2].token.Hidden) @@ -4841,7 +4842,7 @@ yydefault: } case 167: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2639 + // line internal/php5/php5.y:2640 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -4849,9 +4850,9 @@ yydefault: yyVAL.list = []ast.Vertex{staticVar} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - staticVar.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + staticVar.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).addDollarToken(variable) @@ -4861,7 +4862,7 @@ yydefault: } case 168: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:2657 + // line internal/php5/php5.y:2658 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -4869,9 +4870,9 @@ yydefault: yyVAL.list = []ast.Vertex{staticVar} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - staticVar.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + staticVar.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) // save comments yylex.(*Parser).addDollarToken(variable) @@ -4882,7 +4883,7 @@ yydefault: } case 169: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:2680 + // line internal/php5/php5.y:2681 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) @@ -4890,7 +4891,7 @@ yydefault: } case 170: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:2686 + // line internal/php5/php5.y:2687 { yyVAL.list = []ast.Vertex{} @@ -4898,12 +4899,12 @@ yydefault: } case 171: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:2696 + // line internal/php5/php5.y:2697 { yyVAL.node = &ast.StmtPropertyList{ast.Node{}, yyDollar[1].list, nil, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[3].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], yyVAL.node) @@ -4914,12 +4915,12 @@ yydefault: } case 172: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:2710 + // line internal/php5/php5.y:2711 { yyVAL.node = yyDollar[1].node // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.ConstList, yyDollar[2].token.Hidden) @@ -4929,7 +4930,7 @@ yydefault: } case 173: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2723 + // line internal/php5/php5.y:2724 { yyVAL.node = yyDollar[1].node @@ -4937,17 +4938,17 @@ yydefault: } case 174: yyDollar = yyS[yypt-8 : yypt+1] - // line internal/php5/php5.y:2729 + // line internal/php5/php5.y:2730 { name := &ast.Identifier{ast.Node{}, yyDollar[4].token.Value} yyVAL.node = &ast.StmtClassMethod{ast.Node{}, yyDollar[3].token != nil, name, yyDollar[1].list, yyDollar[6].list, nil, yyDollar[8].node} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) if yyDollar[1].list == nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[2].token, yyDollar[8].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[2].token, yyDollar[8].node) } else { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListNodePosition(yyDollar[1].list, yyDollar[8].node) + yyVAL.node.GetNode().Position = position.NewNodeListNodePosition(yyDollar[1].list, yyDollar[8].node) } // save comments @@ -4970,12 +4971,12 @@ yydefault: } case 175: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:2763 + // line internal/php5/php5.y:2764 { yyVAL.node = &ast.StmtTraitUse{ast.Node{}, yyDollar[2].list, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4984,7 +4985,7 @@ yydefault: } case 176: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2778 + // line internal/php5/php5.y:2779 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -4992,7 +4993,7 @@ yydefault: } case 177: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:2784 + // line internal/php5/php5.y:2785 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -5003,11 +5004,11 @@ yydefault: } case 178: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2796 + // line internal/php5/php5.y:2797 { yyVAL.node = &ast.StmtNop{ast.Node{}} - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5017,11 +5018,11 @@ yydefault: } case 179: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:2808 + // line internal/php5/php5.y:2809 { yyVAL.node = &ast.StmtTraitAdaptationList{ast.Node{}, yyDollar[2].list} - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5031,7 +5032,7 @@ yydefault: } case 180: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:2823 + // line internal/php5/php5.y:2824 { yyVAL.list = nil @@ -5039,7 +5040,7 @@ yydefault: } case 181: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2829 + // line internal/php5/php5.y:2830 { yyVAL.list = yyDollar[1].list @@ -5047,7 +5048,7 @@ yydefault: } case 182: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2838 + // line internal/php5/php5.y:2839 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5055,7 +5056,7 @@ yydefault: } case 183: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:2844 + // line internal/php5/php5.y:2845 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) @@ -5063,7 +5064,7 @@ yydefault: } case 184: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:2853 + // line internal/php5/php5.y:2854 { yyVAL.node = yyDollar[1].node @@ -5075,7 +5076,7 @@ yydefault: } case 185: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:2863 + // line internal/php5/php5.y:2864 { yyVAL.node = yyDollar[1].node @@ -5087,12 +5088,12 @@ yydefault: } case 186: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:2876 + // line internal/php5/php5.y:2877 { yyVAL.node = &ast.StmtTraitUsePrecedence{ast.Node{}, yyDollar[1].node, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeNodeListPosition(yyDollar[1].node, yyDollar[3].list) + yyVAL.node.GetNode().Position = position.NewNodeNodeListPosition(yyDollar[1].node, yyDollar[3].list) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5102,7 +5103,7 @@ yydefault: } case 187: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2892 + // line internal/php5/php5.y:2893 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5110,7 +5111,7 @@ yydefault: } case 188: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:2898 + // line internal/php5/php5.y:2899 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -5121,14 +5122,14 @@ yydefault: } case 189: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2910 + // line internal/php5/php5.y:2911 { name := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} yyVAL.node = &ast.StmtTraitMethodRef{ast.Node{}, nil, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5137,7 +5138,7 @@ yydefault: } case 190: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2924 + // line internal/php5/php5.y:2925 { yyVAL.node = yyDollar[1].node @@ -5145,14 +5146,14 @@ yydefault: } case 191: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:2933 + // line internal/php5/php5.y:2934 { target := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.StmtTraitMethodRef{ast.Node{}, yyDollar[1].node, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) + target.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5163,14 +5164,14 @@ yydefault: } case 192: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:2952 + // line internal/php5/php5.y:2953 { alias := &ast.Identifier{ast.Node{}, yyDollar[4].token.Value} yyVAL.node = &ast.StmtTraitUseAlias{ast.Node{}, yyDollar[1].node, yyDollar[3].node, alias} // save position - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + alias.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5181,12 +5182,12 @@ yydefault: } case 193: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:2968 + // line internal/php5/php5.y:2969 { yyVAL.node = &ast.StmtTraitUseAlias{ast.Node{}, yyDollar[1].node, yyDollar[3].node, nil} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5196,7 +5197,7 @@ yydefault: } case 194: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:2984 + // line internal/php5/php5.y:2985 { yyVAL.node = nil @@ -5204,7 +5205,7 @@ yydefault: } case 195: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2990 + // line internal/php5/php5.y:2991 { yyVAL.node = yyDollar[1].node @@ -5212,12 +5213,12 @@ yydefault: } case 196: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:2999 + // line internal/php5/php5.y:3000 { yyVAL.node = &ast.StmtNop{ast.Node{}} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5227,12 +5228,12 @@ yydefault: } case 197: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3012 + // line internal/php5/php5.y:3013 { yyVAL.node = &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5242,7 +5243,7 @@ yydefault: } case 198: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3028 + // line internal/php5/php5.y:3029 { yyVAL.list = yyDollar[1].list @@ -5250,13 +5251,13 @@ yydefault: } case 199: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3034 + // line internal/php5/php5.y:3035 { modifier := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} yyVAL.list = []ast.Vertex{modifier} // save position - modifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + modifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(modifier, token.Start, yyDollar[1].token.Hidden) @@ -5265,7 +5266,7 @@ yydefault: } case 200: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:3050 + // line internal/php5/php5.y:3051 { yyVAL.list = nil @@ -5273,7 +5274,7 @@ yydefault: } case 201: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3056 + // line internal/php5/php5.y:3057 { yyVAL.list = yyDollar[1].list @@ -5281,7 +5282,7 @@ yydefault: } case 202: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3065 + // line internal/php5/php5.y:3066 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5289,7 +5290,7 @@ yydefault: } case 203: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:3071 + // line internal/php5/php5.y:3072 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) @@ -5297,12 +5298,12 @@ yydefault: } case 204: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3080 + // line internal/php5/php5.y:3081 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5311,12 +5312,12 @@ yydefault: } case 205: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3092 + // line internal/php5/php5.y:3093 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5325,12 +5326,12 @@ yydefault: } case 206: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3104 + // line internal/php5/php5.y:3105 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5339,12 +5340,12 @@ yydefault: } case 207: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3116 + // line internal/php5/php5.y:3117 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5353,12 +5354,12 @@ yydefault: } case 208: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3128 + // line internal/php5/php5.y:3129 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5367,12 +5368,12 @@ yydefault: } case 209: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3140 + // line internal/php5/php5.y:3141 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5381,7 +5382,7 @@ yydefault: } case 210: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3155 + // line internal/php5/php5.y:3156 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[3].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -5389,9 +5390,9 @@ yydefault: yyVAL.list = append(yyDollar[1].list, property) // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - property.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + property.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) // save comments yylex.(*Parser).addDollarToken(variable) @@ -5402,7 +5403,7 @@ yydefault: } case 211: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:3174 + // line internal/php5/php5.y:3175 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[3].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -5410,9 +5411,9 @@ yydefault: yyVAL.list = append(yyDollar[1].list, property) // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - property.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[3].token, yyDollar[5].node) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + property.GetNode().Position = position.NewTokenNodePosition(yyDollar[3].token, yyDollar[5].node) // save comments yylex.(*Parser).setFreeFloating(lastNode(yyDollar[1].list), token.End, yyDollar[2].token.Hidden) @@ -5424,7 +5425,7 @@ yydefault: } case 212: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3194 + // line internal/php5/php5.y:3195 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -5432,9 +5433,9 @@ yydefault: yyVAL.list = []ast.Vertex{property} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - property.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + property.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).addDollarToken(variable) @@ -5444,7 +5445,7 @@ yydefault: } case 213: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3212 + // line internal/php5/php5.y:3213 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -5452,9 +5453,9 @@ yydefault: yyVAL.list = []ast.Vertex{property} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - property.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + property.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) // save comments yylex.(*Parser).addDollarToken(variable) @@ -5465,7 +5466,7 @@ yydefault: } case 214: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:3234 + // line internal/php5/php5.y:3235 { name := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} constant := &ast.StmtConstant{ast.Node{}, name, yyDollar[5].node} @@ -5475,9 +5476,9 @@ yydefault: yyVAL.node = yyDollar[1].node // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - constant.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[3].token, yyDollar[5].node) - yyDollar[1].node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[5].node) + name.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + constant.GetNode().Position = position.NewTokenNodePosition(yyDollar[3].token, yyDollar[5].node) + yyDollar[1].node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[5].node) // save comments yylex.(*Parser).setFreeFloating(lastConst, token.End, yyDollar[2].token.Hidden) @@ -5488,16 +5489,16 @@ yydefault: } case 215: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:3255 + // line internal/php5/php5.y:3256 { name := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} constant := &ast.StmtConstant{ast.Node{}, name, yyDollar[4].node} yyVAL.node = &ast.StmtClassConstList{ast.Node{}, nil, []ast.Vertex{constant}} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - constant.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[2].token, yyDollar[4].node) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[4].node) + name.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + constant.GetNode().Position = position.NewTokenNodePosition(yyDollar[2].token, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[4].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5508,7 +5509,7 @@ yydefault: } case 216: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3276 + // line internal/php5/php5.y:3277 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -5519,7 +5520,7 @@ yydefault: } case 217: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3285 + // line internal/php5/php5.y:3286 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5527,7 +5528,7 @@ yydefault: } case 218: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:3295 + // line internal/php5/php5.y:3296 { yyVAL.list = nil @@ -5535,7 +5536,7 @@ yydefault: } case 219: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3301 + // line internal/php5/php5.y:3302 { yyVAL.list = yyDollar[1].list @@ -5543,7 +5544,7 @@ yydefault: } case 220: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3310 + // line internal/php5/php5.y:3311 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -5554,7 +5555,7 @@ yydefault: } case 221: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3319 + // line internal/php5/php5.y:3320 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5562,7 +5563,7 @@ yydefault: } case 222: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:3328 + // line internal/php5/php5.y:3329 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].list...) @@ -5570,7 +5571,7 @@ yydefault: } case 223: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3334 + // line internal/php5/php5.y:3335 { yyVAL.list = yyDollar[1].list @@ -5578,13 +5579,13 @@ yydefault: } case 224: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:3343 + // line internal/php5/php5.y:3344 { fetch := &ast.ExprArrayDimFetch{ast.Node{}, nil, yyDollar[3].node} yyVAL.list = append(yyDollar[1].list, fetch) // save position - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[3].node) + fetch.GetNode().Position = position.NewNodePosition(yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(fetch, token.Var, append(yyDollar[2].token.Hidden, yylex.(*Parser).GetFreeFloatingToken(yyDollar[2].token)...)) @@ -5594,13 +5595,13 @@ yydefault: } case 225: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3357 + // line internal/php5/php5.y:3358 { fetch := &ast.ExprArrayDimFetch{ast.Node{}, nil, yyDollar[2].node} yyVAL.list = []ast.Vertex{fetch} // save position - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[2].node) + fetch.GetNode().Position = position.NewNodePosition(yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(fetch, token.Var, append(yyDollar[1].token.Hidden, yylex.(*Parser).GetFreeFloatingToken(yyDollar[1].token)...)) @@ -5610,7 +5611,7 @@ yydefault: } case 226: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:3374 + // line internal/php5/php5.y:3375 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].list...) @@ -5618,7 +5619,7 @@ yydefault: } case 227: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3380 + // line internal/php5/php5.y:3381 { yyVAL.list = yyDollar[1].list @@ -5626,7 +5627,7 @@ yydefault: } case 228: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3386 + // line internal/php5/php5.y:3387 { yyVAL.list = yyDollar[1].list @@ -5634,7 +5635,7 @@ yydefault: } case 229: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:3395 + // line internal/php5/php5.y:3396 { yyVAL.list = nil @@ -5642,7 +5643,7 @@ yydefault: } case 230: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:3401 + // line internal/php5/php5.y:3402 { yyVAL.list = yyDollar[1].list @@ -5650,15 +5651,15 @@ yydefault: } case 231: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3410 + // line internal/php5/php5.y:3411 { if yyDollar[3].node != nil { yyVAL.node = &ast.ExprNew{ast.Node{}, yyDollar[2].node, yyDollar[3].node.(*ast.ArgumentList)} - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) } else { yyVAL.node = &ast.ExprNew{ast.Node{}, yyDollar[2].node, nil} - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) } // save comments @@ -5668,14 +5669,14 @@ yydefault: } case 232: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php5/php5.y:3429 + // line internal/php5/php5.y:3430 { listNode := &ast.ExprList{ast.Node{}, yyDollar[3].list} yyVAL.node = &ast.ExprAssign{ast.Node{}, listNode, yyDollar[6].node} // save position - listNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[6].node) + listNode.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[6].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5687,12 +5688,12 @@ yydefault: } case 233: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3446 + // line internal/php5/php5.y:3447 { yyVAL.node = &ast.ExprAssign{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5702,12 +5703,12 @@ yydefault: } case 234: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:3459 + // line internal/php5/php5.y:3460 { yyVAL.node = &ast.ExprAssignReference{ast.Node{}, yyDollar[1].node, yyDollar[4].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5718,7 +5719,7 @@ yydefault: } case 235: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php5/php5.y:3473 + // line internal/php5/php5.y:3474 { var _new *ast.ExprNew @@ -5731,11 +5732,11 @@ yydefault: // save position if yyDollar[6].node != nil { - _new.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[4].token, yyDollar[6].node) + _new.GetNode().Position = position.NewTokenNodePosition(yyDollar[4].token, yyDollar[6].node) } else { - _new.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[4].token, yyDollar[5].node) + _new.GetNode().Position = position.NewTokenNodePosition(yyDollar[4].token, yyDollar[5].node) } - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, _new) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, _new) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5747,12 +5748,12 @@ yydefault: } case 236: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:3500 + // line internal/php5/php5.y:3501 { yyVAL.node = &ast.ExprClone{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5761,12 +5762,12 @@ yydefault: } case 237: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3512 + // line internal/php5/php5.y:3513 { yyVAL.node = &ast.ExprAssignPlus{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) yylex.(*Parser).setFreeFloating(yyVAL.node, token.Var, yyDollar[2].token.Hidden) @@ -5775,12 +5776,12 @@ yydefault: } case 238: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3524 + // line internal/php5/php5.y:3525 { yyVAL.node = &ast.ExprAssignMinus{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5790,12 +5791,12 @@ yydefault: } case 239: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3537 + // line internal/php5/php5.y:3538 { yyVAL.node = &ast.ExprAssignMul{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5805,12 +5806,12 @@ yydefault: } case 240: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3550 + // line internal/php5/php5.y:3551 { yyVAL.node = &ast.ExprAssignPow{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5820,12 +5821,12 @@ yydefault: } case 241: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3563 + // line internal/php5/php5.y:3564 { yyVAL.node = &ast.ExprAssignDiv{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5835,12 +5836,12 @@ yydefault: } case 242: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3576 + // line internal/php5/php5.y:3577 { yyVAL.node = &ast.ExprAssignConcat{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5850,12 +5851,12 @@ yydefault: } case 243: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3589 + // line internal/php5/php5.y:3590 { yyVAL.node = &ast.ExprAssignMod{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5865,12 +5866,12 @@ yydefault: } case 244: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3602 + // line internal/php5/php5.y:3603 { yyVAL.node = &ast.ExprAssignBitwiseAnd{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5880,12 +5881,12 @@ yydefault: } case 245: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3615 + // line internal/php5/php5.y:3616 { yyVAL.node = &ast.ExprAssignBitwiseOr{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5895,12 +5896,12 @@ yydefault: } case 246: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3628 + // line internal/php5/php5.y:3629 { yyVAL.node = &ast.ExprAssignBitwiseXor{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5910,12 +5911,12 @@ yydefault: } case 247: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3641 + // line internal/php5/php5.y:3642 { yyVAL.node = &ast.ExprAssignShiftLeft{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5925,12 +5926,12 @@ yydefault: } case 248: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3654 + // line internal/php5/php5.y:3655 { yyVAL.node = &ast.ExprAssignShiftRight{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5940,12 +5941,12 @@ yydefault: } case 249: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:3667 + // line internal/php5/php5.y:3668 { yyVAL.node = &ast.ExprPostInc{ast.Node{}, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5955,12 +5956,12 @@ yydefault: } case 250: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:3680 + // line internal/php5/php5.y:3681 { yyVAL.node = &ast.ExprPreInc{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5969,12 +5970,12 @@ yydefault: } case 251: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:3692 + // line internal/php5/php5.y:3693 { yyVAL.node = &ast.ExprPostDec{ast.Node{}, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5984,12 +5985,12 @@ yydefault: } case 252: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:3705 + // line internal/php5/php5.y:3706 { yyVAL.node = &ast.ExprPreDec{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5998,12 +5999,12 @@ yydefault: } case 253: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3717 + // line internal/php5/php5.y:3718 { yyVAL.node = &ast.ExprBinaryBooleanOr{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6013,12 +6014,12 @@ yydefault: } case 254: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3730 + // line internal/php5/php5.y:3731 { yyVAL.node = &ast.ExprBinaryBooleanAnd{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6028,12 +6029,12 @@ yydefault: } case 255: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3743 + // line internal/php5/php5.y:3744 { yyVAL.node = &ast.ExprBinaryLogicalOr{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6043,12 +6044,12 @@ yydefault: } case 256: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3756 + // line internal/php5/php5.y:3757 { yyVAL.node = &ast.ExprBinaryLogicalAnd{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6058,12 +6059,12 @@ yydefault: } case 257: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3769 + // line internal/php5/php5.y:3770 { yyVAL.node = &ast.ExprBinaryLogicalXor{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6073,12 +6074,12 @@ yydefault: } case 258: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3782 + // line internal/php5/php5.y:3783 { yyVAL.node = &ast.ExprBinaryBitwiseOr{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6088,12 +6089,12 @@ yydefault: } case 259: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3795 + // line internal/php5/php5.y:3796 { yyVAL.node = &ast.ExprBinaryBitwiseAnd{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6103,12 +6104,12 @@ yydefault: } case 260: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3808 + // line internal/php5/php5.y:3809 { yyVAL.node = &ast.ExprBinaryBitwiseXor{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6118,12 +6119,12 @@ yydefault: } case 261: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3821 + // line internal/php5/php5.y:3822 { yyVAL.node = &ast.ExprBinaryConcat{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6133,12 +6134,12 @@ yydefault: } case 262: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3834 + // line internal/php5/php5.y:3835 { yyVAL.node = &ast.ExprBinaryPlus{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6148,12 +6149,12 @@ yydefault: } case 263: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3847 + // line internal/php5/php5.y:3848 { yyVAL.node = &ast.ExprBinaryMinus{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6163,12 +6164,12 @@ yydefault: } case 264: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3860 + // line internal/php5/php5.y:3861 { yyVAL.node = &ast.ExprBinaryMul{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6178,12 +6179,12 @@ yydefault: } case 265: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3873 + // line internal/php5/php5.y:3874 { yyVAL.node = &ast.ExprBinaryPow{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6193,12 +6194,12 @@ yydefault: } case 266: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3886 + // line internal/php5/php5.y:3887 { yyVAL.node = &ast.ExprBinaryDiv{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6208,12 +6209,12 @@ yydefault: } case 267: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3899 + // line internal/php5/php5.y:3900 { yyVAL.node = &ast.ExprBinaryMod{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6223,12 +6224,12 @@ yydefault: } case 268: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3912 + // line internal/php5/php5.y:3913 { yyVAL.node = &ast.ExprBinaryShiftLeft{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6238,12 +6239,12 @@ yydefault: } case 269: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3925 + // line internal/php5/php5.y:3926 { yyVAL.node = &ast.ExprBinaryShiftRight{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6253,12 +6254,12 @@ yydefault: } case 270: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:3938 + // line internal/php5/php5.y:3939 { yyVAL.node = &ast.ExprUnaryPlus{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6267,12 +6268,12 @@ yydefault: } case 271: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:3950 + // line internal/php5/php5.y:3951 { yyVAL.node = &ast.ExprUnaryMinus{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6281,12 +6282,12 @@ yydefault: } case 272: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:3962 + // line internal/php5/php5.y:3963 { yyVAL.node = &ast.ExprBooleanNot{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6295,12 +6296,12 @@ yydefault: } case 273: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:3974 + // line internal/php5/php5.y:3975 { yyVAL.node = &ast.ExprBitwiseNot{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6309,12 +6310,12 @@ yydefault: } case 274: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3986 + // line internal/php5/php5.y:3987 { yyVAL.node = &ast.ExprBinaryIdentical{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6324,12 +6325,12 @@ yydefault: } case 275: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:3999 + // line internal/php5/php5.y:4000 { yyVAL.node = &ast.ExprBinaryNotIdentical{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6339,12 +6340,12 @@ yydefault: } case 276: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:4012 + // line internal/php5/php5.y:4013 { yyVAL.node = &ast.ExprBinaryEqual{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6354,12 +6355,12 @@ yydefault: } case 277: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:4025 + // line internal/php5/php5.y:4026 { yyVAL.node = &ast.ExprBinaryNotEqual{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6370,12 +6371,12 @@ yydefault: } case 278: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:4039 + // line internal/php5/php5.y:4040 { yyVAL.node = &ast.ExprBinarySmaller{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6385,12 +6386,12 @@ yydefault: } case 279: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:4052 + // line internal/php5/php5.y:4053 { yyVAL.node = &ast.ExprBinarySmallerOrEqual{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6400,12 +6401,12 @@ yydefault: } case 280: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:4065 + // line internal/php5/php5.y:4066 { yyVAL.node = &ast.ExprBinaryGreater{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6415,12 +6416,12 @@ yydefault: } case 281: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:4078 + // line internal/php5/php5.y:4079 { yyVAL.node = &ast.ExprBinaryGreaterOrEqual{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6430,12 +6431,12 @@ yydefault: } case 282: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:4091 + // line internal/php5/php5.y:4092 { yyVAL.node = &ast.ExprInstanceOf{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6445,7 +6446,7 @@ yydefault: } case 283: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:4104 + // line internal/php5/php5.y:4105 { yyVAL.node = yyDollar[1].node @@ -6458,7 +6459,7 @@ yydefault: } case 284: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:4113 + // line internal/php5/php5.y:4114 { yyVAL.node = yyDollar[1].node @@ -6466,7 +6467,7 @@ yydefault: } case 285: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4119 + // line internal/php5/php5.y:4120 { yyVAL.node = yyDollar[2].node @@ -6493,19 +6494,19 @@ yydefault: } // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, n) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyVAL.node, n) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } case 286: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:4151 + // line internal/php5/php5.y:4152 { yyVAL.node = &ast.ExprTernary{ast.Node{}, yyDollar[1].node, yyDollar[3].node, yyDollar[5].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[5].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[5].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6516,12 +6517,12 @@ yydefault: } case 287: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4165 + // line internal/php5/php5.y:4166 { yyVAL.node = &ast.ExprTernary{ast.Node{}, yyDollar[1].node, nil, yyDollar[4].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6532,7 +6533,7 @@ yydefault: } case 288: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:4179 + // line internal/php5/php5.y:4180 { yyVAL.node = yyDollar[1].node @@ -6540,12 +6541,12 @@ yydefault: } case 289: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4185 + // line internal/php5/php5.y:4186 { yyVAL.node = &ast.ExprCastInt{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6555,12 +6556,12 @@ yydefault: } case 290: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4198 + // line internal/php5/php5.y:4199 { yyVAL.node = &ast.ExprCastDouble{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6570,12 +6571,12 @@ yydefault: } case 291: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4211 + // line internal/php5/php5.y:4212 { yyVAL.node = &ast.ExprCastString{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6585,12 +6586,12 @@ yydefault: } case 292: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4224 + // line internal/php5/php5.y:4225 { yyVAL.node = &ast.ExprCastArray{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6600,12 +6601,12 @@ yydefault: } case 293: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4237 + // line internal/php5/php5.y:4238 { yyVAL.node = &ast.ExprCastObject{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6615,12 +6616,12 @@ yydefault: } case 294: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4250 + // line internal/php5/php5.y:4251 { yyVAL.node = &ast.ExprCastBool{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6630,12 +6631,12 @@ yydefault: } case 295: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4263 + // line internal/php5/php5.y:4264 { yyVAL.node = &ast.ExprCastUnset{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6645,7 +6646,7 @@ yydefault: } case 296: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4276 + // line internal/php5/php5.y:4277 { e := yyDollar[2].node.(*ast.ExprExit) yyVAL.node = yyDollar[2].node @@ -6656,9 +6657,9 @@ yydefault: // save position if yyDollar[2].node.GetNode().Position == nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) } else { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) } // save comments @@ -6668,12 +6669,12 @@ yydefault: } case 297: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4297 + // line internal/php5/php5.y:4298 { yyVAL.node = &ast.ExprErrorSuppress{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6682,7 +6683,7 @@ yydefault: } case 298: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:4309 + // line internal/php5/php5.y:4310 { yyVAL.node = yyDollar[1].node @@ -6690,7 +6691,7 @@ yydefault: } case 299: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:4315 + // line internal/php5/php5.y:4316 { yyVAL.node = yyDollar[1].node @@ -6698,7 +6699,7 @@ yydefault: } case 300: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:4321 + // line internal/php5/php5.y:4322 { yyVAL.node = yyDollar[1].node @@ -6706,12 +6707,12 @@ yydefault: } case 301: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:4327 + // line internal/php5/php5.y:4328 { yyVAL.node = &ast.ExprShellExec{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6720,12 +6721,12 @@ yydefault: } case 302: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4339 + // line internal/php5/php5.y:4340 { yyVAL.node = &ast.ExprPrint{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6734,12 +6735,12 @@ yydefault: } case 303: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:4351 + // line internal/php5/php5.y:4352 { yyVAL.node = &ast.ExprYield{ast.Node{}, nil, nil} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6748,12 +6749,12 @@ yydefault: } case 304: yyDollar = yyS[yypt-9 : yypt+1] - // line internal/php5/php5.y:4363 + // line internal/php5/php5.y:4364 { yyVAL.node = &ast.ExprClosure{ast.Node{}, yyDollar[2].token != nil, false, yyDollar[4].list, yyDollar[6].ClosureUse, nil, yyDollar[8].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[9].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[9].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6777,12 +6778,12 @@ yydefault: } case 305: yyDollar = yyS[yypt-10 : yypt+1] - // line internal/php5/php5.y:4389 + // line internal/php5/php5.y:4390 { yyVAL.node = &ast.ExprClosure{ast.Node{}, yyDollar[3].token != nil, true, yyDollar[5].list, yyDollar[7].ClosureUse, nil, yyDollar[9].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[10].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[10].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6807,12 +6808,12 @@ yydefault: } case 306: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4419 + // line internal/php5/php5.y:4420 { yyVAL.node = &ast.ExprYield{ast.Node{}, nil, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6821,12 +6822,12 @@ yydefault: } case 307: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4431 + // line internal/php5/php5.y:4432 { yyVAL.node = &ast.ExprYield{ast.Node{}, nil, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6835,12 +6836,12 @@ yydefault: } case 308: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4443 + // line internal/php5/php5.y:4444 { yyVAL.node = &ast.ExprYield{ast.Node{}, yyDollar[2].node, yyDollar[4].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[4].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6850,12 +6851,12 @@ yydefault: } case 309: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4456 + // line internal/php5/php5.y:4457 { yyVAL.node = &ast.ExprYield{ast.Node{}, yyDollar[2].node, yyDollar[4].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[4].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6865,12 +6866,12 @@ yydefault: } case 310: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4472 + // line internal/php5/php5.y:4473 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6881,12 +6882,12 @@ yydefault: } case 311: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4486 + // line internal/php5/php5.y:4487 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6897,14 +6898,14 @@ yydefault: } case 312: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4500 + // line internal/php5/php5.y:4501 { str := &ast.ScalarString{ast.Node{}, yyDollar[1].token.Value} yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, str, yyDollar[3].node} // save position - str.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(str, yyDollar[4].token) + str.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(str, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6915,12 +6916,12 @@ yydefault: } case 313: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4516 + // line internal/php5/php5.y:4517 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6931,12 +6932,12 @@ yydefault: } case 314: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4533 + // line internal/php5/php5.y:4534 { yyVAL.node = &ast.ExprArray{ast.Node{}, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6947,12 +6948,12 @@ yydefault: } case 315: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:4547 + // line internal/php5/php5.y:4548 { yyVAL.node = &ast.ExprShortArray{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6962,13 +6963,13 @@ yydefault: } case 316: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:4563 + // line internal/php5/php5.y:4564 { yyVAL.token = yyDollar[1].token } case 317: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:4570 + // line internal/php5/php5.y:4571 { yyVAL.ClosureUse = nil @@ -6976,12 +6977,12 @@ yydefault: } case 318: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4576 + // line internal/php5/php5.y:4577 { yyVAL.ClosureUse = &ast.ExprClosureUse{ast.Node{}, yyDollar[3].list} // save position - yyVAL.ClosureUse.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.ClosureUse.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.ClosureUse, token.Start, yyDollar[1].token.Hidden) @@ -6992,15 +6993,15 @@ yydefault: } case 319: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:4593 + // line internal/php5/php5.y:4594 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[3].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} yyVAL.list = append(yyDollar[1].list, variable) // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(lastNode(yyDollar[1].list), token.End, yyDollar[2].token.Hidden) @@ -7011,7 +7012,7 @@ yydefault: } case 320: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4610 + // line internal/php5/php5.y:4611 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[4].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -7019,9 +7020,9 @@ yydefault: yyVAL.list = append(yyDollar[1].list, reference) // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) - reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[3].token, yyDollar[4].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) + reference.GetNode().Position = position.NewTokensPosition(yyDollar[3].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(lastNode(yyDollar[1].list), token.End, yyDollar[2].token.Hidden) @@ -7033,15 +7034,15 @@ yydefault: } case 321: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:4630 + // line internal/php5/php5.y:4631 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} yyVAL.list = []ast.Vertex{variable} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(variable, token.Start, yyDollar[1].token.Hidden) @@ -7051,7 +7052,7 @@ yydefault: } case 322: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4646 + // line internal/php5/php5.y:4647 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[2].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -7059,9 +7060,9 @@ yydefault: yyVAL.list = []ast.Vertex{reference} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + reference.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(reference, token.Start, yyDollar[1].token.Hidden) @@ -7072,14 +7073,14 @@ yydefault: } case 323: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4668 + // line internal/php5/php5.y:4669 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} yyVAL.node = &ast.ExprFunctionCall{ast.Node{}, name, yyDollar[2].node.(*ast.ArgumentList)} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(name, yyDollar[2].node) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) + yyVAL.node.GetNode().Position = position.NewNodesPosition(name, yyDollar[2].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], yyVAL.node) @@ -7088,14 +7089,14 @@ yydefault: } case 324: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4682 + // line internal/php5/php5.y:4683 { funcName := &ast.NameRelative{ast.Node{}, yyDollar[3].list} yyVAL.node = &ast.ExprFunctionCall{ast.Node{}, funcName, yyDollar[4].node.(*ast.ArgumentList)} // save position - funcName.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(funcName, yyDollar[4].node) + funcName.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list) + yyVAL.node.GetNode().Position = position.NewNodesPosition(funcName, yyDollar[4].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7105,14 +7106,14 @@ yydefault: } case 325: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:4697 + // line internal/php5/php5.y:4698 { funcName := &ast.NameFullyQualified{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.ExprFunctionCall{ast.Node{}, funcName, yyDollar[3].node.(*ast.ArgumentList)} // save position - funcName.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(funcName, yyDollar[3].node) + funcName.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewNodesPosition(funcName, yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7121,12 +7122,12 @@ yydefault: } case 326: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4711 + // line internal/php5/php5.y:4712 { yyVAL.node = &ast.ExprStaticCall{ast.Node{}, yyDollar[1].node, yyDollar[3].node, yyDollar[4].node.(*ast.ArgumentList)} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7136,12 +7137,12 @@ yydefault: } case 327: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4724 + // line internal/php5/php5.y:4725 { yyVAL.node = &ast.ExprStaticCall{ast.Node{}, yyDollar[1].node, yyDollar[3].node, yyDollar[4].node.(*ast.ArgumentList)} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7151,12 +7152,12 @@ yydefault: } case 328: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4737 + // line internal/php5/php5.y:4738 { yyVAL.node = &ast.ExprStaticCall{ast.Node{}, yyDollar[1].node, yyDollar[3].node, yyDollar[4].node.(*ast.ArgumentList)} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7166,12 +7167,12 @@ yydefault: } case 329: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4750 + // line internal/php5/php5.y:4751 { yyVAL.node = &ast.ExprStaticCall{ast.Node{}, yyDollar[1].node, yyDollar[3].node, yyDollar[4].node.(*ast.ArgumentList)} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7181,12 +7182,12 @@ yydefault: } case 330: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4763 + // line internal/php5/php5.y:4764 { yyVAL.node = &ast.ExprFunctionCall{ast.Node{}, yyDollar[1].node, yyDollar[2].node.(*ast.ArgumentList)} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[2].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7195,12 +7196,12 @@ yydefault: } case 331: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:4778 + // line internal/php5/php5.y:4779 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7209,12 +7210,12 @@ yydefault: } case 332: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:4790 + // line internal/php5/php5.y:4791 { yyVAL.node = &ast.NameName{ast.Node{}, yyDollar[1].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) + yyVAL.node.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], yyVAL.node) @@ -7223,12 +7224,12 @@ yydefault: } case 333: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:4802 + // line internal/php5/php5.y:4803 { yyVAL.node = &ast.NameRelative{ast.Node{}, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list) + yyVAL.node.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7238,12 +7239,12 @@ yydefault: } case 334: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4815 + // line internal/php5/php5.y:4816 { yyVAL.node = &ast.NameFullyQualified{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7252,12 +7253,12 @@ yydefault: } case 335: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:4830 + // line internal/php5/php5.y:4831 { yyVAL.node = &ast.NameName{ast.Node{}, yyDollar[1].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) + yyVAL.node.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], yyVAL.node) @@ -7266,12 +7267,12 @@ yydefault: } case 336: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:4842 + // line internal/php5/php5.y:4843 { yyVAL.node = &ast.NameRelative{ast.Node{}, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list) + yyVAL.node.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7281,12 +7282,12 @@ yydefault: } case 337: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4855 + // line internal/php5/php5.y:4856 { yyVAL.node = &ast.NameFullyQualified{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7295,7 +7296,7 @@ yydefault: } case 338: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:4870 + // line internal/php5/php5.y:4871 { yyVAL.node = yyDollar[1].node @@ -7303,7 +7304,7 @@ yydefault: } case 339: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:4876 + // line internal/php5/php5.y:4877 { yyVAL.node = yyDollar[1].node @@ -7311,7 +7312,7 @@ yydefault: } case 340: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:4885 + // line internal/php5/php5.y:4886 { yyVAL.node = yyDollar[1].node @@ -7322,13 +7323,13 @@ yydefault: switch nn := n.(type) { case *ast.ExprArrayDimFetch: nn.Var = yyVAL.node - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyVAL.node, nn) yyVAL.node = nn yylex.(*Parser).MoveFreeFloating(nn.Var, yyVAL.node) case *ast.ExprPropertyFetch: nn.Var = yyVAL.node - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyVAL.node, nn) yyVAL.node = nn yylex.(*Parser).MoveFreeFloating(nn.Var, yyVAL.node) } @@ -7338,13 +7339,13 @@ yydefault: switch nn := n.(type) { case *ast.ExprArrayDimFetch: nn.Var = yyVAL.node - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyVAL.node, nn) yyVAL.node = nn yylex.(*Parser).MoveFreeFloating(nn.Var, yyVAL.node) case *ast.ExprPropertyFetch: nn.Var = yyVAL.node - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyVAL.node, nn) yyVAL.node = nn yylex.(*Parser).MoveFreeFloating(nn.Var, yyVAL.node) } @@ -7354,7 +7355,7 @@ yydefault: } case 341: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:4926 + // line internal/php5/php5.y:4927 { yyVAL.node = yyDollar[1].node @@ -7362,7 +7363,7 @@ yydefault: } case 342: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4936 + // line internal/php5/php5.y:4937 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].list...) @@ -7370,7 +7371,7 @@ yydefault: } case 343: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:4942 + // line internal/php5/php5.y:4943 { yyVAL.list = []ast.Vertex{} @@ -7378,7 +7379,7 @@ yydefault: } case 344: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4952 + // line internal/php5/php5.y:4953 { yyVAL.list = yyDollar[2].list @@ -7389,7 +7390,7 @@ yydefault: } case 345: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:4964 + // line internal/php5/php5.y:4965 { yyVAL.node = &ast.ExprExit{ast.Node{}, false, nil} @@ -7397,12 +7398,12 @@ yydefault: } case 346: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:4970 + // line internal/php5/php5.y:4971 { yyVAL.node = &ast.ExprExit{ast.Node{}, false, nil} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Exit, append(yyDollar[1].token.Hidden, yylex.(*Parser).GetFreeFloatingToken(yyDollar[1].token)...)) @@ -7412,15 +7413,15 @@ yydefault: } case 347: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:4983 + // line internal/php5/php5.y:4984 { yyVAL.node = &ast.ExprExit{ast.Node{}, false, yyDollar[1].node} // save position if bytes.Compare(yylex.(*Parser).currentToken.Value, []byte(")")) == 0 { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yylex.(*Parser).currentToken) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yylex.(*Parser).currentToken) } else { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[1].node) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -7433,7 +7434,7 @@ yydefault: } case 348: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:5003 + // line internal/php5/php5.y:5004 { yyVAL.list = []ast.Vertex{} @@ -7441,19 +7442,19 @@ yydefault: } case 349: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5009 + // line internal/php5/php5.y:5010 { part := &ast.ScalarEncapsedStringPart{ast.Node{}, yyDollar[1].token.Value} yyVAL.list = []ast.Vertex{part} // save position - part.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + part.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } case 350: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5019 + // line internal/php5/php5.y:5020 { yyVAL.list = yyDollar[1].list @@ -7461,7 +7462,7 @@ yydefault: } case 351: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:5028 + // line internal/php5/php5.y:5029 { yyVAL.node = nil @@ -7469,7 +7470,7 @@ yydefault: } case 352: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5034 + // line internal/php5/php5.y:5035 { yyVAL.node = yyDollar[1].node @@ -7477,12 +7478,12 @@ yydefault: } case 353: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5043 + // line internal/php5/php5.y:5044 { yyVAL.node = &ast.ScalarLnumber{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7491,12 +7492,12 @@ yydefault: } case 354: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5055 + // line internal/php5/php5.y:5056 { yyVAL.node = &ast.ScalarDnumber{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7505,12 +7506,12 @@ yydefault: } case 355: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5067 + // line internal/php5/php5.y:5068 { yyVAL.node = &ast.ScalarString{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7519,12 +7520,12 @@ yydefault: } case 356: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5079 + // line internal/php5/php5.y:5080 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7533,12 +7534,12 @@ yydefault: } case 357: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5091 + // line internal/php5/php5.y:5092 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7547,12 +7548,12 @@ yydefault: } case 358: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5103 + // line internal/php5/php5.y:5104 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7561,12 +7562,12 @@ yydefault: } case 359: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5115 + // line internal/php5/php5.y:5116 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7575,12 +7576,12 @@ yydefault: } case 360: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5127 + // line internal/php5/php5.y:5128 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7589,12 +7590,12 @@ yydefault: } case 361: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5139 + // line internal/php5/php5.y:5140 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7603,12 +7604,12 @@ yydefault: } case 362: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5151 + // line internal/php5/php5.y:5152 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7617,14 +7618,14 @@ yydefault: } case 363: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5163 + // line internal/php5/php5.y:5164 { encapsed := &ast.ScalarEncapsedStringPart{ast.Node{}, yyDollar[2].token.Value} yyVAL.node = &ast.ScalarHeredoc{ast.Node{}, yyDollar[1].token.Value, []ast.Vertex{encapsed}} // save position - encapsed.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + encapsed.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7633,12 +7634,12 @@ yydefault: } case 364: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:5177 + // line internal/php5/php5.y:5178 { yyVAL.node = &ast.ScalarHeredoc{ast.Node{}, yyDollar[1].token.Value, nil} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7647,14 +7648,14 @@ yydefault: } case 365: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5192 + // line internal/php5/php5.y:5193 { target := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.ExprClassConstFetch{ast.Node{}, yyDollar[1].node, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) + target.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7665,7 +7666,7 @@ yydefault: } case 366: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5211 + // line internal/php5/php5.y:5212 { yyVAL.node = yyDollar[1].node @@ -7673,7 +7674,7 @@ yydefault: } case 367: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5220 + // line internal/php5/php5.y:5221 { yyVAL.node = yyDollar[1].node @@ -7681,7 +7682,7 @@ yydefault: } case 368: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5226 + // line internal/php5/php5.y:5227 { yyVAL.node = yyDollar[1].node @@ -7689,14 +7690,14 @@ yydefault: } case 369: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5232 + // line internal/php5/php5.y:5233 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} yyVAL.node = &ast.ExprConstFetch{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(name) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) + yyVAL.node.GetNode().Position = position.NewNodePosition(name) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], yyVAL.node) @@ -7705,14 +7706,14 @@ yydefault: } case 370: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5246 + // line internal/php5/php5.y:5247 { name := &ast.NameRelative{ast.Node{}, yyDollar[3].list} yyVAL.node = &ast.ExprConstFetch{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list) + name.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list) + yyVAL.node.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7722,14 +7723,14 @@ yydefault: } case 371: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:5261 + // line internal/php5/php5.y:5262 { name := &ast.NameFullyQualified{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.ExprConstFetch{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) + name.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7738,12 +7739,12 @@ yydefault: } case 372: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:5275 + // line internal/php5/php5.y:5276 { yyVAL.node = &ast.ExprArray{ast.Node{}, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7754,12 +7755,12 @@ yydefault: } case 373: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5289 + // line internal/php5/php5.y:5290 { yyVAL.node = &ast.ExprShortArray{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7769,7 +7770,7 @@ yydefault: } case 374: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5302 + // line internal/php5/php5.y:5303 { yyVAL.node = yyDollar[1].node @@ -7777,12 +7778,12 @@ yydefault: } case 375: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5308 + // line internal/php5/php5.y:5309 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7791,7 +7792,7 @@ yydefault: } case 376: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5320 + // line internal/php5/php5.y:5321 { yyVAL.node = yyDollar[1].node @@ -7799,12 +7800,12 @@ yydefault: } case 377: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:5329 + // line internal/php5/php5.y:5330 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7815,12 +7816,12 @@ yydefault: } case 378: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5343 + // line internal/php5/php5.y:5344 { yyVAL.node = &ast.ExprBinaryPlus{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7830,12 +7831,12 @@ yydefault: } case 379: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5356 + // line internal/php5/php5.y:5357 { yyVAL.node = &ast.ExprBinaryMinus{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7845,12 +7846,12 @@ yydefault: } case 380: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5369 + // line internal/php5/php5.y:5370 { yyVAL.node = &ast.ExprBinaryMul{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7860,12 +7861,12 @@ yydefault: } case 381: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5382 + // line internal/php5/php5.y:5383 { yyVAL.node = &ast.ExprBinaryPow{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7875,12 +7876,12 @@ yydefault: } case 382: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5395 + // line internal/php5/php5.y:5396 { yyVAL.node = &ast.ExprBinaryDiv{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7890,12 +7891,12 @@ yydefault: } case 383: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5408 + // line internal/php5/php5.y:5409 { yyVAL.node = &ast.ExprBinaryMod{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7905,12 +7906,12 @@ yydefault: } case 384: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:5421 + // line internal/php5/php5.y:5422 { yyVAL.node = &ast.ExprBooleanNot{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7919,12 +7920,12 @@ yydefault: } case 385: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:5433 + // line internal/php5/php5.y:5434 { yyVAL.node = &ast.ExprBitwiseNot{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7933,12 +7934,12 @@ yydefault: } case 386: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5445 + // line internal/php5/php5.y:5446 { yyVAL.node = &ast.ExprBinaryBitwiseOr{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7948,12 +7949,12 @@ yydefault: } case 387: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5458 + // line internal/php5/php5.y:5459 { yyVAL.node = &ast.ExprBinaryBitwiseAnd{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7963,12 +7964,12 @@ yydefault: } case 388: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5471 + // line internal/php5/php5.y:5472 { yyVAL.node = &ast.ExprBinaryBitwiseXor{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7978,12 +7979,12 @@ yydefault: } case 389: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5484 + // line internal/php5/php5.y:5485 { yyVAL.node = &ast.ExprBinaryShiftLeft{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7993,12 +7994,12 @@ yydefault: } case 390: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5497 + // line internal/php5/php5.y:5498 { yyVAL.node = &ast.ExprBinaryShiftRight{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8008,12 +8009,12 @@ yydefault: } case 391: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5510 + // line internal/php5/php5.y:5511 { yyVAL.node = &ast.ExprBinaryConcat{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8023,12 +8024,12 @@ yydefault: } case 392: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5523 + // line internal/php5/php5.y:5524 { yyVAL.node = &ast.ExprBinaryLogicalXor{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8038,12 +8039,12 @@ yydefault: } case 393: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5536 + // line internal/php5/php5.y:5537 { yyVAL.node = &ast.ExprBinaryLogicalAnd{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8053,12 +8054,12 @@ yydefault: } case 394: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5549 + // line internal/php5/php5.y:5550 { yyVAL.node = &ast.ExprBinaryLogicalOr{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8068,12 +8069,12 @@ yydefault: } case 395: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5562 + // line internal/php5/php5.y:5563 { yyVAL.node = &ast.ExprBinaryBooleanAnd{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8083,12 +8084,12 @@ yydefault: } case 396: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5575 + // line internal/php5/php5.y:5576 { yyVAL.node = &ast.ExprBinaryBooleanOr{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8098,12 +8099,12 @@ yydefault: } case 397: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5588 + // line internal/php5/php5.y:5589 { yyVAL.node = &ast.ExprBinaryIdentical{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8113,12 +8114,12 @@ yydefault: } case 398: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5601 + // line internal/php5/php5.y:5602 { yyVAL.node = &ast.ExprBinaryNotIdentical{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8128,12 +8129,12 @@ yydefault: } case 399: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5614 + // line internal/php5/php5.y:5615 { yyVAL.node = &ast.ExprBinaryEqual{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8143,12 +8144,12 @@ yydefault: } case 400: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5627 + // line internal/php5/php5.y:5628 { yyVAL.node = &ast.ExprBinaryNotEqual{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8159,12 +8160,12 @@ yydefault: } case 401: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5641 + // line internal/php5/php5.y:5642 { yyVAL.node = &ast.ExprBinarySmaller{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8174,12 +8175,12 @@ yydefault: } case 402: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5654 + // line internal/php5/php5.y:5655 { yyVAL.node = &ast.ExprBinaryGreater{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8189,12 +8190,12 @@ yydefault: } case 403: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5667 + // line internal/php5/php5.y:5668 { yyVAL.node = &ast.ExprBinarySmallerOrEqual{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8204,12 +8205,12 @@ yydefault: } case 404: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5680 + // line internal/php5/php5.y:5681 { yyVAL.node = &ast.ExprBinaryGreaterOrEqual{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8219,12 +8220,12 @@ yydefault: } case 405: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:5693 + // line internal/php5/php5.y:5694 { yyVAL.node = &ast.ExprTernary{ast.Node{}, yyDollar[1].node, nil, yyDollar[4].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8235,12 +8236,12 @@ yydefault: } case 406: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:5707 + // line internal/php5/php5.y:5708 { yyVAL.node = &ast.ExprTernary{ast.Node{}, yyDollar[1].node, yyDollar[3].node, yyDollar[5].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[5].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[5].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8251,12 +8252,12 @@ yydefault: } case 407: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:5721 + // line internal/php5/php5.y:5722 { yyVAL.node = &ast.ExprUnaryPlus{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8265,12 +8266,12 @@ yydefault: } case 408: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:5733 + // line internal/php5/php5.y:5734 { yyVAL.node = &ast.ExprUnaryMinus{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8279,7 +8280,7 @@ yydefault: } case 409: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5745 + // line internal/php5/php5.y:5746 { yyVAL.node = yyDollar[2].node @@ -8291,7 +8292,7 @@ yydefault: } case 410: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5758 + // line internal/php5/php5.y:5759 { yyVAL.node = yyDollar[1].node @@ -8299,14 +8300,14 @@ yydefault: } case 411: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5764 + // line internal/php5/php5.y:5765 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} yyVAL.node = &ast.ExprConstFetch{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(name) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) + yyVAL.node.GetNode().Position = position.NewNodePosition(name) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], yyVAL.node) @@ -8315,14 +8316,14 @@ yydefault: } case 412: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5778 + // line internal/php5/php5.y:5779 { name := &ast.NameRelative{ast.Node{}, yyDollar[3].list} yyVAL.node = &ast.ExprConstFetch{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(name) + name.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list) + yyVAL.node.GetNode().Position = position.NewNodePosition(name) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8332,14 +8333,14 @@ yydefault: } case 413: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:5793 + // line internal/php5/php5.y:5794 { name := &ast.NameFullyQualified{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.ExprConstFetch{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(name) + name.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewNodePosition(name) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8348,14 +8349,14 @@ yydefault: } case 414: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5810 + // line internal/php5/php5.y:5811 { name := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} yyVAL.node = &ast.ExprVariable{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8364,7 +8365,7 @@ yydefault: } case 415: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5824 + // line internal/php5/php5.y:5825 { yyVAL.node = yyDollar[1].node @@ -8372,7 +8373,7 @@ yydefault: } case 416: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5830 + // line internal/php5/php5.y:5831 { yyVAL.node = yyDollar[1].node @@ -8380,7 +8381,7 @@ yydefault: } case 417: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5836 + // line internal/php5/php5.y:5837 { yyVAL.node = yyDollar[1].node @@ -8388,12 +8389,12 @@ yydefault: } case 418: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5842 + // line internal/php5/php5.y:5843 { yyVAL.node = &ast.ScalarEncapsed{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8402,12 +8403,12 @@ yydefault: } case 419: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5854 + // line internal/php5/php5.y:5855 { yyVAL.node = &ast.ScalarHeredoc{ast.Node{}, yyDollar[1].token.Value, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8416,12 +8417,12 @@ yydefault: } case 420: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5866 + // line internal/php5/php5.y:5867 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8430,7 +8431,7 @@ yydefault: } case 421: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:5881 + // line internal/php5/php5.y:5882 { yyVAL.list = nil @@ -8438,7 +8439,7 @@ yydefault: } case 422: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:5887 + // line internal/php5/php5.y:5888 { yyVAL.list = yyDollar[1].list @@ -8451,25 +8452,25 @@ yydefault: } case 423: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:5901 + // line internal/php5/php5.y:5902 { yyVAL.token = nil } case 424: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5905 + // line internal/php5/php5.y:5906 { yyVAL.token = yyDollar[1].token } case 425: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:5912 + // line internal/php5/php5.y:5913 { arrayItem := &ast.ExprArrayItem{ast.Node{}, false, yyDollar[3].node, yyDollar[5].node} yyVAL.list = append(yyDollar[1].list, arrayItem) // save position - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[3].node, yyDollar[5].node) + arrayItem.GetNode().Position = position.NewNodesPosition(yyDollar[3].node, yyDollar[5].node) // save comments yylex.(*Parser).setFreeFloating(lastNode(yyDollar[1].list), token.End, yyDollar[2].token.Hidden) @@ -8480,13 +8481,13 @@ yydefault: } case 426: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5927 + // line internal/php5/php5.y:5928 { arrayItem := &ast.ExprArrayItem{ast.Node{}, false, nil, yyDollar[3].node} yyVAL.list = append(yyDollar[1].list, arrayItem) // save position - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[3].node) + arrayItem.GetNode().Position = position.NewNodePosition(yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(lastNode(yyDollar[1].list), token.End, yyDollar[2].token.Hidden) @@ -8496,13 +8497,13 @@ yydefault: } case 427: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5941 + // line internal/php5/php5.y:5942 { arrayItem := &ast.ExprArrayItem{ast.Node{}, false, yyDollar[1].node, yyDollar[3].node} yyVAL.list = []ast.Vertex{arrayItem} // save position - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + arrayItem.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, arrayItem) @@ -8512,13 +8513,13 @@ yydefault: } case 428: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5955 + // line internal/php5/php5.y:5956 { arrayItem := &ast.ExprArrayItem{ast.Node{}, false, nil, yyDollar[1].node} yyVAL.list = []ast.Vertex{arrayItem} // save position - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + arrayItem.GetNode().Position = position.NewNodePosition(yyDollar[1].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, arrayItem) @@ -8527,7 +8528,7 @@ yydefault: } case 429: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5971 + // line internal/php5/php5.y:5972 { yyVAL.node = yyDollar[1].node @@ -8535,7 +8536,7 @@ yydefault: } case 430: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:5977 + // line internal/php5/php5.y:5978 { yyVAL.node = yyDollar[1].node @@ -8543,7 +8544,7 @@ yydefault: } case 431: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:5986 + // line internal/php5/php5.y:5987 { yyVAL.node = yyDollar[2].node @@ -8561,7 +8562,7 @@ yydefault: } case 432: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:6002 + // line internal/php5/php5.y:6003 { yyVAL.node = yyDollar[2].node @@ -8579,7 +8580,7 @@ yydefault: } case 433: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6022 + // line internal/php5/php5.y:6023 { yyVAL.node = yyDollar[1].node @@ -8587,7 +8588,7 @@ yydefault: } case 434: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6032 + // line internal/php5/php5.y:6033 { yyVAL.node = yyDollar[1].node @@ -8595,7 +8596,7 @@ yydefault: } case 435: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6041 + // line internal/php5/php5.y:6042 { yyVAL.node = yyDollar[1].node @@ -8603,7 +8604,7 @@ yydefault: } case 436: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:6050 + // line internal/php5/php5.y:6051 { yyVAL.node = yyDollar[1].node @@ -8619,19 +8620,19 @@ yydefault: switch nn := n.(type) { case *ast.ExprArrayDimFetch: nn.Var = yyVAL.node - nn.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn) + nn.GetNode().Position = position.NewNodesPosition(yyVAL.node, nn) yyVAL.node = nn yylex.(*Parser).MoveFreeFloating(nn.Var, yyVAL.node) case *ast.ExprPropertyFetch: nn.Var = yyVAL.node - nn.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn) + nn.GetNode().Position = position.NewNodesPosition(yyVAL.node, nn) yyVAL.node = nn yylex.(*Parser).MoveFreeFloating(nn.Var, yyVAL.node) case *ast.ExprMethodCall: nn.Var = yyVAL.node - nn.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn) + nn.GetNode().Position = position.NewNodesPosition(yyVAL.node, nn) yyVAL.node = nn yylex.(*Parser).MoveFreeFloating(nn.Var, yyVAL.node) } @@ -8641,19 +8642,19 @@ yydefault: switch nn := n.(type) { case *ast.ExprArrayDimFetch: nn.Var = yyVAL.node - nn.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn) + nn.GetNode().Position = position.NewNodesPosition(yyVAL.node, nn) yyVAL.node = nn yylex.(*Parser).MoveFreeFloating(nn.Var, yyVAL.node) case *ast.ExprPropertyFetch: nn.Var = yyVAL.node - nn.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn) + nn.GetNode().Position = position.NewNodesPosition(yyVAL.node, nn) yyVAL.node = nn yylex.(*Parser).MoveFreeFloating(nn.Var, yyVAL.node) case *ast.ExprMethodCall: nn.Var = yyVAL.node - nn.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn) + nn.GetNode().Position = position.NewNodesPosition(yyVAL.node, nn) yyVAL.node = nn yylex.(*Parser).MoveFreeFloating(nn.Var, yyVAL.node) } @@ -8663,7 +8664,7 @@ yydefault: } case 437: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6108 + // line internal/php5/php5.y:6109 { yyVAL.node = yyDollar[1].node @@ -8671,7 +8672,7 @@ yydefault: } case 438: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:6117 + // line internal/php5/php5.y:6118 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].list...) @@ -8679,7 +8680,7 @@ yydefault: } case 439: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:6123 + // line internal/php5/php5.y:6124 { yyVAL.list = []ast.Vertex{} @@ -8687,7 +8688,7 @@ yydefault: } case 440: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:6133 + // line internal/php5/php5.y:6134 { if yyDollar[3].list != nil { yyDollar[3].list[0].(*ast.ExprMethodCall).Method = yyDollar[2].list[len(yyDollar[2].list)-1].(*ast.ExprPropertyFetch).Property @@ -8703,13 +8704,13 @@ yydefault: } case 441: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:6150 + // line internal/php5/php5.y:6151 { fetch := &ast.ExprArrayDimFetch{ast.Node{}, nil, yyDollar[3].node} yyVAL.list = append(yyDollar[1].list, fetch) // save position - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[3].node) + fetch.GetNode().Position = position.NewNodePosition(yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(fetch, token.Var, append(yyDollar[2].token.Hidden, yylex.(*Parser).GetFreeFloatingToken(yyDollar[2].token)...)) @@ -8719,13 +8720,13 @@ yydefault: } case 442: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:6164 + // line internal/php5/php5.y:6165 { fetch := &ast.ExprArrayDimFetch{ast.Node{}, nil, yyDollar[3].node} yyVAL.list = []ast.Vertex{yyDollar[1].node, fetch} // save position - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[3].node) + fetch.GetNode().Position = position.NewNodePosition(yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(fetch, token.Var, append(yyDollar[2].token.Hidden, yylex.(*Parser).GetFreeFloatingToken(yyDollar[2].token)...)) @@ -8735,18 +8736,18 @@ yydefault: } case 443: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6181 + // line internal/php5/php5.y:6182 { yyVAL.node = &ast.ExprMethodCall{ast.Node{}, nil, nil, yyDollar[1].node.(*ast.ArgumentList)} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[1].node) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } case 444: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6193 + // line internal/php5/php5.y:6194 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -8754,7 +8755,7 @@ yydefault: } case 445: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6199 + // line internal/php5/php5.y:6200 { yyVAL.list = yyDollar[1].list @@ -8762,7 +8763,7 @@ yydefault: } case 446: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:6205 + // line internal/php5/php5.y:6206 { yyVAL.list = nil @@ -8770,7 +8771,7 @@ yydefault: } case 447: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6214 + // line internal/php5/php5.y:6215 { yyVAL.node = yyDollar[1].node @@ -8778,12 +8779,12 @@ yydefault: } case 448: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:6220 + // line internal/php5/php5.y:6221 { yyDollar[1].simpleIndirectReference.last.VarName = yyDollar[2].node for _, n := range yyDollar[1].simpleIndirectReference.all { - n.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(n, yyDollar[2].node) + n.GetNode().Position = position.NewNodesPosition(n, yyDollar[2].node) } yyVAL.node = yyDollar[1].simpleIndirectReference.all[0] @@ -8792,12 +8793,12 @@ yydefault: } case 449: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:6235 + // line internal/php5/php5.y:6236 { yyVAL.node = &ast.ExprStaticPropertyFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8807,12 +8808,12 @@ yydefault: } case 450: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:6248 + // line internal/php5/php5.y:6249 { yyVAL.node = &ast.ExprStaticPropertyFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8822,7 +8823,7 @@ yydefault: } case 451: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6264 + // line internal/php5/php5.y:6265 { yyVAL.node = yyDollar[1].node @@ -8830,12 +8831,12 @@ yydefault: } case 452: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:6273 + // line internal/php5/php5.y:6274 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8846,12 +8847,12 @@ yydefault: } case 453: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:6287 + // line internal/php5/php5.y:6288 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8862,7 +8863,7 @@ yydefault: } case 454: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6304 + // line internal/php5/php5.y:6305 { yyVAL.node = yyDollar[1].node @@ -8870,7 +8871,7 @@ yydefault: } case 455: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6310 + // line internal/php5/php5.y:6311 { yyVAL.node = yyDollar[1].node @@ -8878,7 +8879,7 @@ yydefault: } case 456: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6316 + // line internal/php5/php5.y:6317 { yyVAL.node = yyDollar[1].node @@ -8886,7 +8887,7 @@ yydefault: } case 457: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6326 + // line internal/php5/php5.y:6327 { yyVAL.node = yyDollar[1].node @@ -8894,12 +8895,12 @@ yydefault: } case 458: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:6332 + // line internal/php5/php5.y:6333 { yyDollar[1].simpleIndirectReference.last.VarName = yyDollar[2].node for _, n := range yyDollar[1].simpleIndirectReference.all { - n.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(n, yyDollar[2].node) + n.GetNode().Position = position.NewNodesPosition(n, yyDollar[2].node) } yyVAL.node = yyDollar[1].simpleIndirectReference.all[0] @@ -8908,7 +8909,7 @@ yydefault: } case 459: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6344 + // line internal/php5/php5.y:6345 { yyVAL.node = yyDollar[1].node @@ -8916,12 +8917,12 @@ yydefault: } case 460: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:6353 + // line internal/php5/php5.y:6354 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8932,12 +8933,12 @@ yydefault: } case 461: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:6367 + // line internal/php5/php5.y:6368 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -8948,7 +8949,7 @@ yydefault: } case 462: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6381 + // line internal/php5/php5.y:6382 { yyVAL.node = yyDollar[1].node @@ -8956,14 +8957,14 @@ yydefault: } case 463: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6391 + // line internal/php5/php5.y:6392 { name := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} yyVAL.node = &ast.ExprVariable{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8973,12 +8974,12 @@ yydefault: } case 464: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:6406 + // line internal/php5/php5.y:6407 { yyVAL.node = &ast.ExprVariable{ast.Node{}, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8990,7 +8991,7 @@ yydefault: } case 465: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:6424 + // line internal/php5/php5.y:6425 { yyVAL.node = nil @@ -8998,7 +8999,7 @@ yydefault: } case 466: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6430 + // line internal/php5/php5.y:6431 { yyVAL.node = yyDollar[1].node @@ -9006,7 +9007,7 @@ yydefault: } case 467: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6440 + // line internal/php5/php5.y:6441 { yyVAL.list = yyDollar[1].list @@ -9014,25 +9015,25 @@ yydefault: } case 468: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6446 + // line internal/php5/php5.y:6447 { fetch := &ast.ExprPropertyFetch{ast.Node{}, nil, yyDollar[1].node} yyVAL.list = []ast.Vertex{fetch} // save position - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + fetch.GetNode().Position = position.NewNodePosition(yyDollar[1].node) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } case 469: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:6459 + // line internal/php5/php5.y:6460 { fetch := &ast.ExprArrayDimFetch{ast.Node{}, nil, yyDollar[3].node} yyVAL.list = append(yyDollar[1].list, fetch) // save position - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[3].node) + fetch.GetNode().Position = position.NewNodePosition(yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(fetch, token.Var, append(yyDollar[2].token.Hidden, yylex.(*Parser).GetFreeFloatingToken(yyDollar[2].token)...)) @@ -9042,13 +9043,13 @@ yydefault: } case 470: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:6473 + // line internal/php5/php5.y:6474 { fetch := &ast.ExprArrayDimFetch{ast.Node{}, nil, yyDollar[3].node} yyVAL.list = append(yyDollar[1].list, fetch) // save position - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[3].node) + fetch.GetNode().Position = position.NewNodePosition(yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(fetch, token.Var, append(yyDollar[2].token.Hidden, yylex.(*Parser).GetFreeFloatingToken(yyDollar[2].token)...)) @@ -9058,24 +9059,24 @@ yydefault: } case 471: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6487 + // line internal/php5/php5.y:6488 { fetch := &ast.ExprPropertyFetch{ast.Node{}, nil, yyDollar[1].node} yyVAL.list = []ast.Vertex{fetch} // save position - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + fetch.GetNode().Position = position.NewNodePosition(yyDollar[1].node) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } case 472: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6500 + // line internal/php5/php5.y:6501 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -9084,12 +9085,12 @@ yydefault: } case 473: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:6512 + // line internal/php5/php5.y:6513 { yyVAL.node = yyDollar[2].node // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, append(yyDollar[1].token.Hidden, append(yylex.(*Parser).GetFreeFloatingToken(yyDollar[1].token), yyVAL.node.GetNode().Tokens[token.Start]...)...)) @@ -9099,13 +9100,13 @@ yydefault: } case 474: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6528 + // line internal/php5/php5.y:6529 { n := &ast.ExprVariable{ast.Node{}, nil} yyVAL.simpleIndirectReference = simpleIndirectReference{[]*ast.ExprVariable{n}, n} // save position - n.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + n.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(n, token.Start, yyDollar[1].token.Hidden) @@ -9115,7 +9116,7 @@ yydefault: } case 475: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:6542 + // line internal/php5/php5.y:6543 { n := &ast.ExprVariable{ast.Node{}, nil} @@ -9125,7 +9126,7 @@ yydefault: yyVAL.simpleIndirectReference = yyDollar[1].simpleIndirectReference // save position - n.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) + n.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(n, token.Start, yyDollar[2].token.Hidden) @@ -9135,7 +9136,7 @@ yydefault: } case 476: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:6563 + // line internal/php5/php5.y:6564 { if len(yyDollar[1].list) == 0 { yyDollar[1].list = []ast.Vertex{&ast.ExprArrayItem{ast.Node{}, false, nil, nil}} @@ -9150,7 +9151,7 @@ yydefault: } case 477: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6576 + // line internal/php5/php5.y:6577 { if yyDollar[1].node.(*ast.ExprArrayItem).Key == nil && yyDollar[1].node.(*ast.ExprArrayItem).Val == nil { yyVAL.list = []ast.Vertex{} @@ -9162,12 +9163,12 @@ yydefault: } case 478: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6590 + // line internal/php5/php5.y:6591 { yyVAL.node = &ast.ExprArrayItem{ast.Node{}, false, nil, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[1].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -9176,14 +9177,14 @@ yydefault: } case 479: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:6602 + // line internal/php5/php5.y:6603 { listNode := &ast.ExprList{ast.Node{}, yyDollar[3].list} yyVAL.node = &ast.ExprArrayItem{ast.Node{}, false, nil, listNode} // save position - listNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(listNode) + listNode.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodePosition(listNode) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -9194,7 +9195,7 @@ yydefault: } case 480: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:6618 + // line internal/php5/php5.y:6619 { yyVAL.node = &ast.ExprArrayItem{ast.Node{}, false, nil, nil} @@ -9202,7 +9203,7 @@ yydefault: } case 481: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php5/php5.y:6628 + // line internal/php5/php5.y:6629 { yyVAL.list = []ast.Vertex{} @@ -9210,7 +9211,7 @@ yydefault: } case 482: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:6634 + // line internal/php5/php5.y:6635 { yyVAL.list = yyDollar[1].list @@ -9227,13 +9228,13 @@ yydefault: } case 483: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php5/php5.y:6652 + // line internal/php5/php5.y:6653 { arrayItem := &ast.ExprArrayItem{ast.Node{}, false, yyDollar[3].node, yyDollar[5].node} yyVAL.list = append(yyDollar[1].list, arrayItem) // save position - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[3].node, yyDollar[5].node) + arrayItem.GetNode().Position = position.NewNodesPosition(yyDollar[3].node, yyDollar[5].node) // save comments yylex.(*Parser).setFreeFloating(lastNode(yyDollar[1].list), token.End, yyDollar[2].token.Hidden) @@ -9244,13 +9245,13 @@ yydefault: } case 484: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:6667 + // line internal/php5/php5.y:6668 { arrayItem := &ast.ExprArrayItem{ast.Node{}, false, nil, yyDollar[3].node} yyVAL.list = append(yyDollar[1].list, arrayItem) // save position - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[3].node) + arrayItem.GetNode().Position = position.NewNodePosition(yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(lastNode(yyDollar[1].list), token.End, yyDollar[2].token.Hidden) @@ -9260,13 +9261,13 @@ yydefault: } case 485: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:6681 + // line internal/php5/php5.y:6682 { arrayItem := &ast.ExprArrayItem{ast.Node{}, false, yyDollar[1].node, yyDollar[3].node} yyVAL.list = []ast.Vertex{arrayItem} // save position - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + arrayItem.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, arrayItem) @@ -9276,13 +9277,13 @@ yydefault: } case 486: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6695 + // line internal/php5/php5.y:6696 { arrayItem := &ast.ExprArrayItem{ast.Node{}, false, nil, yyDollar[1].node} yyVAL.list = []ast.Vertex{arrayItem} // save position - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + arrayItem.GetNode().Position = position.NewNodePosition(yyDollar[1].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, arrayItem) @@ -9291,15 +9292,15 @@ yydefault: } case 487: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php5/php5.y:6708 + // line internal/php5/php5.y:6709 { reference := &ast.ExprReference{ast.Node{}, yyDollar[6].node} arrayItem := &ast.ExprArrayItem{ast.Node{}, false, yyDollar[3].node, reference} yyVAL.list = append(yyDollar[1].list, arrayItem) // save position - reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[5].token, yyDollar[6].node) - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[3].node, yyDollar[6].node) + reference.GetNode().Position = position.NewTokenNodePosition(yyDollar[5].token, yyDollar[6].node) + arrayItem.GetNode().Position = position.NewNodesPosition(yyDollar[3].node, yyDollar[6].node) // save comments yylex.(*Parser).setFreeFloating(lastNode(yyDollar[1].list), token.End, yyDollar[2].token.Hidden) @@ -9311,15 +9312,15 @@ yydefault: } case 488: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:6726 + // line internal/php5/php5.y:6727 { reference := &ast.ExprReference{ast.Node{}, yyDollar[4].node} arrayItem := &ast.ExprArrayItem{ast.Node{}, false, nil, reference} yyVAL.list = append(yyDollar[1].list, arrayItem) // save position - reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[3].token, yyDollar[4].node) - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[3].token, yyDollar[4].node) + reference.GetNode().Position = position.NewTokenNodePosition(yyDollar[3].token, yyDollar[4].node) + arrayItem.GetNode().Position = position.NewTokenNodePosition(yyDollar[3].token, yyDollar[4].node) // save comments yylex.(*Parser).setFreeFloating(lastNode(yyDollar[1].list), token.End, yyDollar[2].token.Hidden) @@ -9329,15 +9330,15 @@ yydefault: } case 489: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:6742 + // line internal/php5/php5.y:6743 { reference := &ast.ExprReference{ast.Node{}, yyDollar[4].node} arrayItem := &ast.ExprArrayItem{ast.Node{}, false, yyDollar[1].node, reference} yyVAL.list = []ast.Vertex{arrayItem} // save position - reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[3].token, yyDollar[4].node) - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) + reference.GetNode().Position = position.NewTokenNodePosition(yyDollar[3].token, yyDollar[4].node) + arrayItem.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, arrayItem) @@ -9348,15 +9349,15 @@ yydefault: } case 490: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:6759 + // line internal/php5/php5.y:6760 { reference := &ast.ExprReference{ast.Node{}, yyDollar[2].node} arrayItem := &ast.ExprArrayItem{ast.Node{}, false, nil, reference} yyVAL.list = []ast.Vertex{arrayItem} // save position - reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) - arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + reference.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + arrayItem.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(arrayItem, token.Start, yyDollar[1].token.Hidden) @@ -9365,7 +9366,7 @@ yydefault: } case 491: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:6777 + // line internal/php5/php5.y:6778 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) @@ -9373,13 +9374,13 @@ yydefault: } case 492: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:6783 + // line internal/php5/php5.y:6784 { encapsed := &ast.ScalarEncapsedStringPart{ast.Node{}, yyDollar[2].token.Value} yyVAL.list = append(yyDollar[1].list, encapsed) // save position - encapsed.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) + encapsed.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(encapsed, token.Start, yyDollar[2].token.Hidden) @@ -9388,7 +9389,7 @@ yydefault: } case 493: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6796 + // line internal/php5/php5.y:6797 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -9396,13 +9397,13 @@ yydefault: } case 494: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:6802 + // line internal/php5/php5.y:6803 { encapsed := &ast.ScalarEncapsedStringPart{ast.Node{}, yyDollar[1].token.Value} yyVAL.list = []ast.Vertex{encapsed, yyDollar[2].node} // save position - encapsed.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + encapsed.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(encapsed, token.Start, yyDollar[1].token.Hidden) @@ -9411,14 +9412,14 @@ yydefault: } case 495: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6818 + // line internal/php5/php5.y:6819 { name := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} yyVAL.node = &ast.ExprVariable{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -9428,16 +9429,16 @@ yydefault: } case 496: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:6833 + // line internal/php5/php5.y:6834 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, variable, yyDollar[3].node} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).addDollarToken(variable) @@ -9448,7 +9449,7 @@ yydefault: } case 497: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:6851 + // line internal/php5/php5.y:6852 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -9456,10 +9457,10 @@ yydefault: yyVAL.node = &ast.ExprPropertyFetch{ast.Node{}, variable, fetch} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + fetch.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).addDollarToken(variable) @@ -9470,14 +9471,14 @@ yydefault: } case 498: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:6871 + // line internal/php5/php5.y:6872 { variable := &ast.ExprVariable{ast.Node{}, yyDollar[2].node} yyVAL.node = variable // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yylex.(*Parser).GetFreeFloatingToken(yyDollar[1].token)) @@ -9487,7 +9488,7 @@ yydefault: } case 499: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:6886 + // line internal/php5/php5.y:6887 { name := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} variable := &ast.ExprVariable{ast.Node{}, name} @@ -9495,8 +9496,8 @@ yydefault: yyVAL.node = variable // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yylex.(*Parser).GetFreeFloatingToken(yyDollar[1].token)) @@ -9506,16 +9507,16 @@ yydefault: } case 500: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php5/php5.y:6903 + // line internal/php5/php5.y:6904 { identifier := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} variable := &ast.ExprVariable{ast.Node{}, identifier} yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, variable, yyDollar[4].node} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[6].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[6].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yylex.(*Parser).GetFreeFloatingToken(yyDollar[1].token)) @@ -9527,7 +9528,7 @@ yydefault: } case 501: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:6922 + // line internal/php5/php5.y:6923 { yyVAL.node = yyDollar[2].node @@ -9539,12 +9540,12 @@ yydefault: } case 502: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6935 + // line internal/php5/php5.y:6936 { yyVAL.node = &ast.ScalarString{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -9553,7 +9554,7 @@ yydefault: } case 503: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6947 + // line internal/php5/php5.y:6948 { // TODO: add option to handle 64 bit integer if _, err := strconv.Atoi(string(yyDollar[1].token.Value)); err == nil { @@ -9563,7 +9564,7 @@ yydefault: } // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -9572,14 +9573,14 @@ yydefault: } case 504: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:6964 + // line internal/php5/php5.y:6965 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} yyVAL.node = &ast.ExprVariable{ast.Node{}, identifier} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -9589,12 +9590,12 @@ yydefault: } case 505: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:6982 + // line internal/php5/php5.y:6983 { yyVAL.node = &ast.ExprIsset{ast.Node{}, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -9605,12 +9606,12 @@ yydefault: } case 506: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:6996 + // line internal/php5/php5.y:6997 { yyVAL.node = &ast.ExprEmpty{ast.Node{}, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -9621,12 +9622,12 @@ yydefault: } case 507: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:7010 + // line internal/php5/php5.y:7011 { yyVAL.node = &ast.ExprEmpty{ast.Node{}, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -9637,12 +9638,12 @@ yydefault: } case 508: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:7024 + // line internal/php5/php5.y:7025 { yyVAL.node = &ast.ExprInclude{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -9651,12 +9652,12 @@ yydefault: } case 509: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:7036 + // line internal/php5/php5.y:7037 { yyVAL.node = &ast.ExprIncludeOnce{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -9665,12 +9666,12 @@ yydefault: } case 510: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php5/php5.y:7048 + // line internal/php5/php5.y:7049 { yyVAL.node = &ast.ExprEval{ast.Node{}, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -9681,12 +9682,12 @@ yydefault: } case 511: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:7062 + // line internal/php5/php5.y:7063 { yyVAL.node = &ast.ExprRequire{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -9695,12 +9696,12 @@ yydefault: } case 512: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php5/php5.y:7074 + // line internal/php5/php5.y:7075 { yyVAL.node = &ast.ExprRequireOnce{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -9709,7 +9710,7 @@ yydefault: } case 513: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:7089 + // line internal/php5/php5.y:7090 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -9717,7 +9718,7 @@ yydefault: } case 514: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:7095 + // line internal/php5/php5.y:7096 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -9728,7 +9729,7 @@ yydefault: } case 515: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:7107 + // line internal/php5/php5.y:7108 { yyVAL.node = yyDollar[1].node @@ -9736,7 +9737,7 @@ yydefault: } case 516: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php5/php5.y:7113 + // line internal/php5/php5.y:7114 { yyVAL.node = yyDollar[1].node @@ -9744,14 +9745,14 @@ yydefault: } case 517: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:7122 + // line internal/php5/php5.y:7123 { target := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.ExprClassConstFetch{ast.Node{}, yyDollar[1].node, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) + target.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -9762,14 +9763,14 @@ yydefault: } case 518: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:7138 + // line internal/php5/php5.y:7139 { target := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.ExprClassConstFetch{ast.Node{}, yyDollar[1].node, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) + target.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -9780,14 +9781,14 @@ yydefault: } case 519: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:7157 + // line internal/php5/php5.y:7158 { target := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.ExprClassConstFetch{ast.Node{}, yyDollar[1].node, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) + target.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -9798,14 +9799,14 @@ yydefault: } case 520: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php5/php5.y:7176 + // line internal/php5/php5.y:7177 { target := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.ExprClassConstFetch{ast.Node{}, yyDollar[1].node, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) + target.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) 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 --- a/internal/php7/php7.go +++ b/internal/php7/php7.go @@ -11,12 +11,13 @@ import ( "bytes" "strconv" + "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" ) -// line internal/php7/php7.y:15 +// line internal/php7/php7.y:16 type yySymType struct { yys int node ast.Vertex @@ -345,7 +346,7 @@ const yyEofCode = 1 const yyErrCode = 2 const yyInitialStackSize = 16 -// line internal/php7/php7.y:5662 +// line internal/php7/php7.y:5663 // line yacctab:1 var yyExca = [...]int{ @@ -2112,12 +2113,12 @@ yydefault: case 1: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:293 + // line internal/php7/php7.y:294 { yylex.(*Parser).rootNode = &ast.Root{ast.Node{}, yyDollar[1].list} // save position - yylex.(*Parser).rootNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) + yylex.(*Parser).rootNode.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) yylex.(*Parser).setFreeFloating(yylex.(*Parser).rootNode, token.End, yylex.(*Parser).currentToken.Hidden) @@ -2125,469 +2126,469 @@ yydefault: } case 2: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:306 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 3: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:306 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 4: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:306 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 5: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:306 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 6: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:306 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 7: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:306 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 8: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:306 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 9: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:306 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 10: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:307 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 11: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:307 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 12: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:307 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 13: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:307 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 14: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:307 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 15: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:307 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 16: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:307 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 17: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:307 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 18: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:307 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 19: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:307 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 20: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:307 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 21: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:307 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 22: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:308 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 23: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:308 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 24: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:308 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 25: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:308 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 26: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:308 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 27: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:308 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 28: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:308 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 29: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:308 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 30: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:308 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 31: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:308 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 32: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 33: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 34: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 35: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 36: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 37: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 38: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 39: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 40: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 41: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 42: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 43: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 44: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 45: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 46: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 47: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 48: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 49: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 50: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 51: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 52: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 53: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 54: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 55: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 56: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 57: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 58: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 59: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 60: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 61: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:313 { yyVAL.token = yyDollar[1].token } case 62: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:313 { yyVAL.token = yyDollar[1].token } case 63: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:313 { yyVAL.token = yyDollar[1].token } case 64: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:313 { yyVAL.token = yyDollar[1].token } case 65: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:313 { yyVAL.token = yyDollar[1].token } case 66: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:313 { yyVAL.token = yyDollar[1].token } case 67: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:313 { yyVAL.token = yyDollar[1].token } case 68: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:313 { yyVAL.token = yyDollar[1].token } case 69: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:313 { yyVAL.token = yyDollar[1].token } case 70: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:317 + // line internal/php7/php7.y:318 { yyVAL.token = yyDollar[1].token } case 71: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:320 + // line internal/php7/php7.y:321 { yyVAL.token = yyDollar[1].token } case 72: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:320 + // line internal/php7/php7.y:321 { yyVAL.token = yyDollar[1].token } case 73: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:320 + // line internal/php7/php7.y:321 { yyVAL.token = yyDollar[1].token } case 74: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:320 + // line internal/php7/php7.y:321 { yyVAL.token = yyDollar[1].token } case 75: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:320 + // line internal/php7/php7.y:321 { yyVAL.token = yyDollar[1].token } case 76: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:320 + // line internal/php7/php7.y:321 { yyVAL.token = yyDollar[1].token } case 77: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:325 + // line internal/php7/php7.y:326 { yyVAL.token = yyDollar[1].token } case 78: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:329 + // line internal/php7/php7.y:330 { yyVAL.token = yyDollar[1].token } case 79: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:336 + // line internal/php7/php7.y:337 { if inlineHtmlNode, ok := yyDollar[2].node.(*ast.StmtInlineHtml); ok && len(yyDollar[1].list) > 0 { prevNode := lastNode(yyDollar[1].list) @@ -2602,7 +2603,7 @@ yydefault: } case 80: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:349 + // line internal/php7/php7.y:350 { yyVAL.list = []ast.Vertex{} @@ -2610,13 +2611,13 @@ yydefault: } case 81: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:358 + // line internal/php7/php7.y:359 { namePart := &ast.NameNamePart{ast.Node{}, yyDollar[1].token.Value} yyVAL.list = []ast.Vertex{namePart} // save position - namePart.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + namePart.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(namePart, token.Start, yyDollar[1].token.Hidden) @@ -2625,13 +2626,13 @@ yydefault: } case 82: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:371 + // line internal/php7/php7.y:372 { namePart := &ast.NameNamePart{ast.Node{}, yyDollar[3].token.Value} yyVAL.list = append(yyDollar[1].list, namePart) // save position - namePart.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) + namePart.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(lastNode(yyDollar[1].list), token.End, yyDollar[2].token.Hidden) @@ -2641,12 +2642,12 @@ yydefault: } case 83: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:388 + // line internal/php7/php7.y:389 { yyVAL.node = &ast.NameName{ast.Node{}, yyDollar[1].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) + yyVAL.node.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], yyVAL.node) @@ -2655,12 +2656,12 @@ yydefault: } case 84: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:400 + // line internal/php7/php7.y:401 { yyVAL.node = &ast.NameRelative{ast.Node{}, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list) + yyVAL.node.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2670,12 +2671,12 @@ yydefault: } case 85: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:413 + // line internal/php7/php7.y:414 { yyVAL.node = &ast.NameFullyQualified{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2684,7 +2685,7 @@ yydefault: } case 86: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:428 + // line internal/php7/php7.y:429 { // error yyVAL.node = nil @@ -2693,7 +2694,7 @@ yydefault: } case 87: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:435 + // line internal/php7/php7.y:436 { yyVAL.node = yyDollar[1].node @@ -2701,7 +2702,7 @@ yydefault: } case 88: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:441 + // line internal/php7/php7.y:442 { yyVAL.node = yyDollar[1].node @@ -2709,7 +2710,7 @@ yydefault: } case 89: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:447 + // line internal/php7/php7.y:448 { yyVAL.node = yyDollar[1].node @@ -2717,7 +2718,7 @@ yydefault: } case 90: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:453 + // line internal/php7/php7.y:454 { yyVAL.node = yyDollar[1].node @@ -2725,7 +2726,7 @@ yydefault: } case 91: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:459 + // line internal/php7/php7.y:460 { yyVAL.node = yyDollar[1].node @@ -2733,12 +2734,12 @@ yydefault: } case 92: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:465 + // line internal/php7/php7.y:466 { yyVAL.node = &ast.StmtHaltCompiler{ast.Node{}} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2751,14 +2752,14 @@ yydefault: } case 93: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:481 + // line internal/php7/php7.y:482 { name := &ast.NameName{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtNamespace{ast.Node{}, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2770,14 +2771,14 @@ yydefault: } case 94: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:498 + // line internal/php7/php7.y:499 { name := &ast.NameName{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtNamespace{ast.Node{}, name, yyDollar[4].list} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[5].token) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[5].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2789,12 +2790,12 @@ yydefault: } case 95: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:515 + // line internal/php7/php7.y:516 { yyVAL.node = &ast.StmtNamespace{ast.Node{}, nil, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2805,12 +2806,12 @@ yydefault: } case 96: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:529 + // line internal/php7/php7.y:530 { yyVAL.node = yyDollar[2].node // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2821,13 +2822,13 @@ yydefault: } case 97: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:543 + // line internal/php7/php7.y:544 { yyDollar[3].node.(*ast.StmtGroupUse).UseType = yyDollar[2].node yyVAL.node = yyDollar[3].node // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2838,12 +2839,12 @@ yydefault: } case 98: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:558 + // line internal/php7/php7.y:559 { yyVAL.node = &ast.StmtUseList{ast.Node{}, nil, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2854,12 +2855,12 @@ yydefault: } case 99: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:572 + // line internal/php7/php7.y:573 { yyVAL.node = &ast.StmtUseList{ast.Node{}, yyDollar[2].node, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2870,12 +2871,12 @@ yydefault: } case 100: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:586 + // line internal/php7/php7.y:587 { yyVAL.node = &ast.StmtConstList{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2886,12 +2887,12 @@ yydefault: } case 101: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:603 + // line internal/php7/php7.y:604 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2900,12 +2901,12 @@ yydefault: } case 102: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:615 + // line internal/php7/php7.y:616 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -2914,14 +2915,14 @@ yydefault: } case 103: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:630 + // line internal/php7/php7.y:631 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} yyVAL.node = &ast.StmtGroupUse{ast.Node{}, nil, name, yyDollar[4].list} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[6].token) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) + yyVAL.node.GetNode().Position = position.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[6].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], name) @@ -2937,14 +2938,14 @@ yydefault: } case 104: yyDollar = yyS[yypt-7 : yypt+1] - // line internal/php7/php7.y:651 + // line internal/php7/php7.y:652 { name := &ast.NameName{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtGroupUse{ast.Node{}, nil, name, yyDollar[5].list} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[7].token) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[7].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.UseType, yyDollar[1].token.Hidden) @@ -2961,14 +2962,14 @@ yydefault: } case 105: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:676 + // line internal/php7/php7.y:677 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} yyVAL.node = &ast.StmtGroupUse{ast.Node{}, nil, name, yyDollar[4].list} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[6].token) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) + yyVAL.node.GetNode().Position = position.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[6].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], name) @@ -2984,14 +2985,14 @@ yydefault: } case 106: yyDollar = yyS[yypt-7 : yypt+1] - // line internal/php7/php7.y:697 + // line internal/php7/php7.y:698 { name := &ast.NameName{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtGroupUse{ast.Node{}, nil, name, yyDollar[5].list} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[7].token) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[7].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Use, append(yyDollar[1].token.Hidden, yylex.(*Parser).GetFreeFloatingToken(yyDollar[1].token)...)) @@ -3008,19 +3009,19 @@ yydefault: } case 107: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:722 + // line internal/php7/php7.y:723 { yyVAL.token = nil } case 108: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:726 + // line internal/php7/php7.y:727 { yyVAL.token = yyDollar[1].token } case 109: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:733 + // line internal/php7/php7.y:734 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -3031,7 +3032,7 @@ yydefault: } case 110: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:742 + // line internal/php7/php7.y:743 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3039,7 +3040,7 @@ yydefault: } case 111: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:751 + // line internal/php7/php7.y:752 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -3050,7 +3051,7 @@ yydefault: } case 112: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:760 + // line internal/php7/php7.y:761 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3058,7 +3059,7 @@ yydefault: } case 113: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:769 + // line internal/php7/php7.y:770 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -3069,7 +3070,7 @@ yydefault: } case 114: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:778 + // line internal/php7/php7.y:779 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3077,7 +3078,7 @@ yydefault: } case 115: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:787 + // line internal/php7/php7.y:788 { yyVAL.node = yyDollar[1].node @@ -3085,7 +3086,7 @@ yydefault: } case 116: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:793 + // line internal/php7/php7.y:794 { yyDollar[2].node.(*ast.StmtUse).UseType = yyDollar[1].node yyVAL.node = yyDollar[2].node @@ -3094,14 +3095,14 @@ yydefault: } case 117: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:803 + // line internal/php7/php7.y:804 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} yyVAL.node = &ast.StmtUse{ast.Node{}, nil, name, nil} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) + yyVAL.node.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], name) @@ -3110,16 +3111,16 @@ yydefault: } case 118: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:817 + // line internal/php7/php7.y:818 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} alias := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.StmtUse{ast.Node{}, nil, name, alias} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[1].list) - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[3].token) + name.GetNode().Position = position.NewNodeListPosition(yyDollar[1].list) + alias.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[3].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], name) @@ -3130,7 +3131,7 @@ yydefault: } case 119: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:838 + // line internal/php7/php7.y:839 { yyVAL.node = yyDollar[1].node @@ -3141,7 +3142,7 @@ yydefault: } case 120: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:847 + // line internal/php7/php7.y:848 { yyVAL.node = yyDollar[2].node @@ -3156,7 +3157,7 @@ yydefault: } case 121: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:863 + // line internal/php7/php7.y:864 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -3167,7 +3168,7 @@ yydefault: } case 122: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:872 + // line internal/php7/php7.y:873 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3175,7 +3176,7 @@ yydefault: } case 123: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:881 + // line internal/php7/php7.y:882 { if inlineHtmlNode, ok := yyDollar[2].node.(*ast.StmtInlineHtml); ok && len(yyDollar[1].list) > 0 { prevNode := lastNode(yyDollar[1].list) @@ -3190,7 +3191,7 @@ yydefault: } case 124: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:894 + // line internal/php7/php7.y:895 { yyVAL.list = []ast.Vertex{} @@ -3198,7 +3199,7 @@ yydefault: } case 125: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:903 + // line internal/php7/php7.y:904 { // error yyVAL.node = nil @@ -3207,7 +3208,7 @@ yydefault: } case 126: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:910 + // line internal/php7/php7.y:911 { yyVAL.node = yyDollar[1].node @@ -3215,7 +3216,7 @@ yydefault: } case 127: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:916 + // line internal/php7/php7.y:917 { yyVAL.node = yyDollar[1].node @@ -3223,7 +3224,7 @@ yydefault: } case 128: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:922 + // line internal/php7/php7.y:923 { yyVAL.node = yyDollar[1].node @@ -3231,7 +3232,7 @@ yydefault: } case 129: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:928 + // line internal/php7/php7.y:929 { yyVAL.node = yyDollar[1].node @@ -3239,7 +3240,7 @@ yydefault: } case 130: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:934 + // line internal/php7/php7.y:935 { yyVAL.node = yyDollar[1].node @@ -3247,12 +3248,12 @@ yydefault: } case 131: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:940 + // line internal/php7/php7.y:941 { yyVAL.node = &ast.StmtHaltCompiler{ast.Node{}} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3265,12 +3266,12 @@ yydefault: } case 132: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:958 + // line internal/php7/php7.y:959 { yyVAL.node = &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3280,7 +3281,7 @@ yydefault: } case 133: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:971 + // line internal/php7/php7.y:972 { yyVAL.node = yyDollar[1].node @@ -3288,7 +3289,7 @@ yydefault: } case 134: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:977 + // line internal/php7/php7.y:978 { yyVAL.node = yyDollar[1].node @@ -3296,7 +3297,7 @@ yydefault: } case 135: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:983 + // line internal/php7/php7.y:984 { switch n := yyDollar[5].node.(type) { case *ast.StmtWhile: @@ -3308,7 +3309,7 @@ yydefault: yyVAL.node = yyDollar[5].node // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3319,12 +3320,12 @@ yydefault: } case 136: yyDollar = yyS[yypt-7 : yypt+1] - // line internal/php7/php7.y:1004 + // line internal/php7/php7.y:1005 { yyVAL.node = &ast.StmtDo{ast.Node{}, yyDollar[2].node, yyDollar[5].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[7].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[7].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3338,7 +3339,7 @@ yydefault: } case 137: yyDollar = yyS[yypt-9 : yypt+1] - // line internal/php7/php7.y:1021 + // line internal/php7/php7.y:1022 { switch n := yyDollar[9].node.(type) { case *ast.StmtFor: @@ -3354,7 +3355,7 @@ yydefault: yyVAL.node = yyDollar[9].node // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[9].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[9].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3367,7 +3368,7 @@ yydefault: } case 138: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:1048 + // line internal/php7/php7.y:1049 { switch n := yyDollar[5].node.(type) { case *ast.StmtSwitch: @@ -3381,7 +3382,7 @@ yydefault: yyVAL.node = yyDollar[5].node // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3392,12 +3393,12 @@ yydefault: } case 139: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1071 + // line internal/php7/php7.y:1072 { yyVAL.node = &ast.StmtBreak{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3408,12 +3409,12 @@ yydefault: } case 140: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1085 + // line internal/php7/php7.y:1086 { yyVAL.node = &ast.StmtContinue{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3424,12 +3425,12 @@ yydefault: } case 141: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1099 + // line internal/php7/php7.y:1100 { yyVAL.node = &ast.StmtReturn{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3440,12 +3441,12 @@ yydefault: } case 142: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1113 + // line internal/php7/php7.y:1114 { yyVAL.node = &ast.StmtGlobal{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3456,12 +3457,12 @@ yydefault: } case 143: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1127 + // line internal/php7/php7.y:1128 { yyVAL.node = &ast.StmtStatic{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3472,12 +3473,12 @@ yydefault: } case 144: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1141 + // line internal/php7/php7.y:1142 { yyVAL.node = &ast.StmtEcho{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3489,12 +3490,12 @@ yydefault: } case 145: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1156 + // line internal/php7/php7.y:1157 { yyVAL.node = &ast.StmtInlineHtml{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3503,12 +3504,12 @@ yydefault: } case 146: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:1168 + // line internal/php7/php7.y:1169 { yyVAL.node = &ast.StmtExpression{ast.Node{}, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -3519,12 +3520,12 @@ yydefault: } case 147: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:1182 + // line internal/php7/php7.y:1183 { yyVAL.node = &ast.StmtUnset{ast.Node{}, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[6].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[6].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3541,7 +3542,7 @@ yydefault: } case 148: yyDollar = yyS[yypt-7 : yypt+1] - // line internal/php7/php7.y:1202 + // line internal/php7/php7.y:1203 { switch n := yyDollar[7].node.(type) { case *ast.StmtForeach: @@ -3555,7 +3556,7 @@ yydefault: yyVAL.node = yyDollar[7].node // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[7].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[7].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3567,7 +3568,7 @@ yydefault: } case 149: yyDollar = yyS[yypt-9 : yypt+1] - // line internal/php7/php7.y:1227 + // line internal/php7/php7.y:1228 { switch n := yyDollar[9].node.(type) { case *ast.StmtForeach: @@ -3583,7 +3584,7 @@ yydefault: yyVAL.node = yyDollar[9].node // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[9].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[9].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3596,13 +3597,13 @@ yydefault: } case 150: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:1254 + // line internal/php7/php7.y:1255 { yyVAL.node = yyDollar[5].node yyVAL.node.(*ast.StmtDeclare).Consts = yyDollar[3].list // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3613,12 +3614,12 @@ yydefault: } case 151: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1269 + // line internal/php7/php7.y:1270 { yyVAL.node = &ast.StmtNop{ast.Node{}} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3628,14 +3629,14 @@ yydefault: } case 152: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:1282 + // line internal/php7/php7.y:1283 { if yyDollar[6].node == nil { yyVAL.node = &ast.StmtTry{ast.Node{}, yyDollar[3].list, yyDollar[5].list, yyDollar[6].node} - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[5].list) + yyVAL.node.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[5].list) } else { yyVAL.node = &ast.StmtTry{ast.Node{}, yyDollar[3].list, yyDollar[5].list, yyDollar[6].node} - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[6].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[6].node) } // save comments @@ -3647,12 +3648,12 @@ yydefault: } case 153: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1299 + // line internal/php7/php7.y:1300 { yyVAL.node = &ast.StmtThrow{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3663,14 +3664,14 @@ yydefault: } case 154: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1313 + // line internal/php7/php7.y:1314 { label := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} yyVAL.node = &ast.StmtGoto{ast.Node{}, label} // save position - label.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + label.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3682,14 +3683,14 @@ yydefault: } case 155: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:1330 + // line internal/php7/php7.y:1331 { label := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} yyVAL.node = &ast.StmtLabel{ast.Node{}, label} // save position - label.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + label.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3699,7 +3700,7 @@ yydefault: } case 156: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:1347 + // line internal/php7/php7.y:1348 { yyVAL.list = []ast.Vertex{} @@ -3707,7 +3708,7 @@ yydefault: } case 157: yyDollar = yyS[yypt-9 : yypt+1] - // line internal/php7/php7.y:1353 + // line internal/php7/php7.y:1354 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[5].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -3715,9 +3716,9 @@ yydefault: yyVAL.list = append(yyDollar[1].list, catch) // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[5].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[5].token) - catch.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[2].token, yyDollar[9].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[5].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[5].token) + catch.GetNode().Position = position.NewTokensPosition(yyDollar[2].token, yyDollar[9].token) // save comments yylex.(*Parser).setFreeFloating(catch, token.Start, yyDollar[2].token.Hidden) @@ -3732,7 +3733,7 @@ yydefault: } case 158: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1378 + // line internal/php7/php7.y:1379 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3740,7 +3741,7 @@ yydefault: } case 159: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1384 + // line internal/php7/php7.y:1385 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -3751,7 +3752,7 @@ yydefault: } case 160: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:1396 + // line internal/php7/php7.y:1397 { yyVAL.node = nil @@ -3759,12 +3760,12 @@ yydefault: } case 161: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1402 + // line internal/php7/php7.y:1403 { yyVAL.node = &ast.StmtFinally{ast.Node{}, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3775,7 +3776,7 @@ yydefault: } case 162: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1419 + // line internal/php7/php7.y:1420 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3783,7 +3784,7 @@ yydefault: } case 163: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1425 + // line internal/php7/php7.y:1426 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -3794,7 +3795,7 @@ yydefault: } case 164: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1437 + // line internal/php7/php7.y:1438 { yyVAL.node = yyDollar[1].node @@ -3802,14 +3803,14 @@ yydefault: } case 165: yyDollar = yyS[yypt-11 : yypt+1] - // line internal/php7/php7.y:1446 + // line internal/php7/php7.y:1447 { name := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.StmtFunction{ast.Node{}, yyDollar[2].token != nil, name, yyDollar[6].list, yyDollar[8].node, yyDollar[10].list} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[11].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[11].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3838,38 +3839,38 @@ yydefault: } case 166: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:1482 + // line internal/php7/php7.y:1483 { yyVAL.token = nil } case 167: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1486 + // line internal/php7/php7.y:1487 { yyVAL.token = yyDollar[1].token } case 168: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:1493 + // line internal/php7/php7.y:1494 { yyVAL.token = nil } case 169: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1497 + // line internal/php7/php7.y:1498 { yyVAL.token = yyDollar[1].token } case 170: yyDollar = yyS[yypt-9 : yypt+1] - // line internal/php7/php7.y:1504 + // line internal/php7/php7.y:1505 { name := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.StmtClass{ast.Node{}, name, yyDollar[1].list, nil, yyDollar[4].ClassExtends, yyDollar[5].ClassImplements, yyDollar[8].list} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewOptionalListTokensPosition(yyDollar[1].list, yyDollar[2].token, yyDollar[9].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewOptionalListTokensPosition(yyDollar[1].list, yyDollar[2].token, yyDollar[9].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], yyVAL.node) @@ -3882,14 +3883,14 @@ yydefault: } case 171: yyDollar = yyS[yypt-8 : yypt+1] - // line internal/php7/php7.y:1522 + // line internal/php7/php7.y:1523 { name := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} yyVAL.node = &ast.StmtClass{ast.Node{}, name, nil, nil, yyDollar[3].ClassExtends, yyDollar[4].ClassImplements, yyDollar[7].list} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[8].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[8].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3901,7 +3902,7 @@ yydefault: } case 172: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1542 + // line internal/php7/php7.y:1543 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3909,7 +3910,7 @@ yydefault: } case 173: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:1548 + // line internal/php7/php7.y:1549 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) @@ -3917,12 +3918,12 @@ yydefault: } case 174: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1557 + // line internal/php7/php7.y:1558 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3931,12 +3932,12 @@ yydefault: } case 175: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1569 + // line internal/php7/php7.y:1570 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3945,14 +3946,14 @@ yydefault: } case 176: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:1584 + // line internal/php7/php7.y:1585 { name := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} yyVAL.node = &ast.StmtTrait{ast.Node{}, name, yyDollar[5].list} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[6].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[6].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3964,14 +3965,14 @@ yydefault: } case 177: yyDollar = yyS[yypt-7 : yypt+1] - // line internal/php7/php7.y:1604 + // line internal/php7/php7.y:1605 { name := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} yyVAL.node = &ast.StmtInterface{ast.Node{}, name, yyDollar[3].InterfaceExtends, yyDollar[6].list} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[7].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[7].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -3983,7 +3984,7 @@ yydefault: } case 178: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:1624 + // line internal/php7/php7.y:1625 { yyVAL.ClassExtends = nil @@ -3991,12 +3992,12 @@ yydefault: } case 179: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:1630 + // line internal/php7/php7.y:1631 { yyVAL.ClassExtends = &ast.StmtClassExtends{ast.Node{}, yyDollar[2].node} // save position - yyVAL.ClassExtends.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.ClassExtends.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.ClassExtends, token.Start, yyDollar[1].token.Hidden) @@ -4005,7 +4006,7 @@ yydefault: } case 180: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:1645 + // line internal/php7/php7.y:1646 { yyVAL.InterfaceExtends = nil @@ -4013,12 +4014,12 @@ yydefault: } case 181: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:1651 + // line internal/php7/php7.y:1652 { yyVAL.InterfaceExtends = &ast.StmtInterfaceExtends{ast.Node{}, yyDollar[2].list} // save position - yyVAL.InterfaceExtends.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) + yyVAL.InterfaceExtends.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.InterfaceExtends, token.Start, yyDollar[1].token.Hidden) @@ -4027,7 +4028,7 @@ yydefault: } case 182: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:1666 + // line internal/php7/php7.y:1667 { yyVAL.ClassImplements = nil @@ -4035,12 +4036,12 @@ yydefault: } case 183: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:1672 + // line internal/php7/php7.y:1673 { yyVAL.ClassImplements = &ast.StmtClassImplements{ast.Node{}, yyDollar[2].list} // save position - yyVAL.ClassImplements.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) + yyVAL.ClassImplements.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.ClassImplements, token.Start, yyDollar[1].token.Hidden) @@ -4049,7 +4050,7 @@ yydefault: } case 184: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1687 + // line internal/php7/php7.y:1688 { yyVAL.node = yyDollar[1].node @@ -4057,12 +4058,12 @@ yydefault: } case 185: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:1693 + // line internal/php7/php7.y:1694 { yyVAL.node = &ast.ExprReference{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4071,12 +4072,12 @@ yydefault: } case 186: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1705 + // line internal/php7/php7.y:1706 { yyVAL.node = &ast.ExprList{ast.Node{}, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4087,12 +4088,12 @@ yydefault: } case 187: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1719 + // line internal/php7/php7.y:1720 { yyVAL.node = &ast.ExprShortList{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save commentsc yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4102,25 +4103,25 @@ yydefault: } case 188: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1735 + // line internal/php7/php7.y:1736 { yyVAL.node = &ast.StmtFor{ast.Node{}, nil, nil, nil, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[1].node) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } case 189: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1744 + // line internal/php7/php7.y:1745 { stmtList := &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtAltFor{ast.Node{}, nil, nil, nil, stmtList} // save position - stmtList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + stmtList.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Cond, yyDollar[1].token.Hidden) @@ -4132,25 +4133,25 @@ yydefault: } case 190: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1764 + // line internal/php7/php7.y:1765 { yyVAL.node = &ast.StmtForeach{ast.Node{}, nil, nil, nil, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[1].node) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } case 191: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1773 + // line internal/php7/php7.y:1774 { stmtList := &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtAltForeach{ast.Node{}, nil, nil, nil, stmtList} // save position - stmtList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + stmtList.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Cond, yyDollar[1].token.Hidden) @@ -4162,25 +4163,25 @@ yydefault: } case 192: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1793 + // line internal/php7/php7.y:1794 { yyVAL.node = &ast.StmtDeclare{ast.Node{}, false, nil, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[1].node) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } case 193: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1802 + // line internal/php7/php7.y:1803 { stmtList := &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtDeclare{ast.Node{}, true, nil, stmtList} // save position - stmtList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + stmtList.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Cond, yyDollar[1].token.Hidden) @@ -4192,14 +4193,14 @@ yydefault: } case 194: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1822 + // line internal/php7/php7.y:1823 { caseList := &ast.StmtCaseList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtSwitch{ast.Node{}, nil, caseList} // save position - caseList.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + caseList.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(caseList, token.Start, yyDollar[1].token.Hidden) @@ -4209,14 +4210,14 @@ yydefault: } case 195: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1837 + // line internal/php7/php7.y:1838 { caseList := &ast.StmtCaseList{ast.Node{}, yyDollar[3].list} yyVAL.node = &ast.StmtSwitch{ast.Node{}, nil, caseList} // save position - caseList.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + caseList.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(caseList, token.Start, yyDollar[1].token.Hidden) @@ -4227,14 +4228,14 @@ yydefault: } case 196: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1853 + // line internal/php7/php7.y:1854 { caseList := &ast.StmtCaseList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtAltSwitch{ast.Node{}, nil, caseList} // save position - caseList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + caseList.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Cond, yyDollar[1].token.Hidden) @@ -4246,15 +4247,15 @@ yydefault: } case 197: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:1870 + // line internal/php7/php7.y:1871 { caseList := &ast.StmtCaseList{ast.Node{}, yyDollar[3].list} yyVAL.node = &ast.StmtAltSwitch{ast.Node{}, nil, caseList} // save position - caseList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[3].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[5].token) + caseList.GetNode().Position = position.NewNodeListPosition(yyDollar[3].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[5].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Cond, yyDollar[1].token.Hidden) @@ -4267,7 +4268,7 @@ yydefault: } case 198: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:1892 + // line internal/php7/php7.y:1893 { yyVAL.list = []ast.Vertex{} @@ -4275,13 +4276,13 @@ yydefault: } case 199: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:1898 + // line internal/php7/php7.y:1899 { _case := &ast.StmtCase{ast.Node{}, yyDollar[3].node, yyDollar[5].list} yyVAL.list = append(yyDollar[1].list, _case) // save position - _case.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[2].token, yyDollar[5].list) + _case.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[2].token, yyDollar[5].list) // save comments yylex.(*Parser).setFreeFloating(_case, token.Start, yyDollar[2].token.Hidden) @@ -4292,13 +4293,13 @@ yydefault: } case 200: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1913 + // line internal/php7/php7.y:1914 { _default := &ast.StmtDefault{ast.Node{}, yyDollar[4].list} yyVAL.list = append(yyDollar[1].list, _default) // save position - _default.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[2].token, yyDollar[4].list) + _default.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[2].token, yyDollar[4].list) // save comments yylex.(*Parser).setFreeFloating(_default, token.Start, yyDollar[2].token.Hidden) @@ -4309,37 +4310,37 @@ yydefault: } case 201: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1931 + // line internal/php7/php7.y:1932 { yyVAL.token = yyDollar[1].token } case 202: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1935 + // line internal/php7/php7.y:1936 { yyVAL.token = yyDollar[1].token } case 203: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1942 + // line internal/php7/php7.y:1943 { yyVAL.node = &ast.StmtWhile{ast.Node{}, nil, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[1].node) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } case 204: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1951 + // line internal/php7/php7.y:1952 { stmtList := &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtAltWhile{ast.Node{}, nil, stmtList} // save position - stmtList.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[2].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + stmtList.GetNode().Position = position.NewNodeListPosition(yyDollar[2].list) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Cond, yyDollar[1].token.Hidden) @@ -4351,12 +4352,12 @@ yydefault: } case 205: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:1971 + // line internal/php7/php7.y:1972 { yyVAL.node = &ast.StmtIf{ast.Node{}, yyDollar[3].node, yyDollar[5].node, nil, nil} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4367,7 +4368,7 @@ yydefault: } case 206: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:1985 + // line internal/php7/php7.y:1986 { _elseIf := &ast.StmtElseIf{ast.Node{}, yyDollar[4].node, yyDollar[6].node} yyDollar[1].node.(*ast.StmtIf).ElseIf = append(yyDollar[1].node.(*ast.StmtIf).ElseIf, _elseIf) @@ -4375,8 +4376,8 @@ yydefault: yyVAL.node = yyDollar[1].node // save position - _elseIf.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[2].token, yyDollar[6].node) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[6].node) + _elseIf.GetNode().Position = position.NewTokenNodePosition(yyDollar[2].token, yyDollar[6].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[6].node) // save comments yylex.(*Parser).setFreeFloating(_elseIf, token.Start, yyDollar[2].token.Hidden) @@ -4387,7 +4388,7 @@ yydefault: } case 207: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2006 + // line internal/php7/php7.y:2007 { yyVAL.node = yyDollar[1].node @@ -4395,7 +4396,7 @@ yydefault: } case 208: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2012 + // line internal/php7/php7.y:2013 { _else := &ast.StmtElse{ast.Node{}, yyDollar[3].node} yyDollar[1].node.(*ast.StmtIf).Else = _else @@ -4403,8 +4404,8 @@ yydefault: yyVAL.node = yyDollar[1].node // save position - _else.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[2].token, yyDollar[3].node) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + _else.GetNode().Position = position.NewTokenNodePosition(yyDollar[2].token, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(_else, token.Start, yyDollar[2].token.Hidden) @@ -4413,14 +4414,14 @@ yydefault: } case 209: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:2031 + // line internal/php7/php7.y:2032 { stmts := &ast.StmtStmtList{ast.Node{}, yyDollar[6].list} yyVAL.node = &ast.StmtAltIf{ast.Node{}, yyDollar[3].node, stmts, nil, nil} // save position - stmts.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[6].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[6].list) + stmts.GetNode().Position = position.NewNodeListPosition(yyDollar[6].list) + yyVAL.node.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[6].list) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4432,7 +4433,7 @@ yydefault: } case 210: yyDollar = yyS[yypt-7 : yypt+1] - // line internal/php7/php7.y:2048 + // line internal/php7/php7.y:2049 { stmts := &ast.StmtStmtList{ast.Node{}, yyDollar[7].list} _elseIf := &ast.StmtAltElseIf{ast.Node{}, yyDollar[4].node, stmts} @@ -4441,8 +4442,8 @@ yydefault: yyVAL.node = yyDollar[1].node // save position - stmts.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[7].list) - _elseIf.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[2].token, yyDollar[7].list) + stmts.GetNode().Position = position.NewNodeListPosition(yyDollar[7].list) + _elseIf.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[2].token, yyDollar[7].list) // save comments yylex.(*Parser).setFreeFloating(_elseIf, token.Start, yyDollar[2].token.Hidden) @@ -4454,12 +4455,12 @@ yydefault: } case 211: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2071 + // line internal/php7/php7.y:2072 { yyVAL.node = yyDollar[1].node // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Stmts, yyDollar[2].token.Hidden) @@ -4470,7 +4471,7 @@ yydefault: } case 212: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:2085 + // line internal/php7/php7.y:2086 { stmts := &ast.StmtStmtList{ast.Node{}, yyDollar[4].list} _else := &ast.StmtAltElse{ast.Node{}, stmts} @@ -4479,9 +4480,9 @@ yydefault: yyVAL.node = yyDollar[1].node // save position - stmts.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition(yyDollar[4].list) - _else.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[2].token, yyDollar[4].list) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[6].token) + stmts.GetNode().Position = position.NewNodeListPosition(yyDollar[4].list) + _else.GetNode().Position = position.NewTokenNodeListPosition(yyDollar[2].token, yyDollar[4].list) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[6].token) // save comments yylex.(*Parser).setFreeFloating(_else, token.Start, yyDollar[2].token.Hidden) @@ -4494,7 +4495,7 @@ yydefault: } case 213: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2110 + // line internal/php7/php7.y:2111 { yyVAL.list = yyDollar[1].list @@ -4502,7 +4503,7 @@ yydefault: } case 214: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:2116 + // line internal/php7/php7.y:2117 { yyVAL.list = nil @@ -4510,7 +4511,7 @@ yydefault: } case 215: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2125 + // line internal/php7/php7.y:2126 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -4518,7 +4519,7 @@ yydefault: } case 216: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2131 + // line internal/php7/php7.y:2132 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -4529,23 +4530,23 @@ yydefault: } case 217: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:2143 + // line internal/php7/php7.y:2144 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[4].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} yyVAL.node = &ast.Parameter{ast.Node{}, yyDollar[2].token != nil, yyDollar[3].token != nil, yyDollar[1].node, variable, nil} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) if yyDollar[1].node != nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) } else if yyDollar[2].token != nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[2].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[2].token, yyDollar[4].token) } else if yyDollar[3].token != nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[3].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[3].token, yyDollar[4].token) } else { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) } // save comments @@ -4580,23 +4581,23 @@ yydefault: } case 218: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:2189 + // line internal/php7/php7.y:2190 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[4].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} yyVAL.node = &ast.Parameter{ast.Node{}, yyDollar[2].token != nil, yyDollar[3].token != nil, yyDollar[1].node, variable, yyDollar[6].node} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) if yyDollar[1].node != nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[6].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[6].node) } else if yyDollar[2].token != nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[2].token, yyDollar[6].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[2].token, yyDollar[6].node) } else if yyDollar[3].token != nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[3].token, yyDollar[6].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[3].token, yyDollar[6].node) } else { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[4].token, yyDollar[6].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[4].token, yyDollar[6].node) } // save comments @@ -4632,7 +4633,7 @@ yydefault: } case 219: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:2239 + // line internal/php7/php7.y:2240 { yyVAL.node = nil @@ -4640,7 +4641,7 @@ yydefault: } case 220: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2245 + // line internal/php7/php7.y:2246 { yyVAL.node = yyDollar[1].node @@ -4648,7 +4649,7 @@ yydefault: } case 221: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2254 + // line internal/php7/php7.y:2255 { yyVAL.node = yyDollar[1].node @@ -4656,12 +4657,12 @@ yydefault: } case 222: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2260 + // line internal/php7/php7.y:2261 { yyVAL.node = &ast.Nullable{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4670,12 +4671,12 @@ yydefault: } case 223: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2275 + // line internal/php7/php7.y:2276 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4684,12 +4685,12 @@ yydefault: } case 224: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2287 + // line internal/php7/php7.y:2288 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4698,7 +4699,7 @@ yydefault: } case 225: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2299 + // line internal/php7/php7.y:2300 { yyVAL.node = yyDollar[1].node @@ -4706,7 +4707,7 @@ yydefault: } case 226: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:2308 + // line internal/php7/php7.y:2309 { yyVAL.node = nil @@ -4714,7 +4715,7 @@ yydefault: } case 227: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2314 + // line internal/php7/php7.y:2315 { yyVAL.node = yyDollar[2].node @@ -4725,12 +4726,12 @@ yydefault: } case 228: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2326 + // line internal/php7/php7.y:2327 { yyVAL.node = &ast.ArgumentList{ast.Node{}, nil} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4740,12 +4741,12 @@ yydefault: } case 229: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:2339 + // line internal/php7/php7.y:2340 { yyVAL.node = &ast.ArgumentList{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4759,7 +4760,7 @@ yydefault: } case 230: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2359 + // line internal/php7/php7.y:2360 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -4767,7 +4768,7 @@ yydefault: } case 231: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2365 + // line internal/php7/php7.y:2366 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -4778,12 +4779,12 @@ yydefault: } case 232: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2377 + // line internal/php7/php7.y:2378 { yyVAL.node = &ast.Argument{ast.Node{}, false, false, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[1].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -4792,12 +4793,12 @@ yydefault: } case 233: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2389 + // line internal/php7/php7.y:2390 { yyVAL.node = &ast.Argument{ast.Node{}, true, false, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4806,7 +4807,7 @@ yydefault: } case 234: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2404 + // line internal/php7/php7.y:2405 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -4817,7 +4818,7 @@ yydefault: } case 235: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2413 + // line internal/php7/php7.y:2414 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -4825,7 +4826,7 @@ yydefault: } case 236: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2422 + // line internal/php7/php7.y:2423 { yyVAL.node = yyDollar[1].node @@ -4833,7 +4834,7 @@ yydefault: } case 237: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2431 + // line internal/php7/php7.y:2432 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -4844,7 +4845,7 @@ yydefault: } case 238: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2440 + // line internal/php7/php7.y:2441 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -4852,16 +4853,16 @@ yydefault: } case 239: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2449 + // line internal/php7/php7.y:2450 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} yyVAL.node = &ast.StmtStaticVar{ast.Node{}, variable, nil} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4871,16 +4872,16 @@ yydefault: } case 240: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2466 + // line internal/php7/php7.y:2467 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} yyVAL.node = &ast.StmtStaticVar{ast.Node{}, variable, yyDollar[3].node} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4891,7 +4892,7 @@ yydefault: } case 241: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2487 + // line internal/php7/php7.y:2488 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) @@ -4899,7 +4900,7 @@ yydefault: } case 242: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:2493 + // line internal/php7/php7.y:2494 { yyVAL.list = []ast.Vertex{} @@ -4907,12 +4908,12 @@ yydefault: } case 243: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:2502 + // line internal/php7/php7.y:2503 { yyVAL.node = &ast.StmtPropertyList{ast.Node{}, yyDollar[1].list, yyDollar[2].node, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeListTokenPosition(yyDollar[1].list, yyDollar[4].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].list[0], yyVAL.node) @@ -4923,12 +4924,12 @@ yydefault: } case 244: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:2516 + // line internal/php7/php7.y:2517 { yyVAL.node = &ast.StmtClassConstList{ast.Node{}, yyDollar[1].list, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewOptionalListTokensPosition(yyDollar[1].list, yyDollar[2].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewOptionalListTokensPosition(yyDollar[1].list, yyDollar[2].token, yyDollar[4].token) // save comments if len(yyDollar[1].list) > 0 { @@ -4944,12 +4945,12 @@ yydefault: } case 245: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2535 + // line internal/php7/php7.y:2536 { yyVAL.node = &ast.StmtTraitUse{ast.Node{}, yyDollar[2].list, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -4958,17 +4959,17 @@ yydefault: } case 246: yyDollar = yyS[yypt-10 : yypt+1] - // line internal/php7/php7.y:2547 + // line internal/php7/php7.y:2548 { name := &ast.Identifier{ast.Node{}, yyDollar[4].token.Value} yyVAL.node = &ast.StmtClassMethod{ast.Node{}, yyDollar[3].token != nil, name, yyDollar[1].list, yyDollar[7].list, yyDollar[9].node, yyDollar[10].node} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) if yyDollar[1].list == nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[2].token, yyDollar[10].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[2].token, yyDollar[10].node) } else { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListNodePosition(yyDollar[1].list, yyDollar[10].node) + yyVAL.node.GetNode().Position = position.NewNodeListNodePosition(yyDollar[1].list, yyDollar[10].node) } // save comments @@ -4995,7 +4996,7 @@ yydefault: } case 247: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2584 + // line internal/php7/php7.y:2585 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5003,7 +5004,7 @@ yydefault: } case 248: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2590 + // line internal/php7/php7.y:2591 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -5014,11 +5015,11 @@ yydefault: } case 249: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2602 + // line internal/php7/php7.y:2603 { yyVAL.node = &ast.StmtNop{ast.Node{}} - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5028,11 +5029,11 @@ yydefault: } case 250: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2615 + // line internal/php7/php7.y:2616 { yyVAL.node = &ast.StmtTraitAdaptationList{ast.Node{}, nil} - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5042,11 +5043,11 @@ yydefault: } case 251: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2627 + // line internal/php7/php7.y:2628 { yyVAL.node = &ast.StmtTraitAdaptationList{ast.Node{}, yyDollar[2].list} - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5056,7 +5057,7 @@ yydefault: } case 252: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2642 + // line internal/php7/php7.y:2643 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5064,7 +5065,7 @@ yydefault: } case 253: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2648 + // line internal/php7/php7.y:2649 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) @@ -5072,7 +5073,7 @@ yydefault: } case 254: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2657 + // line internal/php7/php7.y:2658 { yyVAL.node = yyDollar[1].node @@ -5084,7 +5085,7 @@ yydefault: } case 255: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2667 + // line internal/php7/php7.y:2668 { yyVAL.node = yyDollar[1].node @@ -5096,12 +5097,12 @@ yydefault: } case 256: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2680 + // line internal/php7/php7.y:2681 { yyVAL.node = &ast.StmtTraitUsePrecedence{ast.Node{}, yyDollar[1].node, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeNodeListPosition(yyDollar[1].node, yyDollar[3].list) + yyVAL.node.GetNode().Position = position.NewNodeNodeListPosition(yyDollar[1].node, yyDollar[3].list) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5111,14 +5112,14 @@ yydefault: } case 257: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2696 + // line internal/php7/php7.y:2697 { alias := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.StmtTraitUseAlias{ast.Node{}, yyDollar[1].node, nil, alias} // save position - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) + alias.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5129,14 +5130,14 @@ yydefault: } case 258: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2712 + // line internal/php7/php7.y:2713 { alias := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.StmtTraitUseAlias{ast.Node{}, yyDollar[1].node, nil, alias} // save position - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) + alias.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5147,14 +5148,14 @@ yydefault: } case 259: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:2728 + // line internal/php7/php7.y:2729 { alias := &ast.Identifier{ast.Node{}, yyDollar[4].token.Value} yyVAL.node = &ast.StmtTraitUseAlias{ast.Node{}, yyDollar[1].node, yyDollar[3].node, alias} // save position - alias.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[4].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + alias.GetNode().Position = position.NewTokenPosition(yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5165,12 +5166,12 @@ yydefault: } case 260: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2744 + // line internal/php7/php7.y:2745 { yyVAL.node = &ast.StmtTraitUseAlias{ast.Node{}, yyDollar[1].node, yyDollar[3].node, nil} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5180,14 +5181,14 @@ yydefault: } case 261: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2760 + // line internal/php7/php7.y:2761 { name := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} yyVAL.node = &ast.StmtTraitMethodRef{ast.Node{}, nil, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5196,7 +5197,7 @@ yydefault: } case 262: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2774 + // line internal/php7/php7.y:2775 { yyVAL.node = yyDollar[1].node @@ -5204,14 +5205,14 @@ yydefault: } case 263: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2783 + // line internal/php7/php7.y:2784 { target := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.StmtTraitMethodRef{ast.Node{}, yyDollar[1].node, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) + target.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5222,12 +5223,12 @@ yydefault: } case 264: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2802 + // line internal/php7/php7.y:2803 { yyVAL.node = &ast.StmtNop{ast.Node{}} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5237,12 +5238,12 @@ yydefault: } case 265: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2815 + // line internal/php7/php7.y:2816 { yyVAL.node = &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5252,7 +5253,7 @@ yydefault: } case 266: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2831 + // line internal/php7/php7.y:2832 { yyVAL.list = yyDollar[1].list @@ -5260,13 +5261,13 @@ yydefault: } case 267: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2837 + // line internal/php7/php7.y:2838 { modifier := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} yyVAL.list = []ast.Vertex{modifier} // save position - modifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + modifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(modifier, token.Start, yyDollar[1].token.Hidden) @@ -5275,7 +5276,7 @@ yydefault: } case 268: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:2853 + // line internal/php7/php7.y:2854 { yyVAL.list = nil @@ -5283,7 +5284,7 @@ yydefault: } case 269: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2859 + // line internal/php7/php7.y:2860 { yyVAL.list = yyDollar[1].list @@ -5291,7 +5292,7 @@ yydefault: } case 270: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2868 + // line internal/php7/php7.y:2869 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5299,7 +5300,7 @@ yydefault: } case 271: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2874 + // line internal/php7/php7.y:2875 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) @@ -5307,12 +5308,12 @@ yydefault: } case 272: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2883 + // line internal/php7/php7.y:2884 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5321,12 +5322,12 @@ yydefault: } case 273: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2895 + // line internal/php7/php7.y:2896 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5335,12 +5336,12 @@ yydefault: } case 274: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2907 + // line internal/php7/php7.y:2908 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5349,12 +5350,12 @@ yydefault: } case 275: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2919 + // line internal/php7/php7.y:2920 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5363,12 +5364,12 @@ yydefault: } case 276: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2931 + // line internal/php7/php7.y:2932 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5377,12 +5378,12 @@ yydefault: } case 277: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2943 + // line internal/php7/php7.y:2944 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5391,7 +5392,7 @@ yydefault: } case 278: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2958 + // line internal/php7/php7.y:2959 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -5402,7 +5403,7 @@ yydefault: } case 279: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2967 + // line internal/php7/php7.y:2968 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5410,16 +5411,16 @@ yydefault: } case 280: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2976 + // line internal/php7/php7.y:2977 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} yyVAL.node = &ast.StmtProperty{ast.Node{}, variable, nil} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5429,16 +5430,16 @@ yydefault: } case 281: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:2993 + // line internal/php7/php7.y:2994 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} yyVAL.node = &ast.StmtProperty{ast.Node{}, variable, yyDollar[3].node} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5449,7 +5450,7 @@ yydefault: } case 282: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3014 + // line internal/php7/php7.y:3015 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -5460,7 +5461,7 @@ yydefault: } case 283: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:3023 + // line internal/php7/php7.y:3024 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5468,14 +5469,14 @@ yydefault: } case 284: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:3032 + // line internal/php7/php7.y:3033 { name := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} yyVAL.node = &ast.StmtConstant{ast.Node{}, name, yyDollar[3].node} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) + name.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5485,14 +5486,14 @@ yydefault: } case 285: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:3050 + // line internal/php7/php7.y:3051 { name := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} yyVAL.node = &ast.StmtConstant{ast.Node{}, name, yyDollar[3].node} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) + name.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5502,7 +5503,7 @@ yydefault: } case 286: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3068 + // line internal/php7/php7.y:3069 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -5513,7 +5514,7 @@ yydefault: } case 287: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:3077 + // line internal/php7/php7.y:3078 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5521,7 +5522,7 @@ yydefault: } case 288: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:3086 + // line internal/php7/php7.y:3087 { yyVAL.node = yyDollar[1].node @@ -5529,7 +5530,7 @@ yydefault: } case 289: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:3095 + // line internal/php7/php7.y:3096 { yyVAL.list = nil @@ -5537,7 +5538,7 @@ yydefault: } case 290: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:3101 + // line internal/php7/php7.y:3102 { yyVAL.list = yyDollar[1].list @@ -5545,7 +5546,7 @@ yydefault: } case 291: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3110 + // line internal/php7/php7.y:3111 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -5556,7 +5557,7 @@ yydefault: } case 292: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:3119 + // line internal/php7/php7.y:3120 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5564,7 +5565,7 @@ yydefault: } case 293: yyDollar = yyS[yypt-8 : yypt+1] - // line internal/php7/php7.y:3128 + // line internal/php7/php7.y:3129 { if yyDollar[2].node != nil { yyVAL.node = &ast.StmtClass{ast.Node{}, nil, nil, yyDollar[2].node.(*ast.ArgumentList), yyDollar[3].ClassExtends, yyDollar[4].ClassImplements, yyDollar[7].list} @@ -5573,7 +5574,7 @@ yydefault: } // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[8].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[8].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5584,14 +5585,14 @@ yydefault: } case 294: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3149 + // line internal/php7/php7.y:3150 { if yyDollar[3].node != nil { yyVAL.node = &ast.ExprNew{ast.Node{}, yyDollar[2].node, yyDollar[3].node.(*ast.ArgumentList)} - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node) } else { yyVAL.node = &ast.ExprNew{ast.Node{}, yyDollar[2].node, nil} - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) } // save comments @@ -5601,12 +5602,12 @@ yydefault: } case 295: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3164 + // line internal/php7/php7.y:3165 { yyVAL.node = &ast.ExprNew{ast.Node{}, yyDollar[2].node, nil} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5615,14 +5616,14 @@ yydefault: } case 296: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:3179 + // line internal/php7/php7.y:3180 { listNode := &ast.ExprList{ast.Node{}, yyDollar[3].list} yyVAL.node = &ast.ExprAssign{ast.Node{}, listNode, yyDollar[6].node} // save position - listNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[6].node) + listNode.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[6].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5634,14 +5635,14 @@ yydefault: } case 297: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:3196 + // line internal/php7/php7.y:3197 { shortList := &ast.ExprShortList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.ExprAssign{ast.Node{}, shortList, yyDollar[5].node} // save position - shortList.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node) + shortList.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5652,12 +5653,12 @@ yydefault: } case 298: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3212 + // line internal/php7/php7.y:3213 { yyVAL.node = &ast.ExprAssign{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5667,12 +5668,12 @@ yydefault: } case 299: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:3225 + // line internal/php7/php7.y:3226 { yyVAL.node = &ast.ExprAssignReference{ast.Node{}, yyDollar[1].node, yyDollar[4].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5683,12 +5684,12 @@ yydefault: } case 300: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3239 + // line internal/php7/php7.y:3240 { yyVAL.node = &ast.ExprClone{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5697,12 +5698,12 @@ yydefault: } case 301: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3251 + // line internal/php7/php7.y:3252 { yyVAL.node = &ast.ExprAssignPlus{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5712,12 +5713,12 @@ yydefault: } case 302: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3264 + // line internal/php7/php7.y:3265 { yyVAL.node = &ast.ExprAssignMinus{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5727,12 +5728,12 @@ yydefault: } case 303: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3277 + // line internal/php7/php7.y:3278 { yyVAL.node = &ast.ExprAssignMul{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5742,12 +5743,12 @@ yydefault: } case 304: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3290 + // line internal/php7/php7.y:3291 { yyVAL.node = &ast.ExprAssignPow{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5757,12 +5758,12 @@ yydefault: } case 305: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3303 + // line internal/php7/php7.y:3304 { yyVAL.node = &ast.ExprAssignDiv{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5772,12 +5773,12 @@ yydefault: } case 306: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3316 + // line internal/php7/php7.y:3317 { yyVAL.node = &ast.ExprAssignConcat{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5787,12 +5788,12 @@ yydefault: } case 307: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3329 + // line internal/php7/php7.y:3330 { yyVAL.node = &ast.ExprAssignMod{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5802,12 +5803,12 @@ yydefault: } case 308: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3342 + // line internal/php7/php7.y:3343 { yyVAL.node = &ast.ExprAssignBitwiseAnd{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5817,12 +5818,12 @@ yydefault: } case 309: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3355 + // line internal/php7/php7.y:3356 { yyVAL.node = &ast.ExprAssignBitwiseOr{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5832,12 +5833,12 @@ yydefault: } case 310: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3368 + // line internal/php7/php7.y:3369 { yyVAL.node = &ast.ExprAssignBitwiseXor{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5847,12 +5848,12 @@ yydefault: } case 311: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3381 + // line internal/php7/php7.y:3382 { yyVAL.node = &ast.ExprAssignShiftLeft{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5862,12 +5863,12 @@ yydefault: } case 312: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3394 + // line internal/php7/php7.y:3395 { yyVAL.node = &ast.ExprAssignShiftRight{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5877,12 +5878,12 @@ yydefault: } case 313: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3407 + // line internal/php7/php7.y:3408 { yyVAL.node = &ast.ExprAssignCoalesce{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5892,12 +5893,12 @@ yydefault: } case 314: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3420 + // line internal/php7/php7.y:3421 { yyVAL.node = &ast.ExprPostInc{ast.Node{}, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5907,12 +5908,12 @@ yydefault: } case 315: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3433 + // line internal/php7/php7.y:3434 { yyVAL.node = &ast.ExprPreInc{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5921,12 +5922,12 @@ yydefault: } case 316: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3445 + // line internal/php7/php7.y:3446 { yyVAL.node = &ast.ExprPostDec{ast.Node{}, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5936,12 +5937,12 @@ yydefault: } case 317: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3458 + // line internal/php7/php7.y:3459 { yyVAL.node = &ast.ExprPreDec{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -5950,12 +5951,12 @@ yydefault: } case 318: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3470 + // line internal/php7/php7.y:3471 { yyVAL.node = &ast.ExprBinaryBooleanOr{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5965,12 +5966,12 @@ yydefault: } case 319: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3483 + // line internal/php7/php7.y:3484 { yyVAL.node = &ast.ExprBinaryBooleanAnd{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5980,12 +5981,12 @@ yydefault: } case 320: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3496 + // line internal/php7/php7.y:3497 { yyVAL.node = &ast.ExprBinaryLogicalOr{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -5995,12 +5996,12 @@ yydefault: } case 321: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3509 + // line internal/php7/php7.y:3510 { yyVAL.node = &ast.ExprBinaryLogicalAnd{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6010,12 +6011,12 @@ yydefault: } case 322: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3522 + // line internal/php7/php7.y:3523 { yyVAL.node = &ast.ExprBinaryLogicalXor{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6025,12 +6026,12 @@ yydefault: } case 323: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3535 + // line internal/php7/php7.y:3536 { yyVAL.node = &ast.ExprBinaryBitwiseOr{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6040,12 +6041,12 @@ yydefault: } case 324: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3548 + // line internal/php7/php7.y:3549 { yyVAL.node = &ast.ExprBinaryBitwiseAnd{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6055,12 +6056,12 @@ yydefault: } case 325: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3561 + // line internal/php7/php7.y:3562 { yyVAL.node = &ast.ExprBinaryBitwiseXor{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6070,12 +6071,12 @@ yydefault: } case 326: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3574 + // line internal/php7/php7.y:3575 { yyVAL.node = &ast.ExprBinaryConcat{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6085,12 +6086,12 @@ yydefault: } case 327: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3587 + // line internal/php7/php7.y:3588 { yyVAL.node = &ast.ExprBinaryPlus{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6100,12 +6101,12 @@ yydefault: } case 328: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3600 + // line internal/php7/php7.y:3601 { yyVAL.node = &ast.ExprBinaryMinus{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6115,12 +6116,12 @@ yydefault: } case 329: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3613 + // line internal/php7/php7.y:3614 { yyVAL.node = &ast.ExprBinaryMul{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6130,12 +6131,12 @@ yydefault: } case 330: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3626 + // line internal/php7/php7.y:3627 { yyVAL.node = &ast.ExprBinaryPow{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6145,12 +6146,12 @@ yydefault: } case 331: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3639 + // line internal/php7/php7.y:3640 { yyVAL.node = &ast.ExprBinaryDiv{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6160,12 +6161,12 @@ yydefault: } case 332: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3652 + // line internal/php7/php7.y:3653 { yyVAL.node = &ast.ExprBinaryMod{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6175,12 +6176,12 @@ yydefault: } case 333: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3665 + // line internal/php7/php7.y:3666 { yyVAL.node = &ast.ExprBinaryShiftLeft{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6190,12 +6191,12 @@ yydefault: } case 334: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3678 + // line internal/php7/php7.y:3679 { yyVAL.node = &ast.ExprBinaryShiftRight{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6205,12 +6206,12 @@ yydefault: } case 335: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3691 + // line internal/php7/php7.y:3692 { yyVAL.node = &ast.ExprUnaryPlus{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6219,12 +6220,12 @@ yydefault: } case 336: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3703 + // line internal/php7/php7.y:3704 { yyVAL.node = &ast.ExprUnaryMinus{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6233,12 +6234,12 @@ yydefault: } case 337: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3715 + // line internal/php7/php7.y:3716 { yyVAL.node = &ast.ExprBooleanNot{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6247,12 +6248,12 @@ yydefault: } case 338: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3727 + // line internal/php7/php7.y:3728 { yyVAL.node = &ast.ExprBitwiseNot{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6261,12 +6262,12 @@ yydefault: } case 339: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3739 + // line internal/php7/php7.y:3740 { yyVAL.node = &ast.ExprBinaryIdentical{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6276,12 +6277,12 @@ yydefault: } case 340: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3752 + // line internal/php7/php7.y:3753 { yyVAL.node = &ast.ExprBinaryNotIdentical{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6291,12 +6292,12 @@ yydefault: } case 341: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3765 + // line internal/php7/php7.y:3766 { yyVAL.node = &ast.ExprBinaryEqual{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6306,12 +6307,12 @@ yydefault: } case 342: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3778 + // line internal/php7/php7.y:3779 { yyVAL.node = &ast.ExprBinaryNotEqual{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6322,12 +6323,12 @@ yydefault: } case 343: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3792 + // line internal/php7/php7.y:3793 { yyVAL.node = &ast.ExprBinarySmaller{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6337,12 +6338,12 @@ yydefault: } case 344: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3805 + // line internal/php7/php7.y:3806 { yyVAL.node = &ast.ExprBinarySmallerOrEqual{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6352,12 +6353,12 @@ yydefault: } case 345: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3818 + // line internal/php7/php7.y:3819 { yyVAL.node = &ast.ExprBinaryGreater{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6367,12 +6368,12 @@ yydefault: } case 346: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3831 + // line internal/php7/php7.y:3832 { yyVAL.node = &ast.ExprBinaryGreaterOrEqual{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6382,12 +6383,12 @@ yydefault: } case 347: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3844 + // line internal/php7/php7.y:3845 { yyVAL.node = &ast.ExprBinarySpaceship{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6397,12 +6398,12 @@ yydefault: } case 348: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3857 + // line internal/php7/php7.y:3858 { yyVAL.node = &ast.ExprInstanceOf{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6412,7 +6413,7 @@ yydefault: } case 349: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3870 + // line internal/php7/php7.y:3871 { yyVAL.node = yyDollar[2].node @@ -6424,7 +6425,7 @@ yydefault: } case 350: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:3880 + // line internal/php7/php7.y:3881 { yyVAL.node = yyDollar[1].node @@ -6432,12 +6433,12 @@ yydefault: } case 351: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:3886 + // line internal/php7/php7.y:3887 { yyVAL.node = &ast.ExprTernary{ast.Node{}, yyDollar[1].node, yyDollar[3].node, yyDollar[5].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[5].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[5].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6448,12 +6449,12 @@ yydefault: } case 352: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:3900 + // line internal/php7/php7.y:3901 { yyVAL.node = &ast.ExprTernary{ast.Node{}, yyDollar[1].node, nil, yyDollar[4].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6464,12 +6465,12 @@ yydefault: } case 353: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3914 + // line internal/php7/php7.y:3915 { yyVAL.node = &ast.ExprBinaryCoalesce{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6479,7 +6480,7 @@ yydefault: } case 354: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:3927 + // line internal/php7/php7.y:3928 { yyVAL.node = yyDollar[1].node @@ -6487,12 +6488,12 @@ yydefault: } case 355: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3933 + // line internal/php7/php7.y:3934 { yyVAL.node = &ast.ExprCastInt{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6502,12 +6503,12 @@ yydefault: } case 356: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3946 + // line internal/php7/php7.y:3947 { yyVAL.node = &ast.ExprCastDouble{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6517,12 +6518,12 @@ yydefault: } case 357: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3959 + // line internal/php7/php7.y:3960 { yyVAL.node = &ast.ExprCastString{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6532,12 +6533,12 @@ yydefault: } case 358: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3972 + // line internal/php7/php7.y:3973 { yyVAL.node = &ast.ExprCastArray{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6547,12 +6548,12 @@ yydefault: } case 359: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3985 + // line internal/php7/php7.y:3986 { yyVAL.node = &ast.ExprCastObject{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6562,12 +6563,12 @@ yydefault: } case 360: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3998 + // line internal/php7/php7.y:3999 { yyVAL.node = &ast.ExprCastBool{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6577,12 +6578,12 @@ yydefault: } case 361: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4011 + // line internal/php7/php7.y:4012 { yyVAL.node = &ast.ExprCastUnset{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6592,7 +6593,7 @@ yydefault: } case 362: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4024 + // line internal/php7/php7.y:4025 { var e *ast.ExprExit if yyDollar[2].node != nil { @@ -6609,9 +6610,9 @@ yydefault: // save position if yyDollar[2].node == nil { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) } else { - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) } // save comments @@ -6621,12 +6622,12 @@ yydefault: } case 363: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4051 + // line internal/php7/php7.y:4052 { yyVAL.node = &ast.ExprErrorSuppress{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6635,7 +6636,7 @@ yydefault: } case 364: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4063 + // line internal/php7/php7.y:4064 { yyVAL.node = yyDollar[1].node @@ -6643,12 +6644,12 @@ yydefault: } case 365: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4069 + // line internal/php7/php7.y:4070 { yyVAL.node = &ast.ExprShellExec{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6657,12 +6658,12 @@ yydefault: } case 366: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4081 + // line internal/php7/php7.y:4082 { yyVAL.node = &ast.ExprPrint{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6671,12 +6672,12 @@ yydefault: } case 367: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4093 + // line internal/php7/php7.y:4094 { yyVAL.node = &ast.ExprYield{ast.Node{}, nil, nil} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6685,12 +6686,12 @@ yydefault: } case 368: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4105 + // line internal/php7/php7.y:4106 { yyVAL.node = &ast.ExprYield{ast.Node{}, nil, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6699,12 +6700,12 @@ yydefault: } case 369: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4117 + // line internal/php7/php7.y:4118 { yyVAL.node = &ast.ExprYield{ast.Node{}, yyDollar[2].node, yyDollar[4].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[4].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6714,12 +6715,12 @@ yydefault: } case 370: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4130 + // line internal/php7/php7.y:4131 { yyVAL.node = &ast.ExprYieldFrom{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6728,7 +6729,7 @@ yydefault: } case 371: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4142 + // line internal/php7/php7.y:4143 { yyVAL.node = yyDollar[1].node @@ -6736,7 +6737,7 @@ yydefault: } case 372: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4148 + // line internal/php7/php7.y:4149 { yyVAL.node = yyDollar[2].node @@ -6748,7 +6749,7 @@ yydefault: } // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Static, yyVAL.node.GetNode().Tokens[token.Start]) @@ -6759,12 +6760,12 @@ yydefault: } case 373: yyDollar = yyS[yypt-11 : yypt+1] - // line internal/php7/php7.y:4171 + // line internal/php7/php7.y:4172 { yyVAL.node = &ast.ExprClosure{ast.Node{}, yyDollar[2].token != nil, false, yyDollar[5].list, yyDollar[7].ClosureUse, yyDollar[8].node, yyDollar[10].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[11].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[11].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6796,12 +6797,12 @@ yydefault: } case 374: yyDollar = yyS[yypt-9 : yypt+1] - // line internal/php7/php7.y:4203 + // line internal/php7/php7.y:4204 { yyVAL.node = &ast.ExprArrowFunction{ast.Node{}, yyDollar[2].token != nil, false, yyDollar[4].list, yyDollar[6].node, yyDollar[9].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[9].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[9].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6828,19 +6829,19 @@ yydefault: } case 376: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:4238 + // line internal/php7/php7.y:4239 { yyVAL.token = nil } case 377: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4242 + // line internal/php7/php7.y:4243 { yyVAL.token = yyDollar[1].token } case 378: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:4249 + // line internal/php7/php7.y:4250 { yyVAL.ClosureUse = nil @@ -6848,12 +6849,12 @@ yydefault: } case 379: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4255 + // line internal/php7/php7.y:4256 { yyVAL.ClosureUse = &ast.ExprClosureUse{ast.Node{}, yyDollar[3].list} // save position - yyVAL.ClosureUse.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.ClosureUse.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.ClosureUse, token.Start, yyDollar[1].token.Hidden) @@ -6864,7 +6865,7 @@ yydefault: } case 380: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4272 + // line internal/php7/php7.y:4273 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -6875,7 +6876,7 @@ yydefault: } case 381: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4281 + // line internal/php7/php7.y:4282 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -6883,14 +6884,14 @@ yydefault: } case 382: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4290 + // line internal/php7/php7.y:4291 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} yyVAL.node = &ast.ExprVariable{ast.Node{}, identifier} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6900,16 +6901,16 @@ yydefault: } case 383: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4305 + // line internal/php7/php7.y:4306 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[2].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} yyVAL.node = &ast.ExprReference{ast.Node{}, variable} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6920,12 +6921,12 @@ yydefault: } case 384: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4326 + // line internal/php7/php7.y:4327 { yyVAL.node = &ast.ExprFunctionCall{ast.Node{}, yyDollar[1].node, yyDollar[2].node.(*ast.ArgumentList)} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[2].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6934,12 +6935,12 @@ yydefault: } case 385: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4338 + // line internal/php7/php7.y:4339 { yyVAL.node = &ast.ExprStaticCall{ast.Node{}, yyDollar[1].node, yyDollar[3].node, yyDollar[4].node.(*ast.ArgumentList)} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6949,12 +6950,12 @@ yydefault: } case 386: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4351 + // line internal/php7/php7.y:4352 { yyVAL.node = &ast.ExprStaticCall{ast.Node{}, yyDollar[1].node, yyDollar[3].node, yyDollar[4].node.(*ast.ArgumentList)} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6964,12 +6965,12 @@ yydefault: } case 387: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4364 + // line internal/php7/php7.y:4365 { yyVAL.node = &ast.ExprFunctionCall{ast.Node{}, yyDollar[1].node, yyDollar[2].node.(*ast.ArgumentList)} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[2].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -6978,12 +6979,12 @@ yydefault: } case 388: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4379 + // line internal/php7/php7.y:4380 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -6992,7 +6993,7 @@ yydefault: } case 389: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4391 + // line internal/php7/php7.y:4392 { yyVAL.node = yyDollar[1].node @@ -7000,7 +7001,7 @@ yydefault: } case 390: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4400 + // line internal/php7/php7.y:4401 { yyVAL.node = yyDollar[1].node @@ -7008,7 +7009,7 @@ yydefault: } case 391: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4406 + // line internal/php7/php7.y:4407 { yyVAL.node = yyDollar[1].node @@ -7016,7 +7017,7 @@ yydefault: } case 392: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:4415 + // line internal/php7/php7.y:4416 { yyVAL.node = nil @@ -7024,12 +7025,12 @@ yydefault: } case 393: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4421 + // line internal/php7/php7.y:4422 { yyVAL.node = &ast.ExprExit{ast.Node{}, false, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Exit, append(yyDollar[1].token.Hidden, yylex.(*Parser).GetFreeFloatingToken(yyDollar[1].token)...)) @@ -7039,7 +7040,7 @@ yydefault: } case 394: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:4437 + // line internal/php7/php7.y:4438 { yyVAL.list = []ast.Vertex{} @@ -7047,19 +7048,19 @@ yydefault: } case 395: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4443 + // line internal/php7/php7.y:4444 { part := &ast.ScalarEncapsedStringPart{ast.Node{}, yyDollar[1].token.Value} yyVAL.list = []ast.Vertex{part} // save position - part.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + part.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } case 396: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4453 + // line internal/php7/php7.y:4454 { yyVAL.list = yyDollar[1].list @@ -7067,7 +7068,7 @@ yydefault: } case 397: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:4462 + // line internal/php7/php7.y:4463 { yyVAL.node = nil @@ -7075,7 +7076,7 @@ yydefault: } case 398: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4468 + // line internal/php7/php7.y:4469 { yyVAL.node = yyDollar[1].node @@ -7083,12 +7084,12 @@ yydefault: } case 399: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4477 + // line internal/php7/php7.y:4478 { yyVAL.node = &ast.ExprArray{ast.Node{}, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7099,12 +7100,12 @@ yydefault: } case 400: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4491 + // line internal/php7/php7.y:4492 { yyVAL.node = &ast.ExprShortArray{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7114,12 +7115,12 @@ yydefault: } case 401: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4504 + // line internal/php7/php7.y:4505 { yyVAL.node = &ast.ScalarString{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7128,12 +7129,12 @@ yydefault: } case 402: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4519 + // line internal/php7/php7.y:4520 { yyVAL.node = &ast.ScalarLnumber{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7142,12 +7143,12 @@ yydefault: } case 403: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4531 + // line internal/php7/php7.y:4532 { yyVAL.node = &ast.ScalarDnumber{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7156,12 +7157,12 @@ yydefault: } case 404: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4543 + // line internal/php7/php7.y:4544 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7170,12 +7171,12 @@ yydefault: } case 405: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4555 + // line internal/php7/php7.y:4556 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7184,12 +7185,12 @@ yydefault: } case 406: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4567 + // line internal/php7/php7.y:4568 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7198,12 +7199,12 @@ yydefault: } case 407: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4579 + // line internal/php7/php7.y:4580 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7212,12 +7213,12 @@ yydefault: } case 408: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4591 + // line internal/php7/php7.y:4592 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7226,12 +7227,12 @@ yydefault: } case 409: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4603 + // line internal/php7/php7.y:4604 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7240,12 +7241,12 @@ yydefault: } case 410: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4615 + // line internal/php7/php7.y:4616 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7254,12 +7255,12 @@ yydefault: } case 411: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4627 + // line internal/php7/php7.y:4628 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7268,14 +7269,14 @@ yydefault: } case 412: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4639 + // line internal/php7/php7.y:4640 { encapsed := &ast.ScalarEncapsedStringPart{ast.Node{}, yyDollar[2].token.Value} yyVAL.node = &ast.ScalarHeredoc{ast.Node{}, yyDollar[1].token.Value, []ast.Vertex{encapsed}} // save position - encapsed.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + encapsed.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7284,12 +7285,12 @@ yydefault: } case 413: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4653 + // line internal/php7/php7.y:4654 { yyVAL.node = &ast.ScalarHeredoc{ast.Node{}, yyDollar[1].token.Value, nil} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7298,12 +7299,12 @@ yydefault: } case 414: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4665 + // line internal/php7/php7.y:4666 { yyVAL.node = &ast.ScalarEncapsed{ast.Node{}, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7312,12 +7313,12 @@ yydefault: } case 415: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4677 + // line internal/php7/php7.y:4678 { yyVAL.node = &ast.ScalarHeredoc{ast.Node{}, yyDollar[1].token.Value, yyDollar[2].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7326,7 +7327,7 @@ yydefault: } case 416: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4689 + // line internal/php7/php7.y:4690 { yyVAL.node = yyDollar[1].node @@ -7334,7 +7335,7 @@ yydefault: } case 417: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4695 + // line internal/php7/php7.y:4696 { yyVAL.node = yyDollar[1].node @@ -7342,12 +7343,12 @@ yydefault: } case 418: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4704 + // line internal/php7/php7.y:4705 { yyVAL.node = &ast.ExprConstFetch{ast.Node{}, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[1].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7356,14 +7357,14 @@ yydefault: } case 419: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4716 + // line internal/php7/php7.y:4717 { target := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.ExprClassConstFetch{ast.Node{}, yyDollar[1].node, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) + target.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7374,14 +7375,14 @@ yydefault: } case 420: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4732 + // line internal/php7/php7.y:4733 { target := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.ExprClassConstFetch{ast.Node{}, yyDollar[1].node, target} // save position - target.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) + target.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7392,7 +7393,7 @@ yydefault: } case 421: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4751 + // line internal/php7/php7.y:4752 { yyVAL.node = yyDollar[1].node @@ -7400,7 +7401,7 @@ yydefault: } case 422: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4757 + // line internal/php7/php7.y:4758 { yyVAL.node = yyDollar[1].node @@ -7408,7 +7409,7 @@ yydefault: } case 423: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:4766 + // line internal/php7/php7.y:4767 { yyVAL.node = nil @@ -7416,7 +7417,7 @@ yydefault: } case 424: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4772 + // line internal/php7/php7.y:4773 { yyVAL.node = yyDollar[1].node @@ -7424,7 +7425,7 @@ yydefault: } case 425: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4781 + // line internal/php7/php7.y:4782 { yyVAL.node = yyDollar[1].node @@ -7432,7 +7433,7 @@ yydefault: } case 426: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4790 + // line internal/php7/php7.y:4791 { yyVAL.node = yyDollar[1].node @@ -7440,7 +7441,7 @@ yydefault: } case 427: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4796 + // line internal/php7/php7.y:4797 { yyVAL.node = yyDollar[2].node @@ -7452,7 +7453,7 @@ yydefault: } case 428: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4806 + // line internal/php7/php7.y:4807 { yyVAL.node = yyDollar[1].node @@ -7460,7 +7461,7 @@ yydefault: } case 429: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4815 + // line internal/php7/php7.y:4816 { yyVAL.node = yyDollar[1].node @@ -7468,7 +7469,7 @@ yydefault: } case 430: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4821 + // line internal/php7/php7.y:4822 { yyVAL.node = yyDollar[2].node @@ -7480,7 +7481,7 @@ yydefault: } case 431: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4831 + // line internal/php7/php7.y:4832 { yyVAL.node = yyDollar[1].node @@ -7488,7 +7489,7 @@ yydefault: } case 432: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4840 + // line internal/php7/php7.y:4841 { yyVAL.node = yyDollar[1].node @@ -7496,12 +7497,12 @@ yydefault: } case 433: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4846 + // line internal/php7/php7.y:4847 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7512,12 +7513,12 @@ yydefault: } case 434: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4860 + // line internal/php7/php7.y:4861 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7528,12 +7529,12 @@ yydefault: } case 435: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4874 + // line internal/php7/php7.y:4875 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7544,12 +7545,12 @@ yydefault: } case 436: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4888 + // line internal/php7/php7.y:4889 { yyVAL.node = &ast.ExprMethodCall{ast.Node{}, yyDollar[1].node, yyDollar[3].node, yyDollar[4].node.(*ast.ArgumentList)} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7559,7 +7560,7 @@ yydefault: } case 437: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4901 + // line internal/php7/php7.y:4902 { yyVAL.node = yyDollar[1].node @@ -7567,7 +7568,7 @@ yydefault: } case 438: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4910 + // line internal/php7/php7.y:4911 { yyVAL.node = yyDollar[1].node @@ -7575,7 +7576,7 @@ yydefault: } case 439: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4916 + // line internal/php7/php7.y:4917 { yyVAL.node = yyDollar[1].node @@ -7583,12 +7584,12 @@ yydefault: } case 440: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4922 + // line internal/php7/php7.y:4923 { yyVAL.node = &ast.ExprPropertyFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7598,14 +7599,14 @@ yydefault: } case 441: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4938 + // line internal/php7/php7.y:4939 { name := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} yyVAL.node = &ast.ExprVariable{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7615,12 +7616,12 @@ yydefault: } case 442: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4953 + // line internal/php7/php7.y:4954 { yyVAL.node = &ast.ExprVariable{ast.Node{}, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7632,12 +7633,12 @@ yydefault: } case 443: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4968 + // line internal/php7/php7.y:4969 { yyVAL.node = &ast.ExprVariable{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7647,12 +7648,12 @@ yydefault: } case 444: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4984 + // line internal/php7/php7.y:4985 { yyVAL.node = &ast.ExprStaticPropertyFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7662,12 +7663,12 @@ yydefault: } case 445: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4997 + // line internal/php7/php7.y:4998 { yyVAL.node = &ast.ExprStaticPropertyFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7677,7 +7678,7 @@ yydefault: } case 446: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5013 + // line internal/php7/php7.y:5014 { yyVAL.node = yyDollar[1].node @@ -7685,12 +7686,12 @@ yydefault: } case 447: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:5019 + // line internal/php7/php7.y:5020 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7701,12 +7702,12 @@ yydefault: } case 448: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:5033 + // line internal/php7/php7.y:5034 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7717,12 +7718,12 @@ yydefault: } case 449: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5047 + // line internal/php7/php7.y:5048 { yyVAL.node = &ast.ExprPropertyFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7732,12 +7733,12 @@ yydefault: } case 450: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5060 + // line internal/php7/php7.y:5061 { yyVAL.node = &ast.ExprStaticPropertyFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7747,12 +7748,12 @@ yydefault: } case 451: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5073 + // line internal/php7/php7.y:5074 { yyVAL.node = &ast.ExprStaticPropertyFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7762,12 +7763,12 @@ yydefault: } case 452: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5089 + // line internal/php7/php7.y:5090 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7776,7 +7777,7 @@ yydefault: } case 453: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5101 + // line internal/php7/php7.y:5102 { yyVAL.node = yyDollar[2].node @@ -7788,7 +7789,7 @@ yydefault: } case 454: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5111 + // line internal/php7/php7.y:5112 { yyVAL.node = yyDollar[1].node @@ -7796,12 +7797,12 @@ yydefault: } case 455: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5120 + // line internal/php7/php7.y:5121 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7810,7 +7811,7 @@ yydefault: } case 456: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5132 + // line internal/php7/php7.y:5133 { yyVAL.node = yyDollar[2].node @@ -7822,7 +7823,7 @@ yydefault: } case 457: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5142 + // line internal/php7/php7.y:5143 { yyVAL.node = yyDollar[1].node @@ -7830,7 +7831,7 @@ yydefault: } case 458: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5151 + // line internal/php7/php7.y:5152 { yyVAL.list = yyDollar[1].list @@ -7838,7 +7839,7 @@ yydefault: } case 459: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:5160 + // line internal/php7/php7.y:5161 { yyVAL.node = &ast.ExprArrayItem{ast.Node{}, false, nil, nil} @@ -7846,7 +7847,7 @@ yydefault: } case 460: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5166 + // line internal/php7/php7.y:5167 { yyVAL.node = yyDollar[1].node @@ -7854,7 +7855,7 @@ yydefault: } case 461: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5175 + // line internal/php7/php7.y:5176 { if len(yyDollar[1].list) == 0 { yyDollar[1].list = []ast.Vertex{&ast.ExprArrayItem{ast.Node{}, false, nil, nil}} @@ -7869,7 +7870,7 @@ yydefault: } case 462: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5188 + // line internal/php7/php7.y:5189 { if yyDollar[1].node.(*ast.ExprArrayItem).Key == nil && yyDollar[1].node.(*ast.ExprArrayItem).Val == nil { yyVAL.list = []ast.Vertex{} @@ -7881,12 +7882,12 @@ yydefault: } case 463: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5201 + // line internal/php7/php7.y:5202 { yyVAL.node = &ast.ExprArrayItem{ast.Node{}, false, yyDollar[1].node, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[3].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7896,12 +7897,12 @@ yydefault: } case 464: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5214 + // line internal/php7/php7.y:5215 { yyVAL.node = &ast.ExprArrayItem{ast.Node{}, false, nil, yyDollar[1].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(yyDollar[1].node) + yyVAL.node.GetNode().Position = position.NewNodePosition(yyDollar[1].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7910,14 +7911,14 @@ yydefault: } case 465: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:5226 + // line internal/php7/php7.y:5227 { reference := &ast.ExprReference{ast.Node{}, yyDollar[4].node} yyVAL.node = &ast.ExprArrayItem{ast.Node{}, false, yyDollar[1].node, reference} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) - reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[3].token, yyDollar[4].node) + yyVAL.node.GetNode().Position = position.NewNodesPosition(yyDollar[1].node, yyDollar[4].node) + reference.GetNode().Position = position.NewTokenNodePosition(yyDollar[3].token, yyDollar[4].node) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7928,14 +7929,14 @@ yydefault: } case 466: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5242 + // line internal/php7/php7.y:5243 { reference := &ast.ExprReference{ast.Node{}, yyDollar[2].node} yyVAL.node = &ast.ExprArrayItem{ast.Node{}, false, nil, reference} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) - reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + reference.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7944,12 +7945,12 @@ yydefault: } case 467: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5256 + // line internal/php7/php7.y:5257 { yyVAL.node = &ast.ExprArrayItem{ast.Node{}, true, nil, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7958,15 +7959,15 @@ yydefault: } case 468: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:5268 + // line internal/php7/php7.y:5269 { // TODO: Cannot use list() as standalone expression listNode := &ast.ExprList{ast.Node{}, yyDollar[5].list} yyVAL.node = &ast.ExprArrayItem{ast.Node{}, false, yyDollar[1].node, listNode} // save position - listNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[3].token, yyDollar[6].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[6].token) + listNode.GetNode().Position = position.NewTokensPosition(yyDollar[3].token, yyDollar[6].token) + yyVAL.node.GetNode().Position = position.NewNodeTokenPosition(yyDollar[1].node, yyDollar[6].token) // save comments yylex.(*Parser).MoveFreeFloating(yyDollar[1].node, yyVAL.node) @@ -7979,15 +7980,15 @@ yydefault: } case 469: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:5287 + // line internal/php7/php7.y:5288 { // TODO: Cannot use list() as standalone expression listNode := &ast.ExprList{ast.Node{}, yyDollar[3].list} yyVAL.node = &ast.ExprArrayItem{ast.Node{}, false, nil, listNode} // save position - listNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + listNode.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -7998,7 +7999,7 @@ yydefault: } case 470: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5307 + // line internal/php7/php7.y:5308 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) @@ -8006,13 +8007,13 @@ yydefault: } case 471: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5313 + // line internal/php7/php7.y:5314 { encapsed := &ast.ScalarEncapsedStringPart{ast.Node{}, yyDollar[2].token.Value} yyVAL.list = append(yyDollar[1].list, encapsed) // save position - encapsed.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) + encapsed.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(encapsed, token.Start, yyDollar[2].token.Hidden) @@ -8021,7 +8022,7 @@ yydefault: } case 472: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5326 + // line internal/php7/php7.y:5327 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -8029,13 +8030,13 @@ yydefault: } case 473: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5332 + // line internal/php7/php7.y:5333 { encapsed := &ast.ScalarEncapsedStringPart{ast.Node{}, yyDollar[1].token.Value} yyVAL.list = []ast.Vertex{encapsed, yyDollar[2].node} // save position - encapsed.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + encapsed.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(encapsed, token.Start, yyDollar[1].token.Hidden) @@ -8044,14 +8045,14 @@ yydefault: } case 474: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5348 + // line internal/php7/php7.y:5349 { name := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} yyVAL.node = &ast.ExprVariable{ast.Node{}, name} // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8061,16 +8062,16 @@ yydefault: } case 475: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:5363 + // line internal/php7/php7.y:5364 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, variable, yyDollar[3].node} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).addDollarToken(variable) @@ -8081,7 +8082,7 @@ yydefault: } case 476: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5381 + // line internal/php7/php7.y:5382 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -8089,10 +8090,10 @@ yydefault: yyVAL.node = &ast.ExprPropertyFetch{ast.Node{}, variable, fetch} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[3].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + fetch.GetNode().Position = position.NewTokenPosition(yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).addDollarToken(variable) @@ -8103,14 +8104,14 @@ yydefault: } case 477: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5401 + // line internal/php7/php7.y:5402 { variable := &ast.ExprVariable{ast.Node{}, yyDollar[2].node} yyVAL.node = variable // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yylex.(*Parser).GetFreeFloatingToken(yyDollar[1].token)) @@ -8120,7 +8121,7 @@ yydefault: } case 478: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5416 + // line internal/php7/php7.y:5417 { name := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} variable := &ast.ExprVariable{ast.Node{}, name} @@ -8128,8 +8129,8 @@ yydefault: yyVAL.node = variable // save position - name.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) + name.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[3].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yylex.(*Parser).GetFreeFloatingToken(yyDollar[1].token)) @@ -8139,16 +8140,16 @@ yydefault: } case 479: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:5433 + // line internal/php7/php7.y:5434 { identifier := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} variable := &ast.ExprVariable{ast.Node{}, identifier} yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, variable, yyDollar[4].node} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[2].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[6].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + variable.GetNode().Position = position.NewTokenPosition(yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[6].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yylex.(*Parser).GetFreeFloatingToken(yyDollar[1].token)) @@ -8160,7 +8161,7 @@ yydefault: } case 480: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5452 + // line internal/php7/php7.y:5453 { yyVAL.node = yyDollar[2].node @@ -8172,12 +8173,12 @@ yydefault: } case 481: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5465 + // line internal/php7/php7.y:5466 { yyVAL.node = &ast.ScalarString{ast.Node{}, yyDollar[1].token.Value} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8186,7 +8187,7 @@ yydefault: } case 482: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5477 + // line internal/php7/php7.y:5478 { // TODO: add option to handle 64 bit integer if _, err := strconv.Atoi(string(yyDollar[1].token.Value)); err == nil { @@ -8196,7 +8197,7 @@ yydefault: } // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8205,7 +8206,7 @@ yydefault: } case 483: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5494 + // line internal/php7/php7.y:5495 { var lnumber *ast.ScalarLnumber // TODO: add option to handle 64 bit integer @@ -8222,9 +8223,9 @@ yydefault: // save position if isInt { - lnumber.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + lnumber.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) } - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[2].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8233,14 +8234,14 @@ yydefault: } case 484: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5520 + // line internal/php7/php7.y:5521 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} yyVAL.node = &ast.ExprVariable{ast.Node{}, identifier} // save position - identifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition(yyDollar[1].token) + identifier.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) + yyVAL.node.GetNode().Position = position.NewTokenPosition(yyDollar[1].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8250,12 +8251,12 @@ yydefault: } case 485: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:5538 + // line internal/php7/php7.y:5539 { yyVAL.node = &ast.ExprIsset{ast.Node{}, yyDollar[3].list} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[5].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[5].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8270,12 +8271,12 @@ yydefault: } case 486: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:5556 + // line internal/php7/php7.y:5557 { yyVAL.node = &ast.ExprEmpty{ast.Node{}, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8286,12 +8287,12 @@ yydefault: } case 487: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5570 + // line internal/php7/php7.y:5571 { yyVAL.node = &ast.ExprInclude{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8300,12 +8301,12 @@ yydefault: } case 488: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5582 + // line internal/php7/php7.y:5583 { yyVAL.node = &ast.ExprIncludeOnce{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8314,12 +8315,12 @@ yydefault: } case 489: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:5594 + // line internal/php7/php7.y:5595 { yyVAL.node = &ast.ExprEval{ast.Node{}, yyDollar[3].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) + yyVAL.node.GetNode().Position = position.NewTokensPosition(yyDollar[1].token, yyDollar[4].token) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8330,12 +8331,12 @@ yydefault: } case 490: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5608 + // line internal/php7/php7.y:5609 { yyVAL.node = &ast.ExprRequire{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8344,12 +8345,12 @@ yydefault: } case 491: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5620 + // line internal/php7/php7.y:5621 { yyVAL.node = &ast.ExprRequireOnce{ast.Node{}, yyDollar[2].node} // save position - yyVAL.node.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) + yyVAL.node.GetNode().Position = position.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node) // save comments yylex.(*Parser).setFreeFloating(yyVAL.node, token.Start, yyDollar[1].token.Hidden) @@ -8358,7 +8359,7 @@ yydefault: } case 492: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5635 + // line internal/php7/php7.y:5636 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -8366,7 +8367,7 @@ yydefault: } case 493: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5641 + // line internal/php7/php7.y:5642 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -8377,7 +8378,7 @@ yydefault: } case 494: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5653 + // line internal/php7/php7.y:5654 { yyVAL.node = yyDollar[1].node 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, - } -}