From 06d202e71cd93e44bb6eeaa171c4d730bd52a2e7 Mon Sep 17 00:00:00 2001 From: Vadym Slizov Date: Fri, 3 Jul 2020 00:20:32 +0300 Subject: [PATCH] [refactoring] remove param withTokens from parser --- internal/php5/parser.go | 79 +- internal/php5/parser_test.go | 516 ++++----- internal/php5/php5.go | Bin 339846 -> 334300 bytes internal/php5/php5.y | 1370 +++++++++++------------ internal/php5/php5_bench_test.go | 2 +- internal/php5/php5_test.go | 8 +- internal/php7/parser.go | 78 +- internal/php7/parser_test.go | 564 +++++----- internal/php7/php7.go | Bin 278533 -> 274859 bytes internal/php7/php7.y | 1155 ++++++++++--------- internal/php7/php7_bench_test.go | 2 +- internal/php7/php7_test.go | 8 +- internal/scanner/lexer.go | 29 +- internal/scanner/scanner.go | Bin 384730 -> 384916 bytes internal/scanner/scanner.rl | 29 +- internal/scanner/scanner_test.go | 113 +- internal/scanner/token.go | 2 +- pkg/parser/parser.go | 4 +- pkg/printer/printer_parsed_php5_test.go | 5 +- pkg/printer/printer_parsed_php7_test.go | 4 +- 20 files changed, 2011 insertions(+), 1957 deletions(-) diff --git a/internal/php5/parser.go b/internal/php5/parser.go index 02bc113..04a37f3 100644 --- a/internal/php5/parser.go +++ b/internal/php5/parser.go @@ -14,14 +14,12 @@ type Parser struct { Lexer *scanner.Lexer currentToken *scanner.Token rootNode ast.Vertex - withTokens bool errHandlerFunc func(*errors.Error) } // NewParser creates and returns new Parser -func NewParser(lexer *scanner.Lexer, withTokens bool, errHandlerFunc func(*errors.Error)) *Parser { +func NewParser(lexer *scanner.Lexer, errHandlerFunc func(*errors.Error)) *Parser { return &Parser{ - withTokens: withTokens, Lexer: lexer, errHandlerFunc: errHandlerFunc, } @@ -63,7 +61,7 @@ func lastNode(nn []ast.Vertex) ast.Vertex { } func (p *Parser) MoveFreeFloating(src ast.Vertex, dst ast.Vertex) { - if p.withTokens == false { + if _, ok := src.GetNode().Tokens[token.Start]; !ok { return } @@ -71,42 +69,64 @@ func (p *Parser) MoveFreeFloating(src ast.Vertex, dst ast.Vertex) { return } - p.setFreeFloating(dst, token.Start, src.GetNode().Tokens[token.Start]) - delete(src.GetNode().Tokens, token.Start) -} - -func (p *Parser) setFreeFloating(dst ast.Vertex, pos token.Position, strings []token.Token) { - if p.withTokens == false { - return - } - - if len(strings) == 0 { - return - } - dstCollection := &dst.GetNode().Tokens if *dstCollection == nil { *dstCollection = make(token.Collection) } - (*dstCollection)[pos] = strings + (*dstCollection)[token.Start] = src.GetNode().Tokens[token.Start] + delete(src.GetNode().Tokens, token.Start) } -func (p *Parser) GetFreeFloatingToken(t *scanner.Token) []token.Token { - if p.withTokens == false { - return []token.Token{} +func (p *Parser) setFreeFloating(dst ast.Vertex, pos token.Position, tokens []token.Token) { + if len(tokens) == 0 { + return } - return []token.Token{ - { - ID: token.ID(t.ID), - Value: t.Value, - }, + dstCollection := &dst.GetNode().Tokens + if *dstCollection == nil { + *dstCollection = make(token.Collection) } + + l := len(tokens) + for _, v := range tokens[0 : l-1] { + (*dstCollection)[pos] = append((*dstCollection)[pos], v) + } +} + +func (p *Parser) setFreeFloatingTokens(dst ast.Vertex, pos token.Position, tokens []token.Token) { + if len(tokens) == 0 { + return + } + + dstCollection := &dst.GetNode().Tokens + if *dstCollection == nil { + *dstCollection = make(token.Collection) + } + + (*dstCollection)[pos] = make([]token.Token, 0) + + for _, v := range tokens { + (*dstCollection)[pos] = append((*dstCollection)[pos], v) + } +} + +func (p *Parser) setToken(dst ast.Vertex, pos token.Position, tokens []token.Token) { + if len(tokens) == 0 { + return + } + + dstCollection := &dst.GetNode().Tokens + if *dstCollection == nil { + *dstCollection = make(token.Collection) + } + + l := len(tokens) + (*dstCollection)[pos] = append((*dstCollection)[pos], tokens[l-1]) } func (p *Parser) splitSemiColonAndPhpCloseTag(htmlNode ast.Vertex, prevNode ast.Vertex) { - if p.withTokens == false { + if _, ok := prevNode.GetNode().Tokens[token.SemiColon]; !ok { return } @@ -117,7 +137,7 @@ func (p *Parser) splitSemiColonAndPhpCloseTag(htmlNode ast.Vertex, prevNode ast. } if semiColon[0].Value[0] == ';' { - p.setFreeFloating(prevNode, token.SemiColon, []token.Token{ + p.setFreeFloatingTokens(prevNode, token.SemiColon, []token.Token{ { ID: token.ID(';'), Value: semiColon[0].Value[0:1], @@ -126,7 +146,6 @@ func (p *Parser) splitSemiColonAndPhpCloseTag(htmlNode ast.Vertex, prevNode ast. } vlen := len(semiColon[0].Value) - tlen := 2 if bytes.HasSuffix(semiColon[0].Value, []byte("?>\n")) { tlen = 3 @@ -145,7 +164,7 @@ func (p *Parser) splitSemiColonAndPhpCloseTag(htmlNode ast.Vertex, prevNode ast. Value: semiColon[0].Value[vlen-tlen:], }) - p.setFreeFloating(htmlNode, token.Start, append(phpCloseTag, htmlNode.GetNode().Tokens[token.Start]...)) + p.setFreeFloatingTokens(htmlNode, token.Start, append(phpCloseTag, htmlNode.GetNode().Tokens[token.Start]...)) } func (p *Parser) returnTokenToPool(yyDollar []yySymType, yyVAL *yySymType) { diff --git a/internal/php5/parser_test.go b/internal/php5/parser_test.go index 223eb2b..2102e1c 100644 --- a/internal/php5/parser_test.go +++ b/internal/php5/parser_test.go @@ -59,7 +59,7 @@ func TestIdentifier(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -842,7 +842,7 @@ func TestPhp5ArgumentNode(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1596,7 +1596,7 @@ func TestPhp5ParameterNode(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1618,7 +1618,7 @@ func TestCommentEndFile(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1696,7 +1696,7 @@ func TestName(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1772,7 +1772,7 @@ func TestFullyQualified(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1848,7 +1848,7 @@ func TestRelative(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1927,7 +1927,7 @@ func TestScalarEncapsed_SimpleVar(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2004,7 +2004,7 @@ func TestScalarEncapsed_SimpleVarOneChar(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2092,7 +2092,7 @@ func TestScalarEncapsed_SimpleVarEndsEcapsed(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2190,7 +2190,7 @@ func TestScalarEncapsed_StringVarCurveOpen(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2299,7 +2299,7 @@ func TestScalarEncapsed_SimpleVarPropertyFetch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2376,7 +2376,7 @@ func TestScalarEncapsed_DollarOpenCurlyBraces(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2474,7 +2474,7 @@ func TestScalarEncapsed_DollarOpenCurlyBracesDimNumber(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2582,7 +2582,7 @@ func TestScalarEncapsed_CurlyOpenMethodCall(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2674,7 +2674,7 @@ LBL; } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2766,7 +2766,7 @@ LBL; } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2826,7 +2826,7 @@ LBL; } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2872,7 +2872,7 @@ CAD; } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2932,7 +2932,7 @@ CAD; } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2977,7 +2977,7 @@ func TestScalarMagicConstant(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3021,7 +3021,7 @@ func TestScalarNumber_LNumber(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3065,7 +3065,7 @@ func TestScalarNumber_DNumber(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3109,7 +3109,7 @@ func TestScalarNumber_Float(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3153,7 +3153,7 @@ func TestScalarNumber_BinaryLNumber(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3197,7 +3197,7 @@ func TestScalarNumber_BinaryDNumber(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3241,7 +3241,7 @@ func TestScalarNumber_HLNumber(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3285,7 +3285,7 @@ func TestScalarNumber_HDNumber(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3329,7 +3329,7 @@ func TestScalarString_DoubleQuotedScalarString(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3373,7 +3373,7 @@ func TestScalarString_DoubleQuotedScalarStringWithEscapedVar(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3419,7 +3419,7 @@ func TestScalarString_MultilineDoubleQuotedScalarString(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3463,7 +3463,7 @@ func TestScalarString_SingleQuotedScalarString(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3509,7 +3509,7 @@ func TestScalarString_MultilineSingleQuotedScalarString(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3579,7 +3579,7 @@ func TestStmtAltIf_AltIf(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3692,7 +3692,7 @@ func TestStmtAltIf_AltElseIf(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3782,7 +3782,7 @@ func TestStmtAltIf_AltElse(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3960,7 +3960,7 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4082,7 +4082,7 @@ func TestStmtClassConstList_WithoutModifiers(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4161,7 +4161,7 @@ func TestStmtClassMethod_SimpleClassMethod(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4310,7 +4310,7 @@ func TestStmtClassMethod_PrivateProtectedClassMethod(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4413,7 +4413,7 @@ func TestStmtClassMethod_Php5ClassMethod(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4528,7 +4528,7 @@ func TestStmtClassMethod_AbstractClassMethod(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4573,7 +4573,7 @@ func TestStmtClass_SimpleClass(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4631,7 +4631,7 @@ func TestStmtClass_AbstractClass(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4722,7 +4722,7 @@ func TestStmtClass_ClassExtends(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4815,7 +4815,7 @@ func TestStmtClass_ClassImplement(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4931,7 +4931,7 @@ func TestStmtClass_ClassImplements(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5030,7 +5030,7 @@ func TestStmtConstList(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5096,7 +5096,7 @@ func TestStmtContinue_Empty(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5173,7 +5173,7 @@ func TestStmtContinue_Light(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5250,7 +5250,7 @@ func TestStmtContinue(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5327,7 +5327,7 @@ func TestStmtDeclare(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5437,7 +5437,7 @@ func TestStmtDeclare_Stmts(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5516,7 +5516,7 @@ func TestStmtDeclare_Alt(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5571,7 +5571,7 @@ func TestStmtDo(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5638,7 +5638,7 @@ func TestStmtEcho(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5694,7 +5694,7 @@ func TestStmtEcho_Parenthesis(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5738,7 +5738,7 @@ func TestStmtExpression(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5934,7 +5934,7 @@ func TestStmtFor(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6055,7 +6055,7 @@ func TestStmtFor_Alt(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6141,7 +6141,7 @@ func TestStmtForeach(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6217,7 +6217,7 @@ func TestStmtForeach_Expr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6303,7 +6303,7 @@ func TestStmtForeach_Alt(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6410,7 +6410,7 @@ func TestStmtForeach_WithKey(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6507,7 +6507,7 @@ func TestStmtForeach_ExprWithKey(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6624,7 +6624,7 @@ func TestStmtForeach_WithRef(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6753,7 +6753,7 @@ func TestStmtForeach_WithList(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6799,7 +6799,7 @@ func TestStmtFunction(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6856,7 +6856,7 @@ func TestStmtFunction_Return(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7024,7 +7024,7 @@ func TestStmtFunction_ReturnVar(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7092,7 +7092,7 @@ func TestStmtFunction_Ref(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7148,7 +7148,7 @@ func TestStmtGlobal(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7309,7 +7309,7 @@ func TestStmtGlobal_Vars(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7374,7 +7374,7 @@ func TestStmtGotoLabel(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7407,7 +7407,7 @@ func TestStmtHaltCompiler(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7472,7 +7472,7 @@ func TestStmtIf(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7581,7 +7581,7 @@ func TestStmtIf_ElseIf(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7667,7 +7667,7 @@ func TestStmtIf_Else(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7839,7 +7839,7 @@ func TestStmtIf_ElseElseIf(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8021,7 +8021,7 @@ func TestStmtIf_ElseIfElseIfElse(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8065,7 +8065,7 @@ func TestStmtInlineHtml(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8110,7 +8110,7 @@ func TestStmtInterface(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8190,7 +8190,7 @@ func TestStmtInterface_Extend(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8293,7 +8293,7 @@ func TestStmtInterface_Extends(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8349,7 +8349,7 @@ func TestStmtNamespace(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8406,7 +8406,7 @@ func TestStmtNamespace_Stmts(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8440,7 +8440,7 @@ func TestStmtNamespace_Anonymous(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8542,7 +8542,7 @@ func TestStmtProperty(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8697,7 +8697,7 @@ func TestStmtProperty_Properties(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8852,7 +8852,7 @@ func TestStmtProperty_Properties2(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8918,7 +8918,7 @@ func TestStmtStaticVar(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9026,7 +9026,7 @@ func TestStmtStaticVar_Vars(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9134,7 +9134,7 @@ func TestStmtStaticVar_Vars2(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9261,7 +9261,7 @@ func TestStmtSwitch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9388,7 +9388,7 @@ func TestStmtSwitch_Semicolon(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9505,7 +9505,7 @@ func TestStmtSwitch_Alt(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9610,7 +9610,7 @@ func TestStmtSwitch_AltSemicolon(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9664,7 +9664,7 @@ func TestStmtThrow(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9709,7 +9709,7 @@ func TestStmtTrait(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9800,7 +9800,7 @@ func TestStmtTraitUse(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9914,7 +9914,7 @@ func TestStmtTraitUse_Uses(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10028,7 +10028,7 @@ func TestStmtTraitUse_EmptyAdaptations(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10186,7 +10186,7 @@ func TestStmtTraitUse_Modifier(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10355,7 +10355,7 @@ func TestStmtTraitUse_AliasModifier(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10638,7 +10638,7 @@ func TestStmtTraitUse_Adaptions(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10675,7 +10675,7 @@ func TestStmtTry_Try(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10770,7 +10770,7 @@ func TestStmtTry_TryCatch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10922,7 +10922,7 @@ func TestStmtTry_TryCatchCatch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11028,7 +11028,7 @@ func TestStmtTry_TryCatchFinally(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11235,7 +11235,7 @@ func TestStmtTry_TryCatchCatchCatch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11291,7 +11291,7 @@ func TestStmtUnset(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11368,7 +11368,7 @@ func TestStmtUnset_Vars(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11436,7 +11436,7 @@ func TestStmtUse(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11504,7 +11504,7 @@ func TestStmtUse_FullyQualified(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11583,7 +11583,7 @@ func TestStmtUse_FullyQualifiedAlias(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11684,7 +11684,7 @@ func TestStmtUse_List(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11796,7 +11796,7 @@ func TestStmtUse_ListAlias(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11908,7 +11908,7 @@ func TestStmtUse_ListFunctionType(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12042,7 +12042,7 @@ func TestStmtUse_ListFunctionTypeAliases(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12154,7 +12154,7 @@ func TestStmtUse_ListConstType(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12288,7 +12288,7 @@ func TestStmtUse_ListConstTypeAliases(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12354,7 +12354,7 @@ func TestStmtBreak_Empty(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12431,7 +12431,7 @@ func TestStmtBreak_Light(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12508,7 +12508,7 @@ func TestStmtBreak(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12585,7 +12585,7 @@ func TestExprArrayDimFetch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12681,7 +12681,7 @@ func TestExprArrayDimFetch_Nested(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12725,7 +12725,7 @@ func TestExprArray(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12791,7 +12791,7 @@ func TestExprArray_Item(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12910,7 +12910,7 @@ func TestExprArray_Items(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12974,7 +12974,7 @@ func TestExprBitwiseNot(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13038,7 +13038,7 @@ func TestExprBooleanNot(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13115,7 +13115,7 @@ func TestExprClassConstFetch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13180,7 +13180,7 @@ func TestExprClassConstFetch_Static(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13244,7 +13244,7 @@ func TestExprClone_Brackets(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13308,7 +13308,7 @@ func TestExprClone(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13354,7 +13354,7 @@ func TestExprClosure(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13532,7 +13532,7 @@ func TestExprClosure_Use(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13710,7 +13710,7 @@ func TestExprClosure_Use2(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13776,7 +13776,7 @@ func TestExprConstFetch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13842,7 +13842,7 @@ func TestExprConstFetch_Relative(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13908,7 +13908,7 @@ func TestExprConstFetch_FullyQualified(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13972,7 +13972,7 @@ func TestExprEmpty(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14036,7 +14036,7 @@ func TestExprErrorSuppress(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14100,7 +14100,7 @@ func TestExprEval(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14144,7 +14144,7 @@ func TestExprExit(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14188,7 +14188,7 @@ func TestExprExit_Empty(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14253,7 +14253,7 @@ func TestExprExit_Expr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14297,7 +14297,7 @@ func TestExprDie(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14341,7 +14341,7 @@ func TestExprDie_Empty(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14406,7 +14406,7 @@ func TestExprDie_Expr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14482,7 +14482,7 @@ func TestExprFunctionCall(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14558,7 +14558,7 @@ func TestExprFunctionCall_Relative(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14659,7 +14659,7 @@ func TestExprFunctionCall_FullyQualified(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14778,7 +14778,7 @@ func TestExprFunctionCall_Var(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14910,7 +14910,7 @@ func TestExprFunctionCall_ExprArg(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14974,7 +14974,7 @@ func TestExprPostDec(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15038,7 +15038,7 @@ func TestExprPostInc(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15102,7 +15102,7 @@ func TestExprPreDec(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15166,7 +15166,7 @@ func TestExprPreInc(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15230,7 +15230,7 @@ func TestExprInclude(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15294,7 +15294,7 @@ func TestExprInclude_Once(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15358,7 +15358,7 @@ func TestExprRequire(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15422,7 +15422,7 @@ func TestExprRequire_Once(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15509,7 +15509,7 @@ func TestExprInstanceOf(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15596,7 +15596,7 @@ func TestExprInstanceOf_Relative(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15683,7 +15683,7 @@ func TestExprInstanceOf_FullyQualified(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15749,7 +15749,7 @@ func TestExprIsset(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15836,7 +15836,7 @@ func TestExprIsset_Variables(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15911,7 +15911,7 @@ func TestExprList_Empty(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16018,7 +16018,7 @@ func TestExprList(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16135,7 +16135,7 @@ func TestExprList_ArrayIndex(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16264,7 +16264,7 @@ func TestExprList_List(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16372,7 +16372,7 @@ func TestExprList_EmptyItem(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16482,7 +16482,7 @@ func TestExprList_EmptyItems(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16567,7 +16567,7 @@ func TestExprMethodCall(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16633,7 +16633,7 @@ func TestExprNew(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16709,7 +16709,7 @@ func TestExprNew_Relative(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16785,7 +16785,7 @@ func TestExprNew_FullyQualified(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16849,7 +16849,7 @@ func TestExprPrint(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16924,7 +16924,7 @@ func TestExprPropertyFetch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17042,7 +17042,7 @@ func TestExprReference_ForeachWithRef(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17119,7 +17119,7 @@ func TestExprShellExec(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17163,7 +17163,7 @@ func TestExprShortArray(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17229,7 +17229,7 @@ func TestExprShortArray_Item(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17348,7 +17348,7 @@ func TestExprShortArray_Items(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17435,7 +17435,7 @@ func TestExprStaticCall(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17522,7 +17522,7 @@ func TestExprStaticCall_Relative(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17609,7 +17609,7 @@ func TestExprStaticCall_FullyQualified(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17706,7 +17706,7 @@ func TestExprStaticCall_Var(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17801,7 +17801,7 @@ func TestExprStaticCall_VarVar(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17888,7 +17888,7 @@ func TestExprStaticPropertyFetch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17975,7 +17975,7 @@ func TestExprStaticPropertyFetch_Relative(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18062,7 +18062,7 @@ func TestExprStaticPropertyFetch_FullyQualified(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18168,7 +18168,7 @@ func TestExprTernary(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18253,7 +18253,7 @@ func TestExprTernary_Simple(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18411,7 +18411,7 @@ func TestExprTernary_NestedTrue(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18569,7 +18569,7 @@ func TestExprTernary_NestedCond(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18633,7 +18633,7 @@ func TestExprUnaryMinus(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18697,7 +18697,7 @@ func TestExprUnaryPlus(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18751,7 +18751,7 @@ func TestExprVariable(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18815,7 +18815,7 @@ func TestExprVariable_Variable(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18858,7 +18858,7 @@ func TestExprYield(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18922,7 +18922,7 @@ func TestExprYield_Val(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19007,7 +19007,7 @@ func TestExprYield_KeyVal(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19061,7 +19061,7 @@ func TestExprYield_Expr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19136,7 +19136,7 @@ func TestExprYield_KeyExpr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19223,7 +19223,7 @@ func TestExprAssign_Assign(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19308,7 +19308,7 @@ func TestExprAssign_Reference(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19405,7 +19405,7 @@ func TestExprAssign_ReferenceNew(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19547,7 +19547,7 @@ func TestExprAssign_ReferenceArgs(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19632,7 +19632,7 @@ func TestExprAssign_BitwiseAnd(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19717,7 +19717,7 @@ func TestExprAssign_BitwiseOr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19802,7 +19802,7 @@ func TestExprAssign_BitwiseXor(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19887,7 +19887,7 @@ func TestExprAssign_Concat(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19972,7 +19972,7 @@ func TestExprAssign_Div(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20057,7 +20057,7 @@ func TestExprAssign_Minus(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20142,7 +20142,7 @@ func TestExprAssign_Mod(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20227,7 +20227,7 @@ func TestExprAssign_Mul(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20312,7 +20312,7 @@ func TestExprAssign_Plus(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20397,7 +20397,7 @@ func TestExprAssign_Pow(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20482,7 +20482,7 @@ func TestExprAssign_ShiftLeft(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20567,7 +20567,7 @@ func TestExprAssign_ShiftRight(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20654,7 +20654,7 @@ func TestExprBinary_BitwiseAnd(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20739,7 +20739,7 @@ func TestExprBinary_BitwiseOr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20824,7 +20824,7 @@ func TestExprBinary_BitwiseXor(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20909,7 +20909,7 @@ func TestExprBinary_BooleanAnd(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20994,7 +20994,7 @@ func TestExprBinary_BooleanOr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21079,7 +21079,7 @@ func TestExprBinary_Concat(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21164,7 +21164,7 @@ func TestExprBinary_Div(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21249,7 +21249,7 @@ func TestExprBinary_Equal(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21334,7 +21334,7 @@ func TestExprBinary_GreaterOrEqual(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21419,7 +21419,7 @@ func TestExprBinary_Greater(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21504,7 +21504,7 @@ func TestExprBinary_Identical(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21589,7 +21589,7 @@ func TestExprBinary_LogicalAnd(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21674,7 +21674,7 @@ func TestExprBinary_LogicalOr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21759,7 +21759,7 @@ func TestExprBinary_LogicalXor(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21844,7 +21844,7 @@ func TestExprBinary_Minus(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21929,7 +21929,7 @@ func TestExprBinary_Mod(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22014,7 +22014,7 @@ func TestExprBinary_Mul(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22099,7 +22099,7 @@ func TestExprBinary_NotEqual(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22184,7 +22184,7 @@ func TestExprBinary_NotIdentical(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22269,7 +22269,7 @@ func TestExprBinary_Plus(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22354,7 +22354,7 @@ func TestExprBinary_Pow(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22439,7 +22439,7 @@ func TestExprBinary_ShiftLeft(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22524,7 +22524,7 @@ func TestExprBinary_ShiftRight(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22609,7 +22609,7 @@ func TestExprBinary_SmallerOrEqual(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22694,7 +22694,7 @@ func TestExprBinary_Smaller(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22760,7 +22760,7 @@ func TestExprCast_Array(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22824,7 +22824,7 @@ func TestExprCast_Bool(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22888,7 +22888,7 @@ func TestExprCast_BoolShort(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22952,7 +22952,7 @@ func TestExprCast_Double(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23016,7 +23016,7 @@ func TestExprCast_CastFloat(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23080,7 +23080,7 @@ func TestExprCast_Int(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23144,7 +23144,7 @@ func TestExprCast_IntShort(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23208,7 +23208,7 @@ func TestExprCast_Object(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23272,7 +23272,7 @@ func TestExprCast_String(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23336,7 +23336,7 @@ func TestExprCast_BinaryString(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23400,7 +23400,7 @@ func TestExprCast_Unset(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) diff --git a/internal/php5/php5.go b/internal/php5/php5.go index 01c6d9df5118607f062b72163c0e10a752c85bb5..3e695433aeea4a4a5decbdbc43e303a1b66ac780 100644 GIT binary patch delta 14009 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 g+WS;MQsn7UMk@ 0 { - yylex.(*Parser).setFreeFloating($$, token.If, $2.GetNode().Tokens[token.OpenParenthesisToken][:len($2.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($2.GetNode().Tokens, token.OpenParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens($$, token.If, $2.GetNode().Tokens[token.OpenParenthesisToken][:len($2.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($2.GetNode().Tokens, token.OpenParenthesisToken) } if len($2.GetNode().Tokens[token.CloseParenthesisToken]) > 0 { - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.GetNode().Tokens[token.CloseParenthesisToken][:len($2.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($2.GetNode().Tokens, token.CloseParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $2.GetNode().Tokens[token.CloseParenthesisToken][:len($2.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($2.GetNode().Tokens, token.CloseParenthesisToken) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -939,17 +939,17 @@ unticked_statement: $$.GetNode().Position = position.NewTokensPosition($1, $8) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) if len($2.GetNode().Tokens[token.OpenParenthesisToken]) > 0 { - yylex.(*Parser).setFreeFloating($$, token.If, $2.GetNode().Tokens[token.OpenParenthesisToken][:len($2.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($2.GetNode().Tokens, token.OpenParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens($$, token.If, $2.GetNode().Tokens[token.OpenParenthesisToken][:len($2.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($2.GetNode().Tokens, token.OpenParenthesisToken) } if len($2.GetNode().Tokens[token.CloseParenthesisToken]) > 0 { - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.GetNode().Tokens[token.CloseParenthesisToken][:len($2.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($2.GetNode().Tokens, token.CloseParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $2.GetNode().Tokens[token.CloseParenthesisToken][:len($2.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($2.GetNode().Tokens, token.CloseParenthesisToken) } - yylex.(*Parser).setFreeFloating($$, token.Cond, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $7.Hidden) - yylex.(*Parser).setFreeFloating($$, token.AltEnd, $8.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($8)) + yylex.(*Parser).setFreeFloating($$, token.Cond, $3.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $7.Tokens) + yylex.(*Parser).setFreeFloating($$, token.AltEnd, $8.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $8.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -968,12 +968,12 @@ unticked_statement: $$.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) if len($2.GetNode().Tokens[token.OpenParenthesisToken]) > 0 { - yylex.(*Parser).setFreeFloating($$, token.While, $2.GetNode().Tokens[token.OpenParenthesisToken][:len($2.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($2.GetNode().Tokens, token.OpenParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens($$, token.While, $2.GetNode().Tokens[token.OpenParenthesisToken][:len($2.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($2.GetNode().Tokens, token.OpenParenthesisToken) } if len($2.GetNode().Tokens[token.CloseParenthesisToken]) > 0 { - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.GetNode().Tokens[token.CloseParenthesisToken][:len($2.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($2.GetNode().Tokens, token.CloseParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $2.GetNode().Tokens[token.CloseParenthesisToken][:len($2.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($2.GetNode().Tokens, token.CloseParenthesisToken) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -986,16 +986,16 @@ unticked_statement: $$.GetNode().Position = position.NewTokensPosition($1, $5) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens) if len($4.GetNode().Tokens[token.OpenParenthesisToken]) > 0 { - yylex.(*Parser).setFreeFloating($$, token.While, $4.GetNode().Tokens[token.OpenParenthesisToken][:len($4.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($4.GetNode().Tokens, token.OpenParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens($$, token.While, $4.GetNode().Tokens[token.OpenParenthesisToken][:len($4.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($4.GetNode().Tokens, token.OpenParenthesisToken) } if len($4.GetNode().Tokens[token.CloseParenthesisToken]) > 0 { - yylex.(*Parser).setFreeFloating($$, token.Expr, $4.GetNode().Tokens[token.CloseParenthesisToken][:len($4.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($4.GetNode().Tokens, token.CloseParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.GetNode().Tokens[token.CloseParenthesisToken][:len($4.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($4.GetNode().Tokens, token.CloseParenthesisToken) } - yylex.(*Parser).setFreeFloating($$, token.Cond, $5.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($5)) + yylex.(*Parser).setFreeFloating($$, token.Cond, $5.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $5.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1018,11 +1018,11 @@ unticked_statement: $$.GetNode().Position = position.NewTokenNodePosition($1, $9) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.For, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.InitExpr, $4.Hidden) - yylex.(*Parser).setFreeFloating($$, token.CondExpr, $6.Hidden) - yylex.(*Parser).setFreeFloating($$, token.IncExpr, $8.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.For, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.InitExpr, $4.Tokens) + yylex.(*Parser).setFreeFloating($$, token.CondExpr, $6.Tokens) + yylex.(*Parser).setFreeFloating($$, token.IncExpr, $8.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1043,12 +1043,12 @@ unticked_statement: $$.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) if len($2.GetNode().Tokens[token.OpenParenthesisToken]) > 0 { - yylex.(*Parser).setFreeFloating($$, token.Switch, $2.GetNode().Tokens[token.OpenParenthesisToken][:len($2.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($2.GetNode().Tokens, token.OpenParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens($$, token.Switch, $2.GetNode().Tokens[token.OpenParenthesisToken][:len($2.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($2.GetNode().Tokens, token.OpenParenthesisToken) } if len($2.GetNode().Tokens[token.CloseParenthesisToken]) > 0 { - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.GetNode().Tokens[token.CloseParenthesisToken][:len($2.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($2.GetNode().Tokens, token.CloseParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $2.GetNode().Tokens[token.CloseParenthesisToken][:len($2.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($2.GetNode().Tokens, token.CloseParenthesisToken) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -1061,9 +1061,9 @@ unticked_statement: $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1075,9 +1075,9 @@ unticked_statement: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1089,9 +1089,9 @@ unticked_statement: $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1103,9 +1103,9 @@ unticked_statement: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1117,9 +1117,9 @@ unticked_statement: $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1131,9 +1131,9 @@ unticked_statement: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1145,9 +1145,9 @@ unticked_statement: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1160,8 +1160,8 @@ unticked_statement: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2)) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1173,9 +1173,9 @@ unticked_statement: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.VarList, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.VarList, $3.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1187,9 +1187,9 @@ unticked_statement: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.VarList, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.VarList, $3.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1201,10 +1201,10 @@ unticked_statement: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Echo, yylex.(*Parser).GetFreeFloatingToken($1)) - yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.Echo, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1216,7 +1216,7 @@ unticked_statement: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1229,8 +1229,8 @@ unticked_statement: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2)) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1242,11 +1242,11 @@ unticked_statement: $$.GetNode().Position = position.NewTokensPosition($1, $5) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Unset, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.VarList, $4.Hidden) - yylex.(*Parser).setFreeFloating($$, token.CloseParenthesisToken, $5.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($5)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Unset, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.VarList, $4.Tokens) + yylex.(*Parser).setFreeFloating($$, token.CloseParenthesisToken, $5.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $5.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1280,13 +1280,13 @@ unticked_statement: $$.GetNode().Position = position.NewTokenNodePosition($1, $8) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Foreach, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Foreach, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens) if $6 != nil { - yylex.(*Parser).setFreeFloating($$, token.Key, $6.GetNode().Tokens[token.Key]); delete($6.GetNode().Tokens, token.Key) + yylex.(*Parser).setFreeFloatingTokens($$, token.Key, $6.GetNode().Tokens[token.Key]); delete($6.GetNode().Tokens, token.Key) } - yylex.(*Parser).setFreeFloating($$, token.Var, $7.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $7.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1320,13 +1320,13 @@ unticked_statement: $$.GetNode().Position = position.NewTokenNodePosition($1, $8) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Foreach, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Foreach, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens) if $6 != nil { - yylex.(*Parser).setFreeFloating($$, token.Key, $6.GetNode().Tokens[token.Key]); delete($6.GetNode().Tokens, token.Key) + yylex.(*Parser).setFreeFloatingTokens($$, token.Key, $6.GetNode().Tokens[token.Key]); delete($6.GetNode().Tokens, token.Key) } - yylex.(*Parser).setFreeFloating($$, token.Var, $7.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $7.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1339,9 +1339,9 @@ unticked_statement: $$.GetNode().Position = position.NewTokenNodePosition($1, $5) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Declare, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.ConstList, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Declare, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.ConstList, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1353,8 +1353,8 @@ unticked_statement: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1370,9 +1370,9 @@ unticked_statement: } // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Try, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Try, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1384,9 +1384,9 @@ unticked_statement: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1400,10 +1400,10 @@ unticked_statement: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(label, token.Start, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Label, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating(label, token.Start, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Label, $3.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1429,12 +1429,12 @@ catch_statement: catchNode.GetNode().Position = position.NewTokensPosition($1, $8) // save comments - yylex.(*Parser).setFreeFloating(catchNode, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(catchNode, token.Catch, $2.Hidden) - yylex.(*Parser).setFreeFloating(variable, token.Start, $4.Hidden) - yylex.(*Parser).setFreeFloating(catchNode, token.Var, $5.Hidden) - yylex.(*Parser).setFreeFloating(catchNode, token.Cond, $6.Hidden) - yylex.(*Parser).setFreeFloating(catchNode, token.Stmts, $8.Hidden) + yylex.(*Parser).setFreeFloating(catchNode, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating(catchNode, token.Catch, $2.Tokens) + yylex.(*Parser).setFreeFloating(variable, token.Start, $4.Tokens) + yylex.(*Parser).setFreeFloating(catchNode, token.Var, $5.Tokens) + yylex.(*Parser).setFreeFloating(catchNode, token.Cond, $6.Tokens) + yylex.(*Parser).setFreeFloating(catchNode, token.Stmts, $8.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1455,9 +1455,9 @@ finally_statement: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Finally, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Finally, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1506,12 +1506,12 @@ additional_catch: $$.GetNode().Position = position.NewTokensPosition($1, $8) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Catch, $2.Hidden) - yylex.(*Parser).setFreeFloating(variable, token.Start, $4.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Var, $5.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Cond, $6.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $8.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Catch, $2.Tokens) + yylex.(*Parser).setFreeFloating(variable, token.Start, $4.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Var, $5.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Cond, $6.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $8.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1529,7 +1529,7 @@ unset_variables: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1595,17 +1595,17 @@ unticked_function_declaration_statement: $$.GetNode().Position = position.NewTokensPosition($1, $9) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) if $2 != nil { - yylex.(*Parser).setFreeFloating($$, token.Function, $2.Hidden) - yylex.(*Parser).setFreeFloating(name, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Function, $2.Tokens) + yylex.(*Parser).setFreeFloating(name, token.Start, $3.Tokens) } else { - yylex.(*Parser).setFreeFloating(name, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating(name, token.Start, $3.Tokens) } - yylex.(*Parser).setFreeFloating($$, token.Name, $4.Hidden) - yylex.(*Parser).setFreeFloating($$, token.ParamList, $6.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Params, $7.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $9.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $4.Tokens) + yylex.(*Parser).setFreeFloating($$, token.ParamList, $6.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Params, $7.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $9.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1634,9 +1634,9 @@ unticked_class_declaration_statement: $$.GetNode().Position = position.NewNodeTokenPosition($1, $7) // save comments - yylex.(*Parser).setFreeFloating(name, token.Start, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Name, $5.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $7.Hidden) + yylex.(*Parser).setFreeFloating(name, token.Start, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Name, $5.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $7.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1650,10 +1650,10 @@ unticked_class_declaration_statement: $$.GetNode().Position = position.NewTokensPosition($1, $6) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(name, token.Start, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Name, $4.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $6.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating(name, token.Start, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Name, $4.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $6.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1669,7 +1669,7 @@ class_entry_type: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1683,8 +1683,8 @@ class_entry_type: $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1696,7 +1696,7 @@ class_entry_type: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1710,8 +1710,8 @@ class_entry_type: $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1732,7 +1732,7 @@ extends_from: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1760,7 +1760,7 @@ interface_extends_list: $$.GetNode().Position = position.NewTokenNodeListPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1781,7 +1781,7 @@ implements_list: $$.GetNode().Position = position.NewTokenNodeListPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1799,7 +1799,7 @@ interface_list: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1817,7 +1817,7 @@ foreach_optional_arg: $$ = $2 // save comments - yylex.(*Parser).setFreeFloating($$, token.Key, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Key, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1838,7 +1838,7 @@ foreach_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1850,9 +1850,9 @@ foreach_variable: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.List, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.List, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1878,10 +1878,10 @@ for_statement: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4)) + yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens) + yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1907,10 +1907,10 @@ foreach_statement: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4)) + yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens) + yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1937,10 +1937,10 @@ declare_statement: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4)) + yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens) + yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1959,8 +1959,8 @@ declare_list: constant.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating(constant, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(constant, token.Name, $2.Hidden) + yylex.(*Parser).setFreeFloating(constant, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating(constant, token.Name, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1975,9 +1975,9 @@ declare_list: constant.GetNode().Position = position.NewTokenNodePosition($3, $5) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) - yylex.(*Parser).setFreeFloating(constant, token.Start, $3.Hidden) - yylex.(*Parser).setFreeFloating(constant, token.Name, $4.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) + yylex.(*Parser).setFreeFloating(constant, token.Start, $3.Tokens) + yylex.(*Parser).setFreeFloating(constant, token.Name, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -1995,8 +1995,8 @@ switch_case_list: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $3.Hidden) + yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2010,9 +2010,9 @@ switch_case_list: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(caseList, token.CaseListStart, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $4.Hidden) + yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens(caseList, token.CaseListStart, $2.Tokens) + yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2026,10 +2026,10 @@ switch_case_list: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) - yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4)) + yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens) + yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $3.Tokens) + yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2044,11 +2044,11 @@ switch_case_list: $$.GetNode().Position = position.NewTokensPosition($1, $5) // save comments - yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) - yylex.(*Parser).setFreeFloating(caseList, token.CaseListStart, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $4.Hidden) - yylex.(*Parser).setFreeFloating($$, token.AltEnd, $5.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($5)) + yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens(caseList, token.CaseListStart, $2.Tokens) + yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $4.Tokens) + yylex.(*Parser).setFreeFloating($$, token.AltEnd, $5.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $5.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2071,9 +2071,9 @@ case_list: _case.GetNode().Position = position.NewTokenNodeListPosition($2, $5) // save comments - yylex.(*Parser).setFreeFloating(_case, token.Start, $2.Hidden) - yylex.(*Parser).setFreeFloating(_case, token.Expr, $4.Hidden) - yylex.(*Parser).setFreeFloating(_case, token.CaseSeparator, yylex.(*Parser).GetFreeFloatingToken($4)) + yylex.(*Parser).setFreeFloating(_case, token.Start, $2.Tokens) + yylex.(*Parser).setFreeFloating(_case, token.Expr, $4.Tokens) + yylex.(*Parser).setToken(_case, token.CaseSeparator, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2086,9 +2086,9 @@ case_list: _default.GetNode().Position = position.NewTokenNodeListPosition($2, $4) // save comments - yylex.(*Parser).setFreeFloating(_default, token.Start, $2.Hidden) - yylex.(*Parser).setFreeFloating(_default, token.Default, $3.Hidden) - yylex.(*Parser).setFreeFloating(_default, token.CaseSeparator, yylex.(*Parser).GetFreeFloatingToken($3)) + yylex.(*Parser).setFreeFloating(_default, token.Start, $2.Tokens) + yylex.(*Parser).setFreeFloating(_default, token.Default, $3.Tokens) + yylex.(*Parser).setToken(_default, token.CaseSeparator, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2127,10 +2127,10 @@ while_statement: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4)) + yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens) + yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2154,12 +2154,12 @@ elseif_list: _elseIf.GetNode().Position = position.NewTokenNodePosition($2, $4) // save comments - yylex.(*Parser).setFreeFloating(_elseIf, token.Start, $2.Hidden) + yylex.(*Parser).setFreeFloating(_elseIf, token.Start, $2.Tokens) if len($3.GetNode().Tokens[token.OpenParenthesisToken]) > 0 { - yylex.(*Parser).setFreeFloating(_elseIf, token.ElseIf, $3.GetNode().Tokens[token.OpenParenthesisToken][:len($3.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($3.GetNode().Tokens, token.OpenParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens(_elseIf, token.ElseIf, $3.GetNode().Tokens[token.OpenParenthesisToken][:len($3.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($3.GetNode().Tokens, token.OpenParenthesisToken) } if len($3.GetNode().Tokens[token.CloseParenthesisToken]) > 0 { - yylex.(*Parser).setFreeFloating(_elseIf, token.Expr, $3.GetNode().Tokens[token.CloseParenthesisToken][:len($3.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($3.GetNode().Tokens, token.CloseParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens(_elseIf, token.Expr, $3.GetNode().Tokens[token.CloseParenthesisToken][:len($3.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($3.GetNode().Tokens, token.CloseParenthesisToken) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -2185,14 +2185,14 @@ new_elseif_list: _elseIf.GetNode().Position = position.NewTokenNodeListPosition($2, $5) // save comments - yylex.(*Parser).setFreeFloating(_elseIf, token.Start, $2.Hidden) + yylex.(*Parser).setFreeFloating(_elseIf, token.Start, $2.Tokens) if len($3.GetNode().Tokens[token.OpenParenthesisToken]) > 0 { - yylex.(*Parser).setFreeFloating(_elseIf, token.ElseIf, $3.GetNode().Tokens[token.OpenParenthesisToken][:len($3.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($3.GetNode().Tokens, token.OpenParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens(_elseIf, token.ElseIf, $3.GetNode().Tokens[token.OpenParenthesisToken][:len($3.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($3.GetNode().Tokens, token.OpenParenthesisToken) } if len($3.GetNode().Tokens[token.CloseParenthesisToken]) > 0 { - yylex.(*Parser).setFreeFloating(_elseIf, token.Expr, $3.GetNode().Tokens[token.CloseParenthesisToken][:len($3.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($3.GetNode().Tokens, token.CloseParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens(_elseIf, token.Expr, $3.GetNode().Tokens[token.CloseParenthesisToken][:len($3.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($3.GetNode().Tokens, token.CloseParenthesisToken) } - yylex.(*Parser).setFreeFloating(_elseIf, token.Cond, $4.Hidden) + yylex.(*Parser).setFreeFloating(_elseIf, token.Cond, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2214,7 +2214,7 @@ else_single: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2238,8 +2238,8 @@ new_else_single: $$.GetNode().Position = position.NewTokenNodeListPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Else, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Else, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2273,7 +2273,7 @@ non_empty_parameter_list: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2304,22 +2304,22 @@ parameter: yylex.(*Parser).MoveFreeFloating($1, $$) } if $2 != nil { - yylex.(*Parser).setFreeFloating($$, token.OptionalType, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.OptionalType, $2.Tokens) } if $3 != nil { - yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Tokens) } - yylex.(*Parser).setFreeFloating($$, token.Variadic, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Variadic, $4.Tokens) // normalize if $3 == nil { - yylex.(*Parser).setFreeFloating($$, token.Ampersand, $$.GetNode().Tokens[token.Variadic]); delete($$.GetNode().Tokens, token.Variadic) + yylex.(*Parser).setFreeFloatingTokens($$, token.Ampersand, $$.GetNode().Tokens[token.Variadic]); delete($$.GetNode().Tokens, token.Variadic) } if $2 == nil { - yylex.(*Parser).setFreeFloating($$, token.OptionalType, $$.GetNode().Tokens[token.Ampersand]); delete($$.GetNode().Tokens, token.Ampersand) + yylex.(*Parser).setFreeFloatingTokens($$, token.OptionalType, $$.GetNode().Tokens[token.Ampersand]); delete($$.GetNode().Tokens, token.Ampersand) } if $1 == nil { - yylex.(*Parser).setFreeFloating($$, token.Start, $$.GetNode().Tokens[token.OptionalType]); delete($$.GetNode().Tokens, token.OptionalType) + yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $$.GetNode().Tokens[token.OptionalType]); delete($$.GetNode().Tokens, token.OptionalType) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -2348,23 +2348,23 @@ parameter: yylex.(*Parser).MoveFreeFloating($1, $$) } if $2 != nil { - yylex.(*Parser).setFreeFloating($$, token.OptionalType, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.OptionalType, $2.Tokens) } if $3 != nil { - yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Tokens) } - yylex.(*Parser).setFreeFloating($$, token.Variadic, $4.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Var, $5.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Variadic, $4.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Var, $5.Tokens) // normalize if $3 == nil { - yylex.(*Parser).setFreeFloating($$, token.Ampersand, $$.GetNode().Tokens[token.Variadic]); delete($$.GetNode().Tokens, token.Variadic) + yylex.(*Parser).setFreeFloatingTokens($$, token.Ampersand, $$.GetNode().Tokens[token.Variadic]); delete($$.GetNode().Tokens, token.Variadic) } if $2 == nil { - yylex.(*Parser).setFreeFloating($$, token.OptionalType, $$.GetNode().Tokens[token.Ampersand]); delete($$.GetNode().Tokens, token.Ampersand) + yylex.(*Parser).setFreeFloatingTokens($$, token.OptionalType, $$.GetNode().Tokens[token.Ampersand]); delete($$.GetNode().Tokens, token.Ampersand) } if $1 == nil { - yylex.(*Parser).setFreeFloating($$, token.Start, $$.GetNode().Tokens[token.OptionalType]); delete($$.GetNode().Tokens, token.OptionalType) + yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $$.GetNode().Tokens[token.OptionalType]); delete($$.GetNode().Tokens, token.OptionalType) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -2387,7 +2387,7 @@ optional_class_type: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2399,7 +2399,7 @@ optional_class_type: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2421,8 +2421,8 @@ function_call_parameter_list: $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.ArgumentList, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.ArgumentList, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2434,8 +2434,8 @@ function_call_parameter_list: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.ArgumentList, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.ArgumentList, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2449,8 +2449,8 @@ function_call_parameter_list: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.ArgumentList, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.ArgumentList, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2469,7 +2469,7 @@ non_empty_function_call_parameter_list: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2508,7 +2508,7 @@ function_call_parameter: $$.GetNode().Position = position.NewNodePosition($2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2520,7 +2520,7 @@ function_call_parameter: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2532,7 +2532,7 @@ global_var_list: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2556,7 +2556,7 @@ global_var: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2568,7 +2568,7 @@ global_var: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2580,9 +2580,9 @@ global_var: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($3, token.Start, append($2.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($2), $3.GetNode().Tokens[token.Start]...)...)) - yylex.(*Parser).setFreeFloating($3, token.End, append($3.GetNode().Tokens[token.End], append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)...)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens($3, token.Start, append($2.Tokens, $3.GetNode().Tokens[token.Start]...)) + yylex.(*Parser).setFreeFloatingTokens($3, token.End, append($3.GetNode().Tokens[token.End], $4.Tokens...)) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2603,8 +2603,8 @@ static_var_list: staticVar.GetNode().Position = position.NewTokenPosition($3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) - yylex.(*Parser).setFreeFloating(staticVar, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) + yylex.(*Parser).setFreeFloating(staticVar, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2621,9 +2621,9 @@ static_var_list: staticVar.GetNode().Position = position.NewTokenNodePosition($3, $5) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) - yylex.(*Parser).setFreeFloating(staticVar, token.Start, $3.Hidden) - yylex.(*Parser).setFreeFloating(staticVar, token.Var, $4.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) + yylex.(*Parser).setFreeFloating(staticVar, token.Start, $3.Tokens) + yylex.(*Parser).setFreeFloating(staticVar, token.Var, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2640,7 +2640,7 @@ static_var_list: staticVar.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating(staticVar, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating(staticVar, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2657,8 +2657,8 @@ static_var_list: staticVar.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating(staticVar, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(staticVar, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating(staticVar, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating(staticVar, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2691,8 +2691,8 @@ class_statement: // save comments yylex.(*Parser).MoveFreeFloating($1[0], $$) - yylex.(*Parser).setFreeFloating($$, token.PropertyList, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3)) + yylex.(*Parser).setFreeFloating($$, token.PropertyList, $3.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2704,8 +2704,8 @@ class_statement: $$.GetNode().Position = position.NewNodeTokenPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.ConstList, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2)) + yylex.(*Parser).setFreeFloating($$, token.ConstList, $2.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2731,18 +2731,18 @@ class_statement: // save comments if len($1) > 0 { yylex.(*Parser).MoveFreeFloating($1[0], $$) - yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Tokens) } else { - yylex.(*Parser).setFreeFloating($$, token.Start, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $2.Tokens) } if $3 == nil { - yylex.(*Parser).setFreeFloating($$, token.Function, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Function, $4.Tokens) } else { - yylex.(*Parser).setFreeFloating($$, token.Function, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Ampersand, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Function, $3.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Ampersand, $4.Tokens) } - yylex.(*Parser).setFreeFloating($$, token.Name, $5.Hidden) - yylex.(*Parser).setFreeFloating($$, token.ParameterList, $7.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $5.Tokens) + yylex.(*Parser).setFreeFloating($$, token.ParameterList, $7.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2757,7 +2757,7 @@ trait_use_statement: $$.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2775,7 +2775,7 @@ trait_list: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2789,8 +2789,8 @@ trait_adaptations: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2801,8 +2801,8 @@ trait_adaptations: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.AdaptationList, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.AdaptationList, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2844,8 +2844,8 @@ trait_adaptation_statement: $$ = $1; // save comments - yylex.(*Parser).setFreeFloating($$, token.NameList, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2)) + yylex.(*Parser).setFreeFloating($$, token.NameList, $2.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2854,8 +2854,8 @@ trait_adaptation_statement: $$ = $1; // save comments - yylex.(*Parser).setFreeFloating($$, token.Alias, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2)) + yylex.(*Parser).setFreeFloating($$, token.Alias, $2.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2871,7 +2871,7 @@ trait_precedence: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2889,7 +2889,7 @@ trait_reference_list: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2906,7 +2906,7 @@ trait_method_reference: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2930,8 +2930,8 @@ trait_method_reference_fully_qualified: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) - yylex.(*Parser).setFreeFloating(target, token.Start, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) + yylex.(*Parser).setFreeFloating(target, token.Start, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2949,8 +2949,8 @@ trait_alias: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Hidden) - yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Tokens) + yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2963,7 +2963,7 @@ trait_alias: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2993,8 +2993,8 @@ method_body: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3006,8 +3006,8 @@ method_body: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3029,7 +3029,7 @@ variable_modifiers: modifier.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating(modifier, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating(modifier, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3074,7 +3074,7 @@ member_modifier: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3086,7 +3086,7 @@ member_modifier: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3098,7 +3098,7 @@ member_modifier: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3110,7 +3110,7 @@ member_modifier: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3122,7 +3122,7 @@ member_modifier: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3134,7 +3134,7 @@ member_modifier: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3154,8 +3154,8 @@ class_variable_declaration: property.GetNode().Position = position.NewTokenPosition($3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) - yylex.(*Parser).setFreeFloating(property, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) + yylex.(*Parser).setFreeFloating(property, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3172,9 +3172,9 @@ class_variable_declaration: property.GetNode().Position = position.NewTokenNodePosition($3, $5) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) - yylex.(*Parser).setFreeFloating(property, token.Start, $3.Hidden) - yylex.(*Parser).setFreeFloating(property, token.Var, $4.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) + yylex.(*Parser).setFreeFloating(property, token.Start, $3.Tokens) + yylex.(*Parser).setFreeFloating(property, token.Var, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3191,7 +3191,7 @@ class_variable_declaration: property.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating(property, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating(property, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3208,8 +3208,8 @@ class_variable_declaration: property.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating(property, token.Start, $2.Hidden) - yylex.(*Parser).setFreeFloating(property, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating(property, token.Start, $2.Tokens) + yylex.(*Parser).setFreeFloating(property, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3231,9 +3231,9 @@ class_constant_declaration: $1.GetNode().Position = position.NewNodesPosition($1, $5) // save comments - yylex.(*Parser).setFreeFloating(lastConst, token.End, $2.Hidden) - yylex.(*Parser).setFreeFloating(constant, token.Start, $3.Hidden) - yylex.(*Parser).setFreeFloating(constant, token.Name, $4.Hidden) + yylex.(*Parser).setFreeFloating(lastConst, token.End, $2.Tokens) + yylex.(*Parser).setFreeFloating(constant, token.Start, $3.Tokens) + yylex.(*Parser).setFreeFloating(constant, token.Name, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3249,9 +3249,9 @@ class_constant_declaration: $$.GetNode().Position = position.NewTokenNodePosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(constant, token.Start, $2.Hidden) - yylex.(*Parser).setFreeFloating(constant, token.Name, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating(constant, token.Start, $2.Tokens) + yylex.(*Parser).setFreeFloating(constant, token.Name, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3263,7 +3263,7 @@ echo_expr_list: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3297,7 +3297,7 @@ non_empty_for_expr: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3334,8 +3334,8 @@ chaining_dereference: fetch.GetNode().Position = position.NewNodePosition($3) // save comments - yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens(fetch, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens(fetch, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3348,8 +3348,8 @@ chaining_dereference: fetch.GetNode().Position = position.NewNodePosition($2) // save comments - yylex.(*Parser).setFreeFloating(fetch, token.Var, append($1.Hidden, yylex.(*Parser).GetFreeFloatingToken($1)...)) - yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)) + yylex.(*Parser).setFreeFloatingTokens(fetch, token.Var, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens(fetch, token.Expr, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3404,7 +3404,7 @@ new_expr: } // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3421,10 +3421,10 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $6) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(listNode, token.List, $2.Hidden) - yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $4.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Var, $5.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating(listNode, token.List, $2.Tokens) + yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $4.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Var, $5.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3437,7 +3437,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3450,8 +3450,8 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Equal, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Equal, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3476,9 +3476,9 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Equal, $3.Hidden) - yylex.(*Parser).setFreeFloating(_new, token.Start, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Equal, $3.Tokens) + yylex.(*Parser).setFreeFloating(_new, token.Start, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3490,7 +3490,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3502,7 +3502,7 @@ expr_without_variable: $$.GetNode().Position = position.NewNodesPosition($1, $3) yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3515,7 +3515,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3528,7 +3528,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3541,7 +3541,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3554,7 +3554,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3567,7 +3567,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3580,7 +3580,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3593,7 +3593,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3606,7 +3606,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3619,7 +3619,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3632,7 +3632,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3645,7 +3645,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3658,7 +3658,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3670,7 +3670,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3683,7 +3683,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3695,7 +3695,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3708,7 +3708,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3721,7 +3721,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3734,7 +3734,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3747,7 +3747,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3760,7 +3760,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3773,7 +3773,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3786,7 +3786,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3799,7 +3799,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3812,7 +3812,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3825,7 +3825,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3838,7 +3838,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3851,7 +3851,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3864,7 +3864,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3877,7 +3877,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3890,7 +3890,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3903,7 +3903,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3916,7 +3916,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3928,7 +3928,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3940,7 +3940,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3952,7 +3952,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3964,7 +3964,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3977,7 +3977,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3990,7 +3990,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4003,7 +4003,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4016,8 +4016,8 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Equal, yylex.(*Parser).GetFreeFloatingToken($2)) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) + yylex.(*Parser).setToken($$, token.Equal, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4030,7 +4030,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4043,7 +4043,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4056,7 +4056,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4069,7 +4069,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4082,7 +4082,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4092,8 +4092,8 @@ expr_without_variable: yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) - yylex.(*Parser).setFreeFloating($1, token.Start, append($1.GetNode().Tokens[token.OpenParenthesisToken], $1.GetNode().Tokens[token.Start]...)); delete($1.GetNode().Tokens, token.OpenParenthesisToken) - yylex.(*Parser).setFreeFloating($1, token.End, append($1.GetNode().Tokens[token.End], $1.GetNode().Tokens[token.CloseParenthesisToken]...)); delete($1.GetNode().Tokens, token.CloseParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens($1, token.Start, append($1.GetNode().Tokens[token.OpenParenthesisToken], $1.GetNode().Tokens[token.Start]...)); delete($1.GetNode().Tokens, token.OpenParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens($1, token.End, append($1.GetNode().Tokens[token.End], $1.GetNode().Tokens[token.CloseParenthesisToken]...)); delete($1.GetNode().Tokens, token.CloseParenthesisToken) } | new_expr { @@ -4106,8 +4106,8 @@ expr_without_variable: $$ = $2 // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...)) - yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Start, append($1.Tokens, $$.GetNode().Tokens[token.Start]...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($$.GetNode().Tokens[token.End], $3.Tokens...)) for _, n := range($4) { switch nn := n.(type) { @@ -4142,8 +4142,8 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.True, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.True, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4156,8 +4156,8 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.True, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.True, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4175,8 +4175,8 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.Cast, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4188,8 +4188,8 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.Cast, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4201,8 +4201,8 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.Cast, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4214,8 +4214,8 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.Cast, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4227,8 +4227,8 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.Cast, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4240,8 +4240,8 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.Cast, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4253,8 +4253,8 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.Cast, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4275,7 +4275,7 @@ expr_without_variable: } // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4287,7 +4287,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4317,7 +4317,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4329,7 +4329,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4341,7 +4341,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4353,20 +4353,20 @@ expr_without_variable: $$.GetNode().Position = position.NewTokensPosition($1, $9) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) if $2 == nil { - yylex.(*Parser).setFreeFloating($$, token.Function, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Function, $3.Tokens) } else { - yylex.(*Parser).setFreeFloating($$, token.Function, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Function, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Tokens) } - yylex.(*Parser).setFreeFloating($$, token.ParameterList, $5.Hidden) - yylex.(*Parser).setFreeFloating($$, token.LexicalVars, $7.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $9.Hidden) + yylex.(*Parser).setFreeFloating($$, token.ParameterList, $5.Tokens) + yylex.(*Parser).setFreeFloating($$, token.LexicalVars, $7.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $9.Tokens) // normalize if $6 == nil { - yylex.(*Parser).setFreeFloating($$, token.Params, $$.GetNode().Tokens[token.LexicalVars]); delete($$.GetNode().Tokens, token.LexicalVars) + yylex.(*Parser).setFreeFloatingTokens($$, token.Params, $$.GetNode().Tokens[token.LexicalVars]); delete($$.GetNode().Tokens, token.LexicalVars) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -4379,21 +4379,21 @@ expr_without_variable: $$.GetNode().Position = position.NewTokensPosition($1, $10) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Static, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Static, $2.Tokens) if $3 == nil { - yylex.(*Parser).setFreeFloating($$, token.Function, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Function, $4.Tokens) } else { - yylex.(*Parser).setFreeFloating($$, token.Function, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Ampersand, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Function, $3.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Ampersand, $4.Tokens) } - yylex.(*Parser).setFreeFloating($$, token.ParameterList, $6.Hidden) - yylex.(*Parser).setFreeFloating($$, token.LexicalVars, $8.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $10.Hidden) + yylex.(*Parser).setFreeFloating($$, token.ParameterList, $6.Tokens) + yylex.(*Parser).setFreeFloating($$, token.LexicalVars, $8.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $10.Tokens) // normalize if $7 == nil { - yylex.(*Parser).setFreeFloating($$, token.Params, $$.GetNode().Tokens[token.LexicalVars]); delete($$.GetNode().Tokens, token.LexicalVars) + yylex.(*Parser).setFreeFloatingTokens($$, token.Params, $$.GetNode().Tokens[token.LexicalVars]); delete($$.GetNode().Tokens, token.LexicalVars) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -4409,7 +4409,7 @@ yield_expr: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4421,7 +4421,7 @@ yield_expr: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4433,8 +4433,8 @@ yield_expr: $$.GetNode().Position = position.NewTokenNodePosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4446,8 +4446,8 @@ yield_expr: $$.GetNode().Position = position.NewTokenNodePosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4463,8 +4463,8 @@ combined_scalar_offset: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4477,8 +4477,8 @@ combined_scalar_offset: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4492,9 +4492,9 @@ combined_scalar_offset: $$.GetNode().Position = position.NewNodeTokenPosition(str, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4507,8 +4507,8 @@ combined_scalar_offset: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4523,9 +4523,9 @@ combined_scalar: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Array, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Array, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4537,8 +4537,8 @@ combined_scalar: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4566,9 +4566,9 @@ lexical_vars: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Use, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.LexicalVarList, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Use, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.LexicalVarList, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4586,8 +4586,8 @@ lexical_var_list: variable.GetNode().Position = position.NewTokenPosition($3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) - yylex.(*Parser).setFreeFloating(variable, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) + yylex.(*Parser).setFreeFloating(variable, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4604,9 +4604,9 @@ lexical_var_list: reference.GetNode().Position = position.NewTokensPosition($3, $4) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) - yylex.(*Parser).setFreeFloating(reference, token.Start, $3.Hidden) - yylex.(*Parser).setFreeFloating(variable, token.Start, $4.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) + yylex.(*Parser).setFreeFloating(reference, token.Start, $3.Tokens) + yylex.(*Parser).setFreeFloating(variable, token.Start, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4621,7 +4621,7 @@ lexical_var_list: variable.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating(variable, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating(variable, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4638,8 +4638,8 @@ lexical_var_list: reference.GetNode().Position = position.NewTokensPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating(reference, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(variable, token.Start, $2.Hidden) + yylex.(*Parser).setFreeFloating(reference, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating(variable, token.Start, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4670,8 +4670,8 @@ function_call: $$.GetNode().Position = position.NewNodesPosition(funcName, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(funcName, token.Namespace, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating(funcName, token.Namespace, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4685,7 +4685,7 @@ function_call: $$.GetNode().Position = position.NewNodesPosition(funcName, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4698,7 +4698,7 @@ function_call: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4711,7 +4711,7 @@ function_call: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4724,7 +4724,7 @@ function_call: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4737,7 +4737,7 @@ function_call: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4764,7 +4764,7 @@ class_name: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4788,8 +4788,8 @@ class_name: $$.GetNode().Position = position.NewTokenNodeListPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4801,7 +4801,7 @@ class_name: $$.GetNode().Position = position.NewTokenNodeListPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4828,8 +4828,8 @@ fully_qualified_class_name: $$.GetNode().Position = position.NewTokenNodeListPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4841,7 +4841,7 @@ fully_qualified_class_name: $$.GetNode().Position = position.NewTokenNodeListPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4868,7 +4868,7 @@ dynamic_class_name_reference: $$ = $1 // save comments - yylex.(*Parser).setFreeFloating($3[0], token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($3[0], token.Var, $2.Tokens) for _, n := range($3) { switch nn := n.(type) { @@ -4935,7 +4935,7 @@ dynamic_class_name_variable_property: $$ = $2 // save comments - yylex.(*Parser).setFreeFloating($2[0], token.Var, $1.Hidden) + yylex.(*Parser).setFreeFloating($2[0], token.Var, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4956,8 +4956,8 @@ exit_expr: $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Exit, append($1.Hidden, yylex.(*Parser).GetFreeFloatingToken($1)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Exit, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4975,8 +4975,8 @@ exit_expr: yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) // save comments - yylex.(*Parser).setFreeFloating($$, token.Exit, $1.GetNode().Tokens[token.OpenParenthesisToken]); delete($1.GetNode().Tokens, token.OpenParenthesisToken) - yylex.(*Parser).setFreeFloating($$, token.Expr, $1.GetNode().Tokens[token.CloseParenthesisToken]); delete($1.GetNode().Tokens, token.CloseParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens($$, token.Exit, $1.GetNode().Tokens[token.OpenParenthesisToken]); delete($1.GetNode().Tokens, token.OpenParenthesisToken) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $1.GetNode().Tokens[token.CloseParenthesisToken]); delete($1.GetNode().Tokens, token.CloseParenthesisToken) } ; @@ -5029,7 +5029,7 @@ common_scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5041,7 +5041,7 @@ common_scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5053,7 +5053,7 @@ common_scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5065,7 +5065,7 @@ common_scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5077,7 +5077,7 @@ common_scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5089,7 +5089,7 @@ common_scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5101,7 +5101,7 @@ common_scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5113,7 +5113,7 @@ common_scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5125,7 +5125,7 @@ common_scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5137,7 +5137,7 @@ common_scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5151,7 +5151,7 @@ common_scalar: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5163,7 +5163,7 @@ common_scalar: $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5181,8 +5181,8 @@ static_class_constant: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) - yylex.(*Parser).setFreeFloating(target, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) + yylex.(*Parser).setFreeFloating(target, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5234,8 +5234,8 @@ static_scalar_value: $$.GetNode().Position = position.NewTokenNodeListPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5249,7 +5249,7 @@ static_scalar_value: $$.GetNode().Position = position.NewTokenNodeListPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5261,9 +5261,9 @@ static_scalar_value: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Array, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Array, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5275,8 +5275,8 @@ static_scalar_value: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5294,7 +5294,7 @@ static_scalar_value: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5316,8 +5316,8 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5330,7 +5330,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5343,7 +5343,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5356,7 +5356,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5369,7 +5369,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5382,7 +5382,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5395,7 +5395,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5407,7 +5407,7 @@ static_operation: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5419,7 +5419,7 @@ static_operation: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5432,7 +5432,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5445,7 +5445,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5458,7 +5458,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5471,7 +5471,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5484,7 +5484,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5497,7 +5497,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5510,7 +5510,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5523,7 +5523,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5536,7 +5536,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5549,7 +5549,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5562,7 +5562,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5575,7 +5575,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5588,7 +5588,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5601,7 +5601,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5614,8 +5614,8 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Equal, yylex.(*Parser).GetFreeFloatingToken($2)) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) + yylex.(*Parser).setToken($$, token.Equal, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5628,7 +5628,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5641,7 +5641,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5654,7 +5654,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5667,7 +5667,7 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5680,8 +5680,8 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.True, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.True, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5694,8 +5694,8 @@ static_operation: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.True, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.True, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5707,7 +5707,7 @@ static_operation: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5719,7 +5719,7 @@ static_operation: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5728,8 +5728,8 @@ static_operation: $$ = $2 // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...)) - yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Start, append($1.Tokens, $$.GetNode().Tokens[token.Start]...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($$.GetNode().Tokens[token.End], $3.Tokens...)) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5766,8 +5766,8 @@ general_constant: $$.GetNode().Position = position.NewNodePosition(name) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(name, token.Namespace, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating(name, token.Namespace, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5781,7 +5781,7 @@ general_constant: $$.GetNode().Position = position.NewNodePosition(name) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5798,7 +5798,7 @@ scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5828,7 +5828,7 @@ scalar: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5840,7 +5840,7 @@ scalar: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5852,7 +5852,7 @@ scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5871,7 +5871,7 @@ static_array_pair_list: // save comments if $2 != nil { - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -5899,9 +5899,9 @@ non_empty_static_array_pair_list: arrayItem.GetNode().Position = position.NewNodesPosition($3, $5) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).MoveFreeFloating($3, arrayItem) - yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $4.Hidden) + yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5914,7 +5914,7 @@ non_empty_static_array_pair_list: arrayItem.GetNode().Position = position.NewNodePosition($3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).MoveFreeFloating($3, arrayItem) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -5929,7 +5929,7 @@ non_empty_static_array_pair_list: // save comments yylex.(*Parser).MoveFreeFloating($1, arrayItem) - yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5975,8 +5975,8 @@ parenthesis_expr: if len($2.GetNode().Tokens[token.CloseParenthesisToken]) > 0 { yylex.(*Parser).setFreeFloating($2, token.End, append($2.GetNode().Tokens[token.End], $2.GetNode().Tokens[token.CloseParenthesisToken]...)) } - yylex.(*Parser).setFreeFloating($2, token.OpenParenthesisToken, append($1.Hidden, yylex.(*Parser).GetFreeFloatingToken($1)...)) - yylex.(*Parser).setFreeFloating($2, token.CloseParenthesisToken, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)) + yylex.(*Parser).setFreeFloatingTokens($2, token.OpenParenthesisToken, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens($2, token.CloseParenthesisToken, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5991,8 +5991,8 @@ parenthesis_expr: if len($2.GetNode().Tokens[token.CloseParenthesisToken]) > 0 { yylex.(*Parser).setFreeFloating($2, token.End, append($2.GetNode().Tokens[token.End], $2.GetNode().Tokens[token.CloseParenthesisToken]...)) } - yylex.(*Parser).setFreeFloating($2, token.OpenParenthesisToken, append($1.Hidden, yylex.(*Parser).GetFreeFloatingToken($1)...)) - yylex.(*Parser).setFreeFloating($2, token.CloseParenthesisToken, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)) + yylex.(*Parser).setFreeFloatingTokens($2, token.OpenParenthesisToken, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens($2, token.CloseParenthesisToken, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6038,7 +6038,7 @@ variable: } // save comments - yylex.(*Parser).setFreeFloating($3[0], token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($3[0], token.Var, $2.Tokens) for _, n := range($3) { switch nn := n.(type) { @@ -6121,7 +6121,7 @@ variable_property: $$ = $2 // save comments - yylex.(*Parser).setFreeFloating($2[0], token.Var, $1.Hidden) + yylex.(*Parser).setFreeFloating($2[0], token.Var, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6137,8 +6137,8 @@ array_method_dereference: fetch.GetNode().Position = position.NewNodePosition($3) // save comments - yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens(fetch, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens(fetch, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6151,8 +6151,8 @@ array_method_dereference: fetch.GetNode().Position = position.NewNodePosition($3) // save comments - yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens(fetch, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens(fetch, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6222,7 +6222,7 @@ static_member: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6235,7 +6235,7 @@ static_member: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6260,8 +6260,8 @@ array_function_dereference: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6274,8 +6274,8 @@ array_function_dereference: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6340,8 +6340,8 @@ reference_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6354,8 +6354,8 @@ reference_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6379,7 +6379,7 @@ compound_variable: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6391,9 +6391,9 @@ compound_variable: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($3, token.Start, append($2.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($2), $3.GetNode().Tokens[token.Start]...)...)) - yylex.(*Parser).setFreeFloating($3, token.End, append($3.GetNode().Tokens[token.End], append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)...)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens($3, token.Start, append($2.Tokens, $3.GetNode().Tokens[token.Start]...)) + yylex.(*Parser).setFreeFloatingTokens($3, token.End, append($3.GetNode().Tokens[token.End], $4.Tokens...)) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6444,8 +6444,8 @@ object_dim_list: fetch.GetNode().Position = position.NewNodePosition($3) // save comments - yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens(fetch, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens(fetch, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6458,8 +6458,8 @@ object_dim_list: fetch.GetNode().Position = position.NewNodePosition($3) // save comments - yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens(fetch, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens(fetch, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6484,7 +6484,7 @@ variable_name: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6496,8 +6496,8 @@ variable_name: $$.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]...)...)) - yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Start, append($1.Tokens, $$.GetNode().Tokens[token.Start]...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($$.GetNode().Tokens[token.End], $3.Tokens...)) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6513,7 +6513,7 @@ simple_indirect_reference: n.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating(n, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating(n, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6530,9 +6530,9 @@ simple_indirect_reference: n.GetNode().Position = position.NewTokenPosition($2) // save comments - yylex.(*Parser).setFreeFloating(n, token.Start, $2.Hidden) + yylex.(*Parser).setFreeFloating(n, token.Start, $2.Tokens) - yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) + yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } ; @@ -6546,7 +6546,7 @@ assignment_list: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6586,9 +6586,9 @@ assignment_list_element: $$.GetNode().Position = position.NewNodePosition(listNode) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(listNode, token.List, $2.Hidden) - yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating(listNode, token.List, $2.Tokens) + yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6618,7 +6618,7 @@ array_pair_list: // save comments if $2 != nil { - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -6635,9 +6635,9 @@ non_empty_array_pair_list: arrayItem.GetNode().Position = position.NewNodesPosition($3, $5) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).MoveFreeFloating($3, arrayItem) - yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $4.Hidden) + yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6650,7 +6650,7 @@ non_empty_array_pair_list: arrayItem.GetNode().Position = position.NewNodePosition($3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).MoveFreeFloating($3, arrayItem) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -6665,7 +6665,7 @@ non_empty_array_pair_list: // save comments yylex.(*Parser).MoveFreeFloating($1, arrayItem) - yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6693,10 +6693,10 @@ non_empty_array_pair_list: arrayItem.GetNode().Position = position.NewNodesPosition($3, $6) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).MoveFreeFloating($3, arrayItem) - yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $4.Hidden) - yylex.(*Parser).setFreeFloating(reference, token.Start, $5.Hidden) + yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $4.Tokens) + yylex.(*Parser).setFreeFloating(reference, token.Start, $5.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6711,8 +6711,8 @@ non_empty_array_pair_list: arrayItem.GetNode().Position = position.NewTokenNodePosition($3, $4) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) - yylex.(*Parser).setFreeFloating(arrayItem, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) + yylex.(*Parser).setFreeFloating(arrayItem, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6728,8 +6728,8 @@ non_empty_array_pair_list: // save comments yylex.(*Parser).MoveFreeFloating($1, arrayItem) - yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $2.Hidden) - yylex.(*Parser).setFreeFloating(reference, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $2.Tokens) + yylex.(*Parser).setFreeFloating(reference, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6744,7 +6744,7 @@ non_empty_array_pair_list: arrayItem.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating(arrayItem, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating(arrayItem, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6766,7 +6766,7 @@ encaps_list: encapsed.GetNode().Position = position.NewTokenPosition($2) // save comments - yylex.(*Parser).setFreeFloating(encapsed, token.Start, $2.Hidden) + yylex.(*Parser).setFreeFloating(encapsed, token.Start, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6785,7 +6785,7 @@ encaps_list: encapsed.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating(encapsed, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating(encapsed, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6802,7 +6802,7 @@ encaps_var: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6818,8 +6818,8 @@ encaps_var: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6837,8 +6837,8 @@ encaps_var: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) - yylex.(*Parser).setFreeFloating(fetch, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloating(fetch, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6852,8 +6852,8 @@ encaps_var: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1)) - yylex.(*Parser).setFreeFloating($$, token.End, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)) + yylex.(*Parser).setToken($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6869,8 +6869,8 @@ encaps_var: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1)) - yylex.(*Parser).setFreeFloating($$, token.End, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)) + yylex.(*Parser).setToken($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6886,10 +6886,10 @@ encaps_var: $$.GetNode().Position = position.NewTokensPosition($1, $6) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1)) - yylex.(*Parser).setFreeFloating($$, token.Var, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($5.Hidden, yylex.(*Parser).GetFreeFloatingToken($5)...)) - yylex.(*Parser).setFreeFloating($$, token.End, append($6.Hidden, yylex.(*Parser).GetFreeFloatingToken($6)...)) + yylex.(*Parser).setToken($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $3.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $5.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.End, $6.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6898,8 +6898,8 @@ encaps_var: $$ = $2; // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1)) - yylex.(*Parser).setFreeFloating($$, token.End, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)) + yylex.(*Parser).setToken($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6914,7 +6914,7 @@ encaps_var_offset: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6931,7 +6931,7 @@ encaps_var_offset: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6945,7 +6945,7 @@ encaps_var_offset: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6960,9 +6960,9 @@ internal_functions_in_yacc: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Isset, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.VarList, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Isset, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.VarList, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6974,9 +6974,9 @@ internal_functions_in_yacc: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Empty, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Empty, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -6988,9 +6988,9 @@ internal_functions_in_yacc: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Empty, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Empty, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -7002,7 +7002,7 @@ internal_functions_in_yacc: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -7014,7 +7014,7 @@ internal_functions_in_yacc: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -7026,9 +7026,9 @@ internal_functions_in_yacc: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Eval, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Eval, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -7040,7 +7040,7 @@ internal_functions_in_yacc: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -7052,7 +7052,7 @@ internal_functions_in_yacc: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -7070,7 +7070,7 @@ isset_variables: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -7103,8 +7103,8 @@ class_constant: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) - yylex.(*Parser).setFreeFloating(target, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) + yylex.(*Parser).setFreeFloating(target, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -7119,8 +7119,8 @@ class_constant: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) - yylex.(*Parser).setFreeFloating(target, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) + yylex.(*Parser).setFreeFloating(target, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -7138,8 +7138,8 @@ static_class_name_scalar: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) - yylex.(*Parser).setFreeFloating(target, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) + yylex.(*Parser).setFreeFloating(target, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -7157,8 +7157,8 @@ class_name_scalar: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) - yylex.(*Parser).setFreeFloating(target, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) + yylex.(*Parser).setFreeFloating(target, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } diff --git a/internal/php5/php5_bench_test.go b/internal/php5/php5_bench_test.go index 4ce4b1e..49efe90 100644 --- a/internal/php5/php5_bench_test.go +++ b/internal/php5/php5_bench_test.go @@ -415,7 +415,7 @@ CAD; for n := 0; n < b.N; n++ { lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() } } diff --git a/internal/php5/php5_test.go b/internal/php5/php5_test.go index 6f4d199..e3b98ab 100644 --- a/internal/php5/php5_test.go +++ b/internal/php5/php5_test.go @@ -22458,7 +22458,7 @@ func TestPhp5(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22596,7 +22596,7 @@ func TestPhp5Strings(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22823,7 +22823,7 @@ CAD; } lexer := scanner.NewLexer([]byte(src), "5.6", false, nil) - php5parser := php5.NewParser(lexer, false, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22849,7 +22849,7 @@ func TestPhp5ControlCharsErrors(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "5.6", false, errorHandlerFunc) - php5parser := php5.NewParser(lexer, false, errorHandlerFunc) + php5parser := php5.NewParser(lexer, errorHandlerFunc) php5parser.Parse() assert.DeepEqual(t, expected, parserErrors) } diff --git a/internal/php7/parser.go b/internal/php7/parser.go index 7426278..e7aa50e 100644 --- a/internal/php7/parser.go +++ b/internal/php7/parser.go @@ -14,14 +14,12 @@ type Parser struct { Lexer *scanner.Lexer currentToken *scanner.Token rootNode ast.Vertex - withTokens bool errHandlerFunc func(*errors.Error) } // NewParser creates and returns new Parser -func NewParser(lexer *scanner.Lexer, withTokens bool, errHandlerFunc func(*errors.Error)) *Parser { +func NewParser(lexer *scanner.Lexer, errHandlerFunc func(*errors.Error)) *Parser { return &Parser{ - withTokens: withTokens, Lexer: lexer, errHandlerFunc: errHandlerFunc, } @@ -63,7 +61,7 @@ func lastNode(nn []ast.Vertex) ast.Vertex { } func (p *Parser) MoveFreeFloating(src ast.Vertex, dst ast.Vertex) { - if p.withTokens == false { + if _, ok := src.GetNode().Tokens[token.Start]; !ok { return } @@ -71,42 +69,64 @@ func (p *Parser) MoveFreeFloating(src ast.Vertex, dst ast.Vertex) { return } - p.setFreeFloating(dst, token.Start, src.GetNode().Tokens[token.Start]) - delete(src.GetNode().Tokens, token.Start) -} - -func (p *Parser) setFreeFloating(dst ast.Vertex, pos token.Position, strings []token.Token) { - if p.withTokens == false { - return - } - - if len(strings) == 0 { - return - } - dstCollection := &dst.GetNode().Tokens if *dstCollection == nil { *dstCollection = make(token.Collection) } - (*dstCollection)[pos] = strings + (*dstCollection)[token.Start] = src.GetNode().Tokens[token.Start] + delete(src.GetNode().Tokens, token.Start) } -func (p *Parser) GetFreeFloatingToken(t *scanner.Token) []token.Token { - if p.withTokens == false { - return []token.Token{} +func (p *Parser) setFreeFloating(dst ast.Vertex, pos token.Position, tokens []token.Token) { + if len(tokens) == 0 { + return } - return []token.Token{ - { - ID: token.ID(t.ID), - Value: t.Value, - }, + dstCollection := &dst.GetNode().Tokens + if *dstCollection == nil { + *dstCollection = make(token.Collection) } + + l := len(tokens) + for _, v := range tokens[0 : l-1] { + (*dstCollection)[pos] = append((*dstCollection)[pos], v) + } +} + +func (p *Parser) setFreeFloatingTokens(dst ast.Vertex, pos token.Position, tokens []token.Token) { + if len(tokens) == 0 { + return + } + + dstCollection := &dst.GetNode().Tokens + if *dstCollection == nil { + *dstCollection = make(token.Collection) + } + + (*dstCollection)[pos] = make([]token.Token, 0) + + for _, v := range tokens { + (*dstCollection)[pos] = append((*dstCollection)[pos], v) + } +} + +func (p *Parser) setToken(dst ast.Vertex, pos token.Position, tokens []token.Token) { + if len(tokens) == 0 { + return + } + + dstCollection := &dst.GetNode().Tokens + if *dstCollection == nil { + *dstCollection = make(token.Collection) + } + + l := len(tokens) + (*dstCollection)[pos] = append((*dstCollection)[pos], tokens[l-1]) } func (p *Parser) splitSemiColonAndPhpCloseTag(htmlNode ast.Vertex, prevNode ast.Vertex) { - if p.withTokens == false { + if _, ok := prevNode.GetNode().Tokens[token.SemiColon]; !ok { return } @@ -117,7 +137,7 @@ func (p *Parser) splitSemiColonAndPhpCloseTag(htmlNode ast.Vertex, prevNode ast. } if semiColon[0].Value[0] == ';' { - p.setFreeFloating(prevNode, token.SemiColon, []token.Token{ + p.setFreeFloatingTokens(prevNode, token.SemiColon, []token.Token{ { ID: token.ID(';'), Value: semiColon[0].Value[0:1], @@ -144,7 +164,7 @@ func (p *Parser) splitSemiColonAndPhpCloseTag(htmlNode ast.Vertex, prevNode ast. Value: semiColon[0].Value[vlen-tlen:], }) - p.setFreeFloating(htmlNode, token.Start, append(phpCloseTag, htmlNode.GetNode().Tokens[token.Start]...)) + p.setFreeFloatingTokens(htmlNode, token.Start, append(phpCloseTag, htmlNode.GetNode().Tokens[token.Start]...)) } func (p *Parser) returnTokenToPool(yyDollar []yySymType, yyVAL *yySymType) { diff --git a/internal/php7/parser_test.go b/internal/php7/parser_test.go index 05cdefc..60e0289 100644 --- a/internal/php7/parser_test.go +++ b/internal/php7/parser_test.go @@ -59,7 +59,7 @@ func TestIdentifier(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -953,7 +953,7 @@ func TestPhp7ArgumentNode(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1747,7 +1747,7 @@ func TestPhp7ParameterNode(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1769,7 +1769,7 @@ func TestCommentEndFile(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1847,7 +1847,7 @@ func TestName(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1923,7 +1923,7 @@ func TestFullyQualified(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1999,7 +1999,7 @@ func TestRelative(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2078,7 +2078,7 @@ func TestScalarEncapsed_SimpleVar(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2155,7 +2155,7 @@ func TestScalarEncapsed_SimpleVarOneChar(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2243,7 +2243,7 @@ func TestScalarEncapsed_SimpleVarEndsEcapsed(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2341,7 +2341,7 @@ func TestScalarEncapsed_StringVarCurveOpen(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2450,7 +2450,7 @@ func TestScalarEncapsed_SimpleVarPropertyFetch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2527,7 +2527,7 @@ func TestScalarEncapsed_DollarOpenCurlyBraces(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2625,7 +2625,7 @@ func TestScalarEncapsed_DollarOpenCurlyBracesDimNumber(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2733,7 +2733,7 @@ func TestScalarEncapsed_CurlyOpenMethodCall(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2825,7 +2825,7 @@ LBL; } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2917,7 +2917,7 @@ LBL; } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2977,7 +2977,7 @@ LBL; } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3023,7 +3023,7 @@ CAD; } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3083,7 +3083,7 @@ CAD; } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3128,7 +3128,7 @@ func TestScalarMagicConstant(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3172,7 +3172,7 @@ func TestScalarNumber_LNumber(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3216,7 +3216,7 @@ func TestScalarNumber_DNumber(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3260,7 +3260,7 @@ func TestScalarNumber_Float(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3304,7 +3304,7 @@ func TestScalarNumber_BinaryLNumber(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3348,7 +3348,7 @@ func TestScalarNumber_BinaryDNumber(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3392,7 +3392,7 @@ func TestScalarNumber_HLNumber(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3436,7 +3436,7 @@ func TestScalarNumber_HDNumber(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3480,7 +3480,7 @@ func TestScalarString_DoubleQuotedScalarString(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3524,7 +3524,7 @@ func TestScalarString_DoubleQuotedScalarStringWithEscapedVar(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3570,7 +3570,7 @@ func TestScalarString_MultilineDoubleQuotedScalarString(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3614,7 +3614,7 @@ func TestScalarString_SingleQuotedScalarString(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3660,7 +3660,7 @@ func TestScalarString_MultilineSingleQuotedScalarString(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3730,7 +3730,7 @@ func TestStmtAltIf_AltIf(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3843,7 +3843,7 @@ func TestStmtAltIf_AltElseIf(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3933,7 +3933,7 @@ func TestStmtAltIf_AltElse(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4111,7 +4111,7 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4246,7 +4246,7 @@ func TestStmtClassConstList(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4368,7 +4368,7 @@ func TestStmtClassConstList_WithoutModifiers(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4447,7 +4447,7 @@ func TestStmtClassMethod_SimpleClassMethod(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4596,7 +4596,7 @@ func TestStmtClassMethod_PrivateProtectedClassMethod(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4722,7 +4722,7 @@ func TestStmtClassMethod_Php7ClassMethod(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4837,7 +4837,7 @@ func TestStmtClassMethod_AbstractClassMethod(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4964,7 +4964,7 @@ func TestStmtClassMethod_Php7AbstractClassMethod(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5009,7 +5009,7 @@ func TestStmtClass_SimpleClass(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5067,7 +5067,7 @@ func TestStmtClass_AbstractClass(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5158,7 +5158,7 @@ func TestStmtClass_ClassExtends(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5251,7 +5251,7 @@ func TestStmtClass_ClassImplement(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5367,7 +5367,7 @@ func TestStmtClass_ClassImplements(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5522,7 +5522,7 @@ func TestStmtClass_AnonimousClass(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5621,7 +5621,7 @@ func TestStmtConstList(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5687,7 +5687,7 @@ func TestStmtContinue_Empty(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5764,7 +5764,7 @@ func TestStmtContinue_Light(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5841,7 +5841,7 @@ func TestStmtContinue(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5918,7 +5918,7 @@ func TestStmtDeclare(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6028,7 +6028,7 @@ func TestStmtDeclare_Stmts(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6107,7 +6107,7 @@ func TestStmtDeclare_Alt(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6162,7 +6162,7 @@ func TestStmtDo(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6229,7 +6229,7 @@ func TestStmtEcho(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6285,7 +6285,7 @@ func TestStmtEcho_Parenthesis(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6329,7 +6329,7 @@ func TestStmtExpression(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6525,7 +6525,7 @@ func TestStmtFor(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6646,7 +6646,7 @@ func TestStmtFor_Alt(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6732,7 +6732,7 @@ func TestStmtForeach(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6808,7 +6808,7 @@ func TestStmtForeach_Expr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6894,7 +6894,7 @@ func TestStmtForeach_Alt(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7001,7 +7001,7 @@ func TestStmtForeach_WithKey(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7098,7 +7098,7 @@ func TestStmtForeach_ExprWithKey(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7215,7 +7215,7 @@ func TestStmtForeach_WithRef(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7344,7 +7344,7 @@ func TestStmtForeach_WithList(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7390,7 +7390,7 @@ func TestStmtFunction(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7447,7 +7447,7 @@ func TestStmtFunction_Return(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7615,7 +7615,7 @@ func TestStmtFunction_ReturnVar(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7683,7 +7683,7 @@ func TestStmtFunction_Ref(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7752,7 +7752,7 @@ func TestStmtFunction_ReturnType(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7808,7 +7808,7 @@ func TestStmtGlobal(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7969,7 +7969,7 @@ func TestStmtGlobal_Vars(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8034,7 +8034,7 @@ func TestStmtGotoLabel(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8067,7 +8067,7 @@ func TestStmtHaltCompiler(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8132,7 +8132,7 @@ func TestStmtIf(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8241,7 +8241,7 @@ func TestStmtIf_ElseIf(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8327,7 +8327,7 @@ func TestStmtIf_Else(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8499,7 +8499,7 @@ func TestStmtIf_ElseElseIf(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8681,7 +8681,7 @@ func TestStmtIf_ElseIfElseIfElse(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8725,7 +8725,7 @@ func TestStmtInlineHtml(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8770,7 +8770,7 @@ func TestStmtInterface(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8850,7 +8850,7 @@ func TestStmtInterface_Extend(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8953,7 +8953,7 @@ func TestStmtInterface_Extends(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9009,7 +9009,7 @@ func TestStmtNamespace(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9066,7 +9066,7 @@ func TestStmtNamespace_Stmts(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9100,7 +9100,7 @@ func TestStmtNamespace_Anonymous(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9202,7 +9202,7 @@ func TestStmtProperty(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9357,7 +9357,7 @@ func TestStmtProperty_Properties(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9512,7 +9512,7 @@ func TestStmtProperty_Properties2(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9637,7 +9637,7 @@ func TestStmtProperty_PropertyType(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9703,7 +9703,7 @@ func TestStmtStaticVar(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9811,7 +9811,7 @@ func TestStmtStaticVar_Vars(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9919,7 +9919,7 @@ func TestStmtStaticVar_Vars2(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10046,7 +10046,7 @@ func TestStmtSwitch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10173,7 +10173,7 @@ func TestStmtSwitch_Semicolon(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10290,7 +10290,7 @@ func TestStmtSwitch_Alt(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10395,7 +10395,7 @@ func TestStmtSwitch_AltSemicolon(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10449,7 +10449,7 @@ func TestStmtThrow(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10494,7 +10494,7 @@ func TestStmtTrait(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10585,7 +10585,7 @@ func TestStmtTraitUse(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10699,7 +10699,7 @@ func TestStmtTraitUse_Uses(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10813,7 +10813,7 @@ func TestStmtTraitUse_EmptyAdaptations(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10971,7 +10971,7 @@ func TestStmtTraitUse_Modifier(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11140,7 +11140,7 @@ func TestStmtTraitUse_AliasModifier(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11423,7 +11423,7 @@ func TestStmtTraitUse_Adaptions(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11460,7 +11460,7 @@ func TestStmtTry_Try(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11555,7 +11555,7 @@ func TestStmtTry_TryCatch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11673,7 +11673,7 @@ func TestStmtTry_Php7TryCatch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11825,7 +11825,7 @@ func TestStmtTry_TryCatchCatch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11931,7 +11931,7 @@ func TestStmtTry_TryCatchFinally(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12138,7 +12138,7 @@ func TestStmtTry_TryCatchCatchCatch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12194,7 +12194,7 @@ func TestStmtUnset(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12271,7 +12271,7 @@ func TestStmtUnset_Vars(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12348,7 +12348,7 @@ func TestStmtUnset_TrailingComma(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12416,7 +12416,7 @@ func TestStmtUse(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12484,7 +12484,7 @@ func TestStmtUse_FullyQualified(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12563,7 +12563,7 @@ func TestStmtUse_FullyQualifiedAlias(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12664,7 +12664,7 @@ func TestStmtUse_List(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12776,7 +12776,7 @@ func TestStmtUse_ListAlias(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12888,7 +12888,7 @@ func TestStmtUse_ListFunctionType(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13022,7 +13022,7 @@ func TestStmtUse_ListFunctionTypeAliases(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13134,7 +13134,7 @@ func TestStmtUse_ListConstType(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13268,7 +13268,7 @@ func TestStmtUse_ListConstTypeAliases(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13392,7 +13392,7 @@ func TestStmtUse_GroupUse(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13527,7 +13527,7 @@ func TestStmtUse_GroupUseAlias(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13662,7 +13662,7 @@ func TestStmtUse_FunctionGroupUse(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13797,7 +13797,7 @@ func TestStmtUse_ConstGroupUse(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13943,7 +13943,7 @@ func TestStmtUse_MixedGroupUse(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14009,7 +14009,7 @@ func TestStmtBreak_Empty(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14086,7 +14086,7 @@ func TestStmtBreak_Light(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14163,7 +14163,7 @@ func TestStmtBreak(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14240,7 +14240,7 @@ func TestExprArrayDimFetch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14336,7 +14336,7 @@ func TestExprArrayDimFetch_Nested(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14380,7 +14380,7 @@ func TestExprArray(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14446,7 +14446,7 @@ func TestExprArray_Item(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14565,7 +14565,7 @@ func TestExprArray_Items(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14642,7 +14642,7 @@ func TestExprArray_ItemUnpack(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14708,7 +14708,7 @@ func TestExprArrowFunction(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14797,7 +14797,7 @@ func TestExprArrowFunction_ReturnType(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14861,7 +14861,7 @@ func TestExprBitwiseNot(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14925,7 +14925,7 @@ func TestExprBooleanNot(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15002,7 +15002,7 @@ func TestExprClassConstFetch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15067,7 +15067,7 @@ func TestExprClassConstFetch_Static(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15131,7 +15131,7 @@ func TestExprClone_Brackets(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15195,7 +15195,7 @@ func TestExprClone(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15241,7 +15241,7 @@ func TestExprClosure(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15419,7 +15419,7 @@ func TestExprClosure_Use(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15597,7 +15597,7 @@ func TestExprClosure_Use2(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15666,7 +15666,7 @@ func TestExprClosure_ReturnType(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15732,7 +15732,7 @@ func TestExprConstFetch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15798,7 +15798,7 @@ func TestExprConstFetch_Relative(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15864,7 +15864,7 @@ func TestExprConstFetch_FullyQualified(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15928,7 +15928,7 @@ func TestExprEmpty(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15992,7 +15992,7 @@ func TestExprErrorSuppress(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16056,7 +16056,7 @@ func TestExprEval(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16100,7 +16100,7 @@ func TestExprExit(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16144,7 +16144,7 @@ func TestExprExit_Empty(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16209,7 +16209,7 @@ func TestExprExit_Expr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16253,7 +16253,7 @@ func TestExprDie(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16297,7 +16297,7 @@ func TestExprDie_Empty(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16362,7 +16362,7 @@ func TestExprDie_Expr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16438,7 +16438,7 @@ func TestExprFunctionCall(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16514,7 +16514,7 @@ func TestExprFunctionCall_Relative(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16615,7 +16615,7 @@ func TestExprFunctionCall_FullyQualified(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16734,7 +16734,7 @@ func TestExprFunctionCall_Var(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16866,7 +16866,7 @@ func TestExprFunctionCall_ExprArg(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16930,7 +16930,7 @@ func TestExprPostDec(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16994,7 +16994,7 @@ func TestExprPostInc(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17058,7 +17058,7 @@ func TestExprPreDec(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17122,7 +17122,7 @@ func TestExprPreInc(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17186,7 +17186,7 @@ func TestExprInclude(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17250,7 +17250,7 @@ func TestExprInclude_Once(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17314,7 +17314,7 @@ func TestExprRequire(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17378,7 +17378,7 @@ func TestExprRequire_Once(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17465,7 +17465,7 @@ func TestExprInstanceOf(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17552,7 +17552,7 @@ func TestExprInstanceOf_Relative(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17639,7 +17639,7 @@ func TestExprInstanceOf_FullyQualified(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17705,7 +17705,7 @@ func TestExprIsset(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17792,7 +17792,7 @@ func TestExprIsset_Variables(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17867,7 +17867,7 @@ func TestExprList_Empty(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17974,7 +17974,7 @@ func TestExprList(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18091,7 +18091,7 @@ func TestExprList_ArrayIndex(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18220,7 +18220,7 @@ func TestExprList_List(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18328,7 +18328,7 @@ func TestExprList_EmptyItem(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18438,7 +18438,7 @@ func TestExprList_EmptyItems(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18523,7 +18523,7 @@ func TestExprMethodCall(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18589,7 +18589,7 @@ func TestExprNew(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18665,7 +18665,7 @@ func TestExprNew_Relative(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18741,7 +18741,7 @@ func TestExprNew_FullyQualified(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18873,7 +18873,7 @@ func TestExprNew_Anonymous(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18937,7 +18937,7 @@ func TestExprPrint(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19012,7 +19012,7 @@ func TestExprPropertyFetch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19130,7 +19130,7 @@ func TestExprReference_ForeachWithRef(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19207,7 +19207,7 @@ func TestExprShellExec(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19251,7 +19251,7 @@ func TestExprShortArray(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19317,7 +19317,7 @@ func TestExprShortArray_Item(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19436,7 +19436,7 @@ func TestExprShortArray_Items(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19543,7 +19543,7 @@ func TestExprShortList(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19660,7 +19660,7 @@ func TestExprShortList_ArrayIndex(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19789,7 +19789,7 @@ func TestExprShortList_List(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19876,7 +19876,7 @@ func TestExprStaticCall(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19963,7 +19963,7 @@ func TestExprStaticCall_Relative(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20050,7 +20050,7 @@ func TestExprStaticCall_FullyQualified(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20147,7 +20147,7 @@ func TestExprStaticCall_Var(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20242,7 +20242,7 @@ func TestExprStaticCall_VarVar(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20329,7 +20329,7 @@ func TestExprStaticPropertyFetch(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20416,7 +20416,7 @@ func TestExprStaticPropertyFetch_Relative(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20503,7 +20503,7 @@ func TestExprStaticPropertyFetch_FullyQualified(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20609,7 +20609,7 @@ func TestExprTernary(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20694,7 +20694,7 @@ func TestExprTernary_Simple(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20852,7 +20852,7 @@ func TestExprTernary_NestedTrue(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21010,7 +21010,7 @@ func TestExprTernary_NestedCond(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21074,7 +21074,7 @@ func TestExprUnaryMinus(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21138,7 +21138,7 @@ func TestExprUnaryPlus(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21192,7 +21192,7 @@ func TestExprVariable(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21256,7 +21256,7 @@ func TestExprVariable_Variable(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21299,7 +21299,7 @@ func TestExprYield(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21363,7 +21363,7 @@ func TestExprYield_Val(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21448,7 +21448,7 @@ func TestExprYield_KeyVal(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21502,7 +21502,7 @@ func TestExprYield_Expr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21577,7 +21577,7 @@ func TestExprYield_KeyExpr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21641,7 +21641,7 @@ func TestExprYieldFrom(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21728,7 +21728,7 @@ func TestExprAssign_Assign(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21813,7 +21813,7 @@ func TestExprAssign_Reference(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21910,7 +21910,7 @@ func TestExprAssign_ReferenceNew(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22052,7 +22052,7 @@ func TestExprAssign_ReferenceArgs(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22137,7 +22137,7 @@ func TestExprAssign_BitwiseAnd(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22222,7 +22222,7 @@ func TestExprAssign_BitwiseOr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22307,7 +22307,7 @@ func TestExprAssign_BitwiseXor(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22392,7 +22392,7 @@ func TestExprAssign_Concat(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22477,7 +22477,7 @@ func TestExprAssign_Div(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22562,7 +22562,7 @@ func TestExprAssign_Minus(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22647,7 +22647,7 @@ func TestExprAssign_Mod(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22732,7 +22732,7 @@ func TestExprAssign_Mul(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22817,7 +22817,7 @@ func TestExprAssign_Plus(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22902,7 +22902,7 @@ func TestExprAssign_Pow(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22987,7 +22987,7 @@ func TestExprAssign_ShiftLeft(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23072,7 +23072,7 @@ func TestExprAssign_ShiftRight(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23157,7 +23157,7 @@ func TestExprAssign_Coalesce(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23244,7 +23244,7 @@ func TestExprBinary_BitwiseAnd(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23329,7 +23329,7 @@ func TestExprBinary_BitwiseOr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23414,7 +23414,7 @@ func TestExprBinary_BitwiseXor(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23499,7 +23499,7 @@ func TestExprBinary_BooleanAnd(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23584,7 +23584,7 @@ func TestExprBinary_BooleanOr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23669,7 +23669,7 @@ func TestExprBinary_Coalesce(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23754,7 +23754,7 @@ func TestExprBinary_Concat(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23839,7 +23839,7 @@ func TestExprBinary_Div(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23924,7 +23924,7 @@ func TestExprBinary_Equal(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24009,7 +24009,7 @@ func TestExprBinary_GreaterOrEqual(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24094,7 +24094,7 @@ func TestExprBinary_Greater(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24179,7 +24179,7 @@ func TestExprBinary_Identical(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24264,7 +24264,7 @@ func TestExprBinary_LogicalAnd(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24349,7 +24349,7 @@ func TestExprBinary_LogicalOr(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24434,7 +24434,7 @@ func TestExprBinary_LogicalXor(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24519,7 +24519,7 @@ func TestExprBinary_Minus(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24604,7 +24604,7 @@ func TestExprBinary_Mod(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24689,7 +24689,7 @@ func TestExprBinary_Mul(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24774,7 +24774,7 @@ func TestExprBinary_NotEqual(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24859,7 +24859,7 @@ func TestExprBinary_NotIdentical(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24944,7 +24944,7 @@ func TestExprBinary_Plus(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25029,7 +25029,7 @@ func TestExprBinary_Pow(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25114,7 +25114,7 @@ func TestExprBinary_ShiftLeft(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25199,7 +25199,7 @@ func TestExprBinary_ShiftRight(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25284,7 +25284,7 @@ func TestExprBinary_SmallerOrEqual(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25369,7 +25369,7 @@ func TestExprBinary_Smaller(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25454,7 +25454,7 @@ func TestExprBinary_Spaceship(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25520,7 +25520,7 @@ func TestExprCast_Array(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25584,7 +25584,7 @@ func TestExprCast_Bool(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25648,7 +25648,7 @@ func TestExprCast_BoolShort(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25712,7 +25712,7 @@ func TestExprCast_Double(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25776,7 +25776,7 @@ func TestExprCast_CastFloat(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25840,7 +25840,7 @@ func TestExprCast_Int(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25904,7 +25904,7 @@ func TestExprCast_IntShort(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25968,7 +25968,7 @@ func TestExprCast_Object(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -26032,7 +26032,7 @@ func TestExprCast_String(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -26096,7 +26096,7 @@ func TestExprCast_BinaryString(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -26160,7 +26160,7 @@ func TestExprCast_Unset(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) diff --git a/internal/php7/php7.go b/internal/php7/php7.go index 90532bc886fed31f3bdaca20230dd97786964247..b80599360aa14fb46d461c41d34b92bba19b3f3e 100644 GIT binary patch delta 21858 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 tIvFxi97Io5S++x+EX!7mZ*AYo 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 0 { yylex.(*Parser).MoveFreeFloating($1[0], $$) - yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Tokens) } else { - yylex.(*Parser).setFreeFloating($$, token.Start, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $2.Tokens) } - yylex.(*Parser).setFreeFloating($$, token.ConstList, $4.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4)) + yylex.(*Parser).setFreeFloating($$, token.ConstList, $4.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2535,7 +2532,7 @@ class_statement: $$.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2555,20 +2552,20 @@ class_statement: // save comments if len($1) > 0 { yylex.(*Parser).MoveFreeFloating($1[0], $$) - yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Tokens) } else { - yylex.(*Parser).setFreeFloating($$, token.Start, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $2.Tokens) } if $3 == nil { - yylex.(*Parser).setFreeFloating($$, token.Function, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Function, $4.Tokens) } else { - yylex.(*Parser).setFreeFloating($$, token.Function, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Ampersand, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Function, $3.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Ampersand, $4.Tokens) } - yylex.(*Parser).setFreeFloating($$, token.Name, $6.Hidden) - yylex.(*Parser).setFreeFloating($$, token.ParameterList, $8.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $6.Tokens) + yylex.(*Parser).setFreeFloating($$, token.ParameterList, $8.Tokens) if $9 != nil { - yylex.(*Parser).setFreeFloating($$, token.Params, $9.GetNode().Tokens[token.Colon]); delete($9.GetNode().Tokens, token.Colon) + yylex.(*Parser).setFreeFloatingTokens($$, token.Params, $9.GetNode().Tokens[token.Colon]); delete($9.GetNode().Tokens, token.Colon) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -2587,7 +2584,7 @@ name_list: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2601,8 +2598,8 @@ trait_adaptations: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -2614,8 +2611,8 @@ trait_adaptations: $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.AdaptationList, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.AdaptationList, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2626,8 +2623,8 @@ trait_adaptations: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.AdaptationList, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.AdaptationList, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2654,8 +2651,8 @@ trait_adaptation: $$ = $1; // save comments - yylex.(*Parser).setFreeFloating($$, token.NameList, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2)) + yylex.(*Parser).setFreeFloating($$, token.NameList, $2.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2664,8 +2661,8 @@ trait_adaptation: $$ = $1; // save comments - yylex.(*Parser).setFreeFloating($$, token.Alias, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2)) + yylex.(*Parser).setFreeFloating($$, token.Alias, $2.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2681,7 +2678,7 @@ trait_precedence: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2699,8 +2696,8 @@ trait_alias: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Hidden) - yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Tokens) + yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2715,8 +2712,8 @@ trait_alias: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Hidden) - yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Tokens) + yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2731,8 +2728,8 @@ trait_alias: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Hidden) - yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Tokens) + yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2745,7 +2742,7 @@ trait_alias: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2762,7 +2759,7 @@ trait_method_reference: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2786,15 +2783,15 @@ absolute_trait_method_reference: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) - yylex.(*Parser).setFreeFloating(target, token.Start, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) + yylex.(*Parser).setFreeFloating(target, token.Start, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } ; method_body: - ';' /* abstract method */ + ';' /* abstract method */ { $$ = &ast.StmtNop{ast.Node{}, } @@ -2802,8 +2799,8 @@ method_body: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.SemiColon, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2815,8 +2812,8 @@ method_body: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2838,7 +2835,7 @@ variable_modifiers: modifier.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating(modifier, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating(modifier, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2883,7 +2880,7 @@ member_modifier: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2895,7 +2892,7 @@ member_modifier: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2907,7 +2904,7 @@ member_modifier: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2919,7 +2916,7 @@ member_modifier: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2931,7 +2928,7 @@ member_modifier: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2943,7 +2940,7 @@ member_modifier: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2955,7 +2952,7 @@ property_list: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2980,7 +2977,7 @@ property: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2996,8 +2993,8 @@ property: $$.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3009,7 +3006,7 @@ class_const_list: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3032,8 +3029,8 @@ class_const_decl: $$.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3050,8 +3047,8 @@ const_decl: $$.GetNode().Position = position.NewTokenNodePosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3063,7 +3060,7 @@ echo_expr_list: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3105,7 +3102,7 @@ non_empty_for_exprs: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3130,9 +3127,9 @@ anonymous_class: $$.GetNode().Position = position.NewTokensPosition($1, $8) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Name, $6.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $8.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Name, $6.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $8.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3150,7 +3147,7 @@ new_expr: } // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3162,7 +3159,7 @@ new_expr: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3179,10 +3176,10 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $6) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(listNode, token.List, $2.Hidden) - yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $4.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Var, $5.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating(listNode, token.List, $2.Tokens) + yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $4.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Var, $5.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3196,9 +3193,9 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $5) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(shortList, token.ArrayPairList, $3.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Var, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating(shortList, token.ArrayPairList, $3.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Var, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3211,7 +3208,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3224,8 +3221,8 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Equal, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Equal, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3237,7 +3234,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3250,7 +3247,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3263,7 +3260,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3276,7 +3273,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3289,7 +3286,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3302,7 +3299,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3315,7 +3312,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3328,7 +3325,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3341,7 +3338,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3354,7 +3351,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3367,7 +3364,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3380,7 +3377,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3393,7 +3390,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3406,7 +3403,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3419,7 +3416,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3431,7 +3428,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3444,7 +3441,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3456,7 +3453,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3469,7 +3466,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3482,7 +3479,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3495,7 +3492,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3508,7 +3505,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3521,7 +3518,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3534,7 +3531,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3547,7 +3544,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3560,7 +3557,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3573,7 +3570,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3586,7 +3583,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3599,7 +3596,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3612,7 +3609,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3625,7 +3622,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3638,7 +3635,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3651,7 +3648,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3664,7 +3661,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3677,7 +3674,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3689,7 +3686,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3701,7 +3698,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3713,7 +3710,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3725,7 +3722,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3738,7 +3735,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3751,7 +3748,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3764,7 +3761,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3777,8 +3774,8 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Equal, yylex.(*Parser).GetFreeFloatingToken($2)) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) + yylex.(*Parser).setToken($$, token.Equal, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3791,7 +3788,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3804,7 +3801,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3817,7 +3814,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3830,7 +3827,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3843,7 +3840,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3856,7 +3853,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3865,8 +3862,8 @@ expr_without_variable: $$ = $2; // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...)) - yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Start, append($1.Tokens, $$.GetNode().Tokens[token.Start]...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($$.GetNode().Tokens[token.End], $3.Tokens...)) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3885,8 +3882,8 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.True, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.True, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3899,8 +3896,8 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.True, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.True, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3913,7 +3910,7 @@ expr_without_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3931,8 +3928,8 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.Cast, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3944,8 +3941,8 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.Cast, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3957,8 +3954,8 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.Cast, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3970,8 +3967,8 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.Cast, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3983,8 +3980,8 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.Cast, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -3996,8 +3993,8 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.Cast, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4009,8 +4006,8 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setToken($$, token.Cast, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4037,7 +4034,7 @@ expr_without_variable: } // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4049,7 +4046,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4067,7 +4064,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4079,7 +4076,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4091,7 +4088,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4103,7 +4100,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4115,8 +4112,8 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4128,7 +4125,7 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4153,8 +4150,8 @@ expr_without_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Static, $$.GetNode().Tokens[token.Start]); delete($$.GetNode().Tokens, token.Start) - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden); + yylex.(*Parser).setFreeFloatingTokens($$, token.Static, $$.GetNode().Tokens[token.Start]); delete($$.GetNode().Tokens, token.Start) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens); yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4167,28 +4164,28 @@ inline_function: // save position $$.GetNode().Position = position.NewTokensPosition($1, $11) - + // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) if $2 == nil { - yylex.(*Parser).setFreeFloating($$, token.Function, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Function, $4.Tokens) } else { - yylex.(*Parser).setFreeFloating($$, token.Function, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Ampersand, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Function, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Ampersand, $4.Tokens) } - yylex.(*Parser).setFreeFloating($$, token.ParameterList, $6.Hidden) + yylex.(*Parser).setFreeFloating($$, token.ParameterList, $6.Tokens) if $8 != nil { - yylex.(*Parser).setFreeFloating($$, token.LexicalVars, $8.GetNode().Tokens[token.Colon]); delete($8.GetNode().Tokens, token.Colon) + yylex.(*Parser).setFreeFloatingTokens($$, token.LexicalVars, $8.GetNode().Tokens[token.Colon]); delete($8.GetNode().Tokens, token.Colon) } - yylex.(*Parser).setFreeFloating($$, token.ReturnType, $9.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Stmts, $11.Hidden) + yylex.(*Parser).setFreeFloating($$, token.ReturnType, $9.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Stmts, $11.Tokens) // normalize if $8 == nil { - yylex.(*Parser).setFreeFloating($$, token.LexicalVars, $$.GetNode().Tokens[token.ReturnType]); delete($$.GetNode().Tokens, token.ReturnType) + yylex.(*Parser).setFreeFloatingTokens($$, token.LexicalVars, $$.GetNode().Tokens[token.ReturnType]); delete($$.GetNode().Tokens, token.ReturnType) } if $7 == nil { - yylex.(*Parser).setFreeFloating($$, token.Params, $$.GetNode().Tokens[token.LexicalVarList]); delete($$.GetNode().Tokens, token.LexicalVarList) + yylex.(*Parser).setFreeFloatingTokens($$, token.Params, $$.GetNode().Tokens[token.LexicalVarList]); delete($$.GetNode().Tokens, token.LexicalVarList) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -4199,24 +4196,24 @@ inline_function: // save position $$.GetNode().Position = position.NewTokenNodePosition($1, $9) - + // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) if $2 == nil { - yylex.(*Parser).setFreeFloating($$, token.Function, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Function, $3.Tokens) } else { - yylex.(*Parser).setFreeFloating($$, token.Function, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Function, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Tokens) }; - yylex.(*Parser).setFreeFloating($$, token.ParameterList, $5.Hidden) + yylex.(*Parser).setFreeFloating($$, token.ParameterList, $5.Tokens) if $6 != nil { - yylex.(*Parser).setFreeFloating($$, token.Params, $6.GetNode().Tokens[token.Colon]); delete($6.GetNode().Tokens, token.Colon) + yylex.(*Parser).setFreeFloatingTokens($$, token.Params, $6.GetNode().Tokens[token.Colon]); delete($6.GetNode().Tokens, token.Colon) }; - yylex.(*Parser).setFreeFloating($$, token.ReturnType, $8.Hidden) + yylex.(*Parser).setFreeFloating($$, token.ReturnType, $8.Tokens) // normalize if $6 == nil { - yylex.(*Parser).setFreeFloating($$, token.Params, $$.GetNode().Tokens[token.ReturnType]); delete($$.GetNode().Tokens, token.ReturnType) + yylex.(*Parser).setFreeFloatingTokens($$, token.Params, $$.GetNode().Tokens[token.ReturnType]); delete($$.GetNode().Tokens, token.ReturnType) }; yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -4253,9 +4250,9 @@ lexical_vars: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Use, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.LexicalVarList, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Use, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.LexicalVarList, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4267,7 +4264,7 @@ lexical_var_list: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4290,7 +4287,7 @@ lexical_var: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4306,8 +4303,8 @@ lexical_var: $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(variable, token.Start, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating(variable, token.Start, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4335,7 +4332,7 @@ function_call: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4348,7 +4345,7 @@ function_call: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4375,7 +4372,7 @@ class_name: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4417,8 +4414,8 @@ exit_expr: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Exit, append($1.Hidden, yylex.(*Parser).GetFreeFloatingToken($1)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Exit, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4473,9 +4470,9 @@ dereferencable_scalar: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Array, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Array, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4487,8 +4484,8 @@ dereferencable_scalar: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4500,7 +4497,7 @@ dereferencable_scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4515,7 +4512,7 @@ scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4527,7 +4524,7 @@ scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4539,7 +4536,7 @@ scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4551,7 +4548,7 @@ scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4563,7 +4560,7 @@ scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4575,7 +4572,7 @@ scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4587,7 +4584,7 @@ scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4599,7 +4596,7 @@ scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4611,7 +4608,7 @@ scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4623,7 +4620,7 @@ scalar: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4637,7 +4634,7 @@ scalar: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4649,7 +4646,7 @@ scalar: $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4661,7 +4658,7 @@ scalar: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4673,7 +4670,7 @@ scalar: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4715,8 +4712,8 @@ constant: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) - yylex.(*Parser).setFreeFloating(target, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) + yylex.(*Parser).setFreeFloating(target, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4731,8 +4728,8 @@ constant: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) - yylex.(*Parser).setFreeFloating(target, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) + yylex.(*Parser).setFreeFloating(target, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4789,8 +4786,8 @@ dereferencable: $$ = $2; // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...)) - yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Start, append($1.Tokens, $$.GetNode().Tokens[token.Start]...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($$.GetNode().Tokens[token.End], $3.Tokens...)) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4814,8 +4811,8 @@ callable_expr: $$ = $2; // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...)) - yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Start, append($1.Tokens, $$.GetNode().Tokens[token.Start]...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($$.GetNode().Tokens[token.End], $3.Tokens...)) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4843,8 +4840,8 @@ callable_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4857,8 +4854,8 @@ callable_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4871,8 +4868,8 @@ callable_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4885,7 +4882,7 @@ callable_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4919,7 +4916,7 @@ variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4936,7 +4933,7 @@ simple_variable: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4948,9 +4945,9 @@ simple_variable: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($3, token.Start, append($2.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($2), $3.GetNode().Tokens[token.Start]...)...)) - yylex.(*Parser).setFreeFloating($3, token.End, append($3.GetNode().Tokens[token.End], append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)...)) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens($3, token.Start, append($2.Tokens, $3.GetNode().Tokens[token.Start]...)) + yylex.(*Parser).setFreeFloatingTokens($3, token.End, append($3.GetNode().Tokens[token.End], $4.Tokens...)) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4962,7 +4959,7 @@ simple_variable: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4978,7 +4975,7 @@ static_member: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4991,7 +4988,7 @@ static_member: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5013,8 +5010,8 @@ new_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5027,8 +5024,8 @@ new_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5041,7 +5038,7 @@ new_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5054,7 +5051,7 @@ new_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5067,7 +5064,7 @@ new_variable: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5082,7 +5079,7 @@ member_name: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5091,8 +5088,8 @@ member_name: $$ = $2; // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...)) - yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Start, append($1.Tokens, $$.GetNode().Tokens[token.Start]...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($$.GetNode().Tokens[token.End], $3.Tokens...)) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5113,17 +5110,17 @@ property_name: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } | '{' expr '}' { $$ = $2; - + // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...)) - yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Start, append($1.Tokens, $$.GetNode().Tokens[token.Start]...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($$.GetNode().Tokens[token.End], $3.Tokens...)) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5169,7 +5166,7 @@ non_empty_array_pair_list: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5195,7 +5192,7 @@ array_pair: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5222,8 +5219,8 @@ array_pair: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) - yylex.(*Parser).setFreeFloating(reference, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) + yylex.(*Parser).setFreeFloating(reference, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5237,7 +5234,7 @@ array_pair: reference.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5249,7 +5246,7 @@ array_pair: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5265,10 +5262,10 @@ array_pair: // save comments yylex.(*Parser).MoveFreeFloating($1, $$) - yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden) - yylex.(*Parser).setFreeFloating(listNode, token.Start, $3.Hidden) - yylex.(*Parser).setFreeFloating(listNode, token.List, $4.Hidden) - yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $6.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens) + yylex.(*Parser).setFreeFloating(listNode, token.Start, $3.Tokens) + yylex.(*Parser).setFreeFloating(listNode, token.List, $4.Tokens) + yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $6.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5281,11 +5278,11 @@ array_pair: // save position listNode.GetNode().Position = position.NewTokensPosition($1, $4) $$.GetNode().Position = position.NewTokensPosition($1, $4) - + // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating(listNode, token.List, $2.Hidden) - yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating(listNode, token.List, $2.Tokens) + yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5307,7 +5304,7 @@ encaps_list: encapsed.GetNode().Position = position.NewTokenPosition($2) // save comments - yylex.(*Parser).setFreeFloating(encapsed, token.Start, $2.Hidden) + yylex.(*Parser).setFreeFloating(encapsed, token.Start, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5326,7 +5323,7 @@ encaps_list: encapsed.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating(encapsed, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating(encapsed, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5343,7 +5340,7 @@ encaps_var: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5359,8 +5356,8 @@ encaps_var: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5378,8 +5375,8 @@ encaps_var: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden) - yylex.(*Parser).setFreeFloating(fetch, token.Start, $3.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens) + yylex.(*Parser).setFreeFloating(fetch, token.Start, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5393,8 +5390,8 @@ encaps_var: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1)) - yylex.(*Parser).setFreeFloating($$, token.End, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)) + yylex.(*Parser).setToken($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5410,8 +5407,8 @@ encaps_var: $$.GetNode().Position = position.NewTokensPosition($1, $3) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1)) - yylex.(*Parser).setFreeFloating($$, token.End, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)) + yylex.(*Parser).setToken($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5427,10 +5424,10 @@ encaps_var: $$.GetNode().Position = position.NewTokensPosition($1, $6) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1)) - yylex.(*Parser).setFreeFloating($$, token.Var, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)) - yylex.(*Parser).setFreeFloating($$, token.Expr, append($5.Hidden, yylex.(*Parser).GetFreeFloatingToken($5)...)) - yylex.(*Parser).setFreeFloating($$, token.End, append($6.Hidden, yylex.(*Parser).GetFreeFloatingToken($6)...)) + yylex.(*Parser).setToken($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Var, $3.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.Expr, $5.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.End, $6.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5439,8 +5436,8 @@ encaps_var: $$ = $2; // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1)) - yylex.(*Parser).setFreeFloating($$, token.End, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)) + yylex.(*Parser).setToken($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5455,7 +5452,7 @@ encaps_var_offset: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5472,7 +5469,7 @@ encaps_var_offset: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5498,7 +5495,7 @@ encaps_var_offset: $$.GetNode().Position = position.NewTokensPosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5512,7 +5509,7 @@ encaps_var_offset: $$.GetNode().Position = position.NewTokenPosition($1) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5527,12 +5524,12 @@ internal_functions_in_yacc: $$.GetNode().Position = position.NewTokensPosition($1, $5) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Isset, $2.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Isset, $2.Tokens) if $4 == nil { - yylex.(*Parser).setFreeFloating($$, token.VarList, $5.Hidden) + yylex.(*Parser).setFreeFloating($$, token.VarList, $5.Tokens) } else { - yylex.(*Parser).setFreeFloating($$, token.VarList, append($4.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($4), $5.Hidden...)...)) + yylex.(*Parser).setFreeFloating($$, token.VarList, append($4.Tokens, $5.Tokens...)) } yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) @@ -5545,9 +5542,9 @@ internal_functions_in_yacc: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Empty, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Empty, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5559,7 +5556,7 @@ internal_functions_in_yacc: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5571,7 +5568,7 @@ internal_functions_in_yacc: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5583,9 +5580,9 @@ internal_functions_in_yacc: $$.GetNode().Position = position.NewTokensPosition($1, $4) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Eval, $2.Hidden) - yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Eval, $2.Tokens) + yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5597,7 +5594,7 @@ internal_functions_in_yacc: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5609,7 +5606,7 @@ internal_functions_in_yacc: $$.GetNode().Position = position.NewTokenNodePosition($1, $2) // save comments - yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden) + yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -5627,7 +5624,7 @@ isset_variables: $$ = append($1, $3) // save comments - yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden) + yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } diff --git a/internal/php7/php7_bench_test.go b/internal/php7/php7_bench_test.go index 61045b0..558c54b 100644 --- a/internal/php7/php7_bench_test.go +++ b/internal/php7/php7_bench_test.go @@ -383,7 +383,7 @@ CAD; for n := 0; n < b.N; n++ { lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() } } diff --git a/internal/php7/php7_test.go b/internal/php7/php7_test.go index 169e62c..6d214a7 100644 --- a/internal/php7/php7_test.go +++ b/internal/php7/php7_test.go @@ -19635,7 +19635,7 @@ func TestPhp7(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19773,7 +19773,7 @@ func TestPhp5Strings(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20000,7 +20000,7 @@ CAD; } lexer := scanner.NewLexer([]byte(src), "7.4", false, nil) - php7parser := php7.NewParser(lexer, false, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20026,7 +20026,7 @@ func TestPhp7ControlCharsErrors(t *testing.T) { } lexer := scanner.NewLexer([]byte(src), "7.4", false, errorHandlerFunc) - php7parser := php7.NewParser(lexer, false, errorHandlerFunc) + php7parser := php7.NewParser(lexer, errorHandlerFunc) php7parser.Parse() assert.DeepEqual(t, expected, parserErrors) } diff --git a/internal/scanner/lexer.go b/internal/scanner/lexer.go index e20e701..7456961 100644 --- a/internal/scanner/lexer.go +++ b/internal/scanner/lexer.go @@ -11,10 +11,10 @@ import ( ) type Lexer struct { - data []byte - phpVersion string - withHiddenTokens bool - errHandlerFunc func(*errors.Error) + data []byte + phpVersion string + withTokens bool + errHandlerFunc func(*errors.Error) p, pe, cs int ts, te, act int @@ -23,16 +23,15 @@ type Lexer struct { heredocLabel []byte tokenPool *TokenPool - hiddenTokens []token.Token newLines NewLines } -func NewLexer(data []byte, phpVersion string, withHiddenTokens bool, errHandlerFunc func(*errors.Error)) *Lexer { +func NewLexer(data []byte, phpVersion string, withTokens bool, errHandlerFunc func(*errors.Error)) *Lexer { lex := &Lexer{ - data: data, - phpVersion: phpVersion, - withHiddenTokens: withHiddenTokens, - errHandlerFunc: errHandlerFunc, + data: data, + phpVersion: phpVersion, + withTokens: withTokens, + errHandlerFunc: errHandlerFunc, pe: len(data), stack: make([]int, 0), @@ -57,12 +56,12 @@ func (lex *Lexer) setTokenPosition(token *Token) { token.Position.EndPos = lex.te } -func (lex *Lexer) addHiddenToken(id TokenID, ps, pe int) { - if !lex.withHiddenTokens { +func (lex *Lexer) addHiddenToken(t *Token, id TokenID, ps, pe int) { + if !lex.withTokens { return } - lex.hiddenTokens = append(lex.hiddenTokens, token.Token{ + t.Tokens = append(t.Tokens, token.Token{ ID: token.ID(id), Value: lex.data[ps:pe], }) @@ -236,9 +235,9 @@ func (lex *Lexer) error(msg string) { } func isValidVarNameStart(r byte) bool { - return (r >= 'A' && r <= 'Z') || (r >= 'a' && r <= 'z') || r == '_' || (r >= 0x80 && r <= 0xff) + return (r >= 'A' && r <= 'Z') || (r >= 'a' && r <= 'z') || r == '_' || r >= 0x80 } func isValidVarName(r byte) bool { - return (r >= 'A' && r <= 'Z') || (r >= 'a' && r <= 'z') || (r >= '0' && r <= '9') || r == '_' || (r >= 0x80 && r <= 0xff) + return (r >= 'A' && r <= 'Z') || (r >= 'a' && r <= 'z') || (r >= '0' && r <= '9') || r == '_' || r >= 0x80 } diff --git a/internal/scanner/scanner.go b/internal/scanner/scanner.go index c4b5ae58209aa13baa797cba467c654341cf4d94..86a2eb1c9f693603f775dccdf6361a5ae7439282 100644 GIT binary patch delta 6077 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 delta 5577 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 Jv>me?{|ob)YTN(- diff --git a/internal/scanner/scanner.rl b/internal/scanner/scanner.rl index 0dc87ad..a45c164 100644 --- a/internal/scanner/scanner.rl +++ b/internal/scanner/scanner.rl @@ -19,12 +19,11 @@ func initLexer(lex *Lexer) { } func (lex *Lexer) Lex() *Token { - lex.hiddenTokens = nil eof := lex.pe var tok TokenID token := lex.tokenPool.Get() - token.Hidden = nil + token.Tokens = token.Tokens[:0] token.Value = lex.data[0:0] lblStart := 0 @@ -125,7 +124,7 @@ func (lex *Lexer) Lex() *Token { main := |* "#!" any* :>> newline => { - lex.addHiddenToken(T_COMMENT, lex.ts, lex.te) + lex.addHiddenToken(token, T_COMMENT, lex.ts, lex.te) }; any => { fnext html; @@ -141,12 +140,12 @@ func (lex *Lexer) Lex() *Token { fbreak; }; ' { - lex.addHiddenToken(T_OPEN_TAG, lex.ts, lex.te) + lex.addHiddenToken(token, T_OPEN_TAG, lex.ts, lex.te) fnext php; }; ' { lex.ungetCnt(lex.te - lex.ts - 5) - lex.addHiddenToken(T_OPEN_TAG, lex.ts, lex.ts+5) + lex.addHiddenToken(token, T_OPEN_TAG, lex.ts, lex.ts+5) fnext php; }; ' { @@ -158,7 +157,7 @@ func (lex *Lexer) Lex() *Token { *|; php := |* - whitespace_line* => {lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te)}; + whitespace_line* => {lex.addHiddenToken(token, T_WHITESPACE, lex.ts, lex.te)}; '?>' newline? => {lex.setTokenPosition(token); tok = TokenID(int(';')); fnext html; fbreak;}; ';' whitespace_line* '?>' newline? => {lex.setTokenPosition(token); tok = TokenID(int(';')); fnext html; fbreak;}; @@ -318,7 +317,7 @@ func (lex *Lexer) Lex() *Token { ('#' | '//') any_line* when is_not_comment_end => { lex.ungetStr("?>") - lex.addHiddenToken(T_COMMENT, lex.ts, lex.te) + lex.addHiddenToken(token, T_COMMENT, lex.ts, lex.te) }; '/*' any_line* :>> '*/' { isDocComment := false; @@ -327,9 +326,9 @@ func (lex *Lexer) Lex() *Token { } if isDocComment { - lex.addHiddenToken(T_DOC_COMMENT, lex.ts, lex.te) + lex.addHiddenToken(token, T_DOC_COMMENT, lex.ts, lex.te) } else { - lex.addHiddenToken(T_COMMENT, lex.ts, lex.te) + lex.addHiddenToken(token, T_COMMENT, lex.ts, lex.te) } }; @@ -378,7 +377,7 @@ func (lex *Lexer) Lex() *Token { *|; property := |* - whitespace_line* => {lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te)}; + whitespace_line* => {lex.addHiddenToken(token, T_WHITESPACE, lex.ts, lex.te)}; "->" => {lex.setTokenPosition(token); tok = T_OBJECT_OPERATOR; fbreak;}; varname => {lex.setTokenPosition(token); tok = T_STRING; fnext php; fbreak;}; any => {lex.ungetCnt(1); fgoto php;}; @@ -474,33 +473,33 @@ func (lex *Lexer) Lex() *Token { *|; halt_compiller_open_parenthesis := |* - whitespace_line* => {lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te)}; + whitespace_line* => {lex.addHiddenToken(token, T_WHITESPACE, lex.ts, lex.te)}; "(" => {lex.setTokenPosition(token); tok = TokenID(int('(')); fnext halt_compiller_close_parenthesis; fbreak;}; any => {lex.ungetCnt(1); fnext php;}; *|; halt_compiller_close_parenthesis := |* - whitespace_line* => {lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te)}; + whitespace_line* => {lex.addHiddenToken(token, T_WHITESPACE, lex.ts, lex.te)}; ")" => {lex.setTokenPosition(token); tok = TokenID(int(')')); fnext halt_compiller_close_semicolon; fbreak;}; any => {lex.ungetCnt(1); fnext php;}; *|; halt_compiller_close_semicolon := |* - whitespace_line* => {lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te)}; + whitespace_line* => {lex.addHiddenToken(token, T_WHITESPACE, lex.ts, lex.te)}; ";" => {lex.setTokenPosition(token); tok = TokenID(int(';')); fnext halt_compiller_end; fbreak;}; any => {lex.ungetCnt(1); fnext php;}; *|; halt_compiller_end := |* - any_line* => { lex.addHiddenToken(T_HALT_COMPILER, lex.ts, lex.te); }; + any_line* => { lex.addHiddenToken(token, T_HALT_COMPILER, lex.ts, lex.te); }; *|; write exec; }%% - token.Hidden = lex.hiddenTokens token.Value = lex.data[lex.ts:lex.te] token.ID = tok + lex.addHiddenToken(token, tok, lex.ts, lex.te); return token } \ No newline at end of file diff --git a/internal/scanner/scanner_test.go b/internal/scanner/scanner_test.go index 7399c08..c05a527 100644 --- a/internal/scanner/scanner_test.go +++ b/internal/scanner/scanner_test.go @@ -354,7 +354,7 @@ func TestTokens(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true actual := []string{} for { @@ -382,13 +382,14 @@ func TestShebang(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true actual := []string{} tkn := lexer.Lex() assert.Equal(t, tkn.ID, T_DNUMBER) - for _, tt := range tkn.Hidden { + l := len(tkn.Tokens) + for _, tt := range tkn.Tokens[:l-1] { actual = append(actual, string(tt.Value)) } @@ -402,11 +403,11 @@ func TestShebangHtml(t *testing.T) { ` lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true tkn := lexer.Lex() assert.Equal(t, tkn.ID, T_INLINE_HTML) - assert.Equal(t, string(tkn.Hidden[0].Value), "#!/usr/bin/env php\n") + assert.Equal(t, string(tkn.Tokens[0].Value), "#!/usr/bin/env php\n") tkn = lexer.Lex() assert.Equal(t, tkn.ID, T_DNUMBER) @@ -452,7 +453,7 @@ func TestNumberTokens(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true actual := []string{} for { @@ -509,7 +510,7 @@ func TestConstantStrings(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true actual := []string{} for { @@ -643,7 +644,7 @@ func TestTeplateStringTokens(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true actual := []string{} for { @@ -728,7 +729,7 @@ func TestBackquoteStringTokens(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true actual := []string{} for { @@ -822,7 +823,7 @@ CAT; } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true actual := []string{} for { @@ -895,7 +896,7 @@ CAT } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true actual := []string{} for { @@ -934,7 +935,7 @@ CAT; } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true actual := []string{} for { @@ -965,7 +966,7 @@ func TestHereDocTokens73(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true actual := []string{} for { @@ -996,7 +997,7 @@ CAT;` lexer := NewLexer([]byte(src), "7.4", false, nil) lexer.phpVersion = "7.2" - lexer.withHiddenTokens = true + lexer.withTokens = true actual := []string{} for { @@ -1028,7 +1029,7 @@ func TestInlineHtmlNopTokens(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true actual := []string{} for { @@ -1133,11 +1134,12 @@ func TestCommentEnd(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true - lexer.Lex() + tkn := lexer.Lex() - actual := lexer.hiddenTokens + l := len(tkn.Tokens) + actual := tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) } @@ -1162,11 +1164,12 @@ func TestCommentNewLine(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true tkn := lexer.Lex() - actual := tkn.Hidden + l := len(tkn.Tokens) + actual := tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) } @@ -1191,11 +1194,12 @@ func TestCommentNewLine1(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true tkn := lexer.Lex() - actual := tkn.Hidden + l := len(tkn.Tokens) + actual := tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) } @@ -1220,11 +1224,12 @@ func TestCommentNewLine2(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true tkn := lexer.Lex() - actual := tkn.Hidden + l := len(tkn.Tokens) + actual := tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) } @@ -1250,11 +1255,12 @@ func TestCommentWithPhpEndTag(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true tkn := lexer.Lex() - actual := tkn.Hidden + l := len(tkn.Tokens) + actual := tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) } @@ -1280,11 +1286,12 @@ func TestInlineComment(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true tkn := lexer.Lex() - actual := tkn.Hidden + l := len(tkn.Tokens) + actual := tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) } @@ -1310,11 +1317,12 @@ func TestInlineComment2(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true - lexer.Lex() + tkn := lexer.Lex() - actual := lexer.hiddenTokens + l := len(tkn.Tokens) + actual := tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) } @@ -1344,11 +1352,12 @@ func TestEmptyInlineComment(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true - lexer.Lex() + tkn := lexer.Lex() - actual := lexer.hiddenTokens + l := len(tkn.Tokens) + actual := tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) } @@ -1374,11 +1383,12 @@ func TestEmptyInlineComment2(t *testing.T) { } lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true tkn := lexer.Lex() - actual := tkn.Hidden + l := len(tkn.Tokens) + actual := tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) } @@ -1388,7 +1398,7 @@ func TestMethodCallTokens(t *testing.T) { $a -> bar ( '' ) ;` lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true expected := []token.Token{ { @@ -1401,7 +1411,8 @@ func TestMethodCallTokens(t *testing.T) { }, } tkn := lexer.Lex() - actual := tkn.Hidden + l := len(tkn.Tokens) + actual := tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) expected = []token.Token{ @@ -1411,7 +1422,8 @@ func TestMethodCallTokens(t *testing.T) { }, } tkn = lexer.Lex() - actual = tkn.Hidden + l = len(tkn.Tokens) + actual = tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) expected = []token.Token{ @@ -1421,7 +1433,8 @@ func TestMethodCallTokens(t *testing.T) { }, } tkn = lexer.Lex() - actual = tkn.Hidden + l = len(tkn.Tokens) + actual = tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) expected = []token.Token{ @@ -1431,7 +1444,8 @@ func TestMethodCallTokens(t *testing.T) { }, } tkn = lexer.Lex() - actual = tkn.Hidden + l = len(tkn.Tokens) + actual = tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) expected = []token.Token{ @@ -1441,7 +1455,8 @@ func TestMethodCallTokens(t *testing.T) { }, } tkn = lexer.Lex() - actual = tkn.Hidden + l = len(tkn.Tokens) + actual = tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) expected = []token.Token{ @@ -1451,7 +1466,8 @@ func TestMethodCallTokens(t *testing.T) { }, } tkn = lexer.Lex() - actual = tkn.Hidden + l = len(tkn.Tokens) + actual = tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) expected = []token.Token{ @@ -1461,7 +1477,8 @@ func TestMethodCallTokens(t *testing.T) { }, } tkn = lexer.Lex() - actual = tkn.Hidden + l = len(tkn.Tokens) + actual = tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) } @@ -1470,7 +1487,7 @@ func TestYieldFromTokens(t *testing.T) { yield from $a` lexer := NewLexer([]byte(src), "7.4", false, nil) - lexer.withHiddenTokens = true + lexer.withTokens = true expected := []token.Token{ { @@ -1483,7 +1500,8 @@ func TestYieldFromTokens(t *testing.T) { }, } tkn := lexer.Lex() - actual := tkn.Hidden + l := len(tkn.Tokens) + actual := tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) expected = []token.Token{ @@ -1493,7 +1511,8 @@ func TestYieldFromTokens(t *testing.T) { }, } tkn = lexer.Lex() - actual = tkn.Hidden + l = len(tkn.Tokens) + actual = tkn.Tokens[:l-1] assert.DeepEqual(t, expected, actual) } diff --git a/internal/scanner/token.go b/internal/scanner/token.go index b46b340..793958c 100644 --- a/internal/scanner/token.go +++ b/internal/scanner/token.go @@ -9,6 +9,6 @@ import ( type Token struct { ID TokenID Value []byte - Hidden []token.Token + Tokens []token.Token Position position.Position } diff --git a/pkg/parser/parser.go b/pkg/parser/parser.go index 0ee65f5..67974fd 100644 --- a/pkg/parser/parser.go +++ b/pkg/parser/parser.go @@ -32,9 +32,9 @@ func Parse(src []byte, ver string, cfg Config) (ast.Vertex, error) { lexer := scanner.NewLexer(src, ver, cfg.WithTokens, cfg.ErrorHandlerFunc) if r == -1 { - parser = php5.NewParser(lexer, cfg.WithTokens, cfg.ErrorHandlerFunc) + parser = php5.NewParser(lexer, cfg.ErrorHandlerFunc) } else { - parser = php7.NewParser(lexer, cfg.WithTokens, cfg.ErrorHandlerFunc) + parser = php7.NewParser(lexer, cfg.ErrorHandlerFunc) } parser.Parse() diff --git a/pkg/printer/printer_parsed_php5_test.go b/pkg/printer/printer_parsed_php5_test.go index 2257614..24b5acd 100644 --- a/pkg/printer/printer_parsed_php5_test.go +++ b/pkg/printer/printer_parsed_php5_test.go @@ -13,7 +13,7 @@ import ( func parsePhp5(src string) ast.Vertex { lexer := scanner.NewLexer([]byte(src), "5.6", true, nil) - php5parser := php5.NewParser(lexer, true, nil) + php5parser := php5.NewParser(lexer, nil) php5parser.Parse() return php5parser.GetRootNode() @@ -832,7 +832,8 @@ func TestParseAndPrintPhp5Break(t *testing.T) { break ( 2 ) ; ` - actual := printPhp5(parsePhp5(src)) + root := parsePhp5(src) + actual := printPhp5(root) if src != actual { t.Errorf("\nexpected: %s\ngot: %s\n", src, actual) diff --git a/pkg/printer/printer_parsed_php7_test.go b/pkg/printer/printer_parsed_php7_test.go index 7b634a4..900ae22 100644 --- a/pkg/printer/printer_parsed_php7_test.go +++ b/pkg/printer/printer_parsed_php7_test.go @@ -30,7 +30,7 @@ abstract class Bar extends Baz // parse lexer := scanner.NewLexer([]byte(src), "7.4", true, nil) - php7parser := php7.NewParser(lexer, true, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() rootNode := php7parser.GetRootNode() @@ -62,7 +62,7 @@ abstract class Bar extends Baz func parse(src string) ast.Vertex { lexer := scanner.NewLexer([]byte(src), "7.4", true, nil) - php7parser := php7.NewParser(lexer, true, nil) + php7parser := php7.NewParser(lexer, nil) php7parser.Parse() return php7parser.GetRootNode()