From d9a7d20e73097c241340ced141fe4e82b97e62f6 Mon Sep 17 00:00:00 2001 From: Vadym Slizov Date: Mon, 18 May 2020 21:15:07 +0300 Subject: [PATCH] [refactoring] scanner.Lexer.withHiddenTokens --- cmd/php-parser/main.go | 6 +- internal/php5/parser.go | 32 +- internal/php5/parser_test.go | 516 ++++----- internal/php5/php5_bench_test.go | 2 +- internal/php5/php5_test.go | 8 +- internal/php7/parser.go | 32 +- internal/php7/parser_test.go | 564 +++++----- internal/php7/php7_bench_test.go | 2 +- internal/php7/php7_test.go | 8 +- internal/scanner/lexer.go | 71 +- internal/scanner/scanner.go | 1376 +++++++++++------------ internal/scanner/scanner.rl | 36 +- internal/scanner/scanner_test.go | 124 +- pkg/parser/parser.go | 7 +- pkg/printer/printer_parsed_php5_test.go | 3 +- pkg/printer/printer_parsed_php7_test.go | 6 +- 16 files changed, 1394 insertions(+), 1399 deletions(-) diff --git a/cmd/php-parser/main.go b/cmd/php-parser/main.go index 33d03e0..9300288 100644 --- a/cmd/php-parser/main.go +++ b/cmd/php-parser/main.go @@ -108,15 +108,11 @@ func parserWorker(fileCh <-chan *file, r chan<- result) { return } - parserWorker, err := parser.NewParser(f.content, phpVersion) + parserWorker, err := parser.NewParser(f.content, phpVersion, *withFreeFloating) if err != nil { panic(err.Error()) } - if *withFreeFloating { - parserWorker.WithTokens() - } - parserWorker.Parse() r <- result{path: f.path, parser: parserWorker} diff --git a/internal/php5/parser.go b/internal/php5/parser.go index 1315a54..0f4441d 100644 --- a/internal/php5/parser.go +++ b/internal/php5/parser.go @@ -22,17 +22,23 @@ type Parser struct { positionBuilder *positionbuilder.PositionBuilder rootNode ast.Vertex errors []*errors.Error + withTokens bool } // NewParser creates and returns new Parser -func NewParser(src []byte, v string) *Parser { - parser := &Parser{} +func NewParser(src []byte, v string, withTokens bool) *Parser { + parser := &Parser{ + withTokens: withTokens, + } - lexer := scanner.NewLexer(src, func(e *errors.Error) { - parser.errors = append(parser.errors, e) - }) - lexer.PHPVersion = v + scannerConfig := scanner.Config{ + WithHiddenTokens: withTokens, + ErrHandlerFunc: func(e *errors.Error) { + parser.errors = append(parser.errors, e) + }, + } + lexer := scanner.NewLexer(src, v, scannerConfig) parser.Lexer = lexer return parser @@ -59,10 +65,6 @@ func (l *Parser) GetErrors() []*errors.Error { return l.errors } -func (l *Parser) WithTokens() { - l.Lexer.SetWithHiddenTokens(true) -} - // Parse the php7 Parser entrypoint func (l *Parser) Parse() int { // init @@ -98,7 +100,7 @@ func isDollar(r rune) bool { } func (l *Parser) MoveFreeFloating(src ast.Vertex, dst ast.Vertex) { - if l.Lexer.GetWithHiddenTokens() == false { + if l.withTokens == false { return } @@ -111,7 +113,7 @@ func (l *Parser) MoveFreeFloating(src ast.Vertex, dst ast.Vertex) { } func (l *Parser) setFreeFloating(dst ast.Vertex, p token.Position, strings []token.Token) { - if l.Lexer.GetWithHiddenTokens() == false { + if l.withTokens == false { return } @@ -128,7 +130,7 @@ func (l *Parser) setFreeFloating(dst ast.Vertex, p token.Position, strings []tok } func (l *Parser) GetFreeFloatingToken(t *scanner.Token) []token.Token { - if l.Lexer.GetWithHiddenTokens() == false { + if l.withTokens == false { return []token.Token{} } @@ -141,7 +143,7 @@ func (l *Parser) GetFreeFloatingToken(t *scanner.Token) []token.Token { } func (l *Parser) addDollarToken(v ast.Vertex) { - if l.Lexer.GetWithHiddenTokens() == false { + if l.withTokens == false { return } @@ -154,7 +156,7 @@ func (l *Parser) addDollarToken(v ast.Vertex) { } func (l *Parser) splitSemiColonAndPhpCloseTag(htmlNode ast.Vertex, prevNode ast.Vertex) { - if l.Lexer.GetWithHiddenTokens() == false { + if l.withTokens == false { return } diff --git a/internal/php5/parser_test.go b/internal/php5/parser_test.go index 638d1df..c5b5d58 100644 --- a/internal/php5/parser_test.go +++ b/internal/php5/parser_test.go @@ -56,7 +56,7 @@ func TestIdentifier(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -838,7 +838,7 @@ func TestPhp5ArgumentNode(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1591,7 +1591,7 @@ func TestPhp5ParameterNode(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1612,7 +1612,7 @@ func TestCommentEndFile(t *testing.T) { Stmts: []ast.Vertex{}, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1689,7 +1689,7 @@ func TestName(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1764,7 +1764,7 @@ func TestFullyQualified(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1839,7 +1839,7 @@ func TestRelative(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1917,7 +1917,7 @@ func TestScalarEncapsed_SimpleVar(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1993,7 +1993,7 @@ func TestScalarEncapsed_SimpleVarOneChar(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2080,7 +2080,7 @@ func TestScalarEncapsed_SimpleVarEndsEcapsed(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2177,7 +2177,7 @@ func TestScalarEncapsed_StringVarCurveOpen(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2285,7 +2285,7 @@ func TestScalarEncapsed_SimpleVarPropertyFetch(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2361,7 +2361,7 @@ func TestScalarEncapsed_DollarOpenCurlyBraces(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2458,7 +2458,7 @@ func TestScalarEncapsed_DollarOpenCurlyBracesDimNumber(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2565,7 +2565,7 @@ func TestScalarEncapsed_CurlyOpenMethodCall(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2656,7 +2656,7 @@ LBL; }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2747,7 +2747,7 @@ LBL; }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2806,7 +2806,7 @@ LBL; }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2851,7 +2851,7 @@ CAD; }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2910,7 +2910,7 @@ CAD; }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2954,7 +2954,7 @@ func TestScalarMagicConstant(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2997,7 +2997,7 @@ func TestScalarNumber_LNumber(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3040,7 +3040,7 @@ func TestScalarNumber_DNumber(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3083,7 +3083,7 @@ func TestScalarNumber_Float(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3126,7 +3126,7 @@ func TestScalarNumber_BinaryLNumber(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3169,7 +3169,7 @@ func TestScalarNumber_BinaryDNumber(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3212,7 +3212,7 @@ func TestScalarNumber_HLNumber(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3255,7 +3255,7 @@ func TestScalarNumber_HDNumber(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3298,7 +3298,7 @@ func TestScalarString_DoubleQuotedScalarString(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3341,7 +3341,7 @@ func TestScalarString_DoubleQuotedScalarStringWithEscapedVar(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3386,7 +3386,7 @@ func TestScalarString_MultilineDoubleQuotedScalarString(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3429,7 +3429,7 @@ func TestScalarString_SingleQuotedScalarString(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3474,7 +3474,7 @@ func TestScalarString_MultilineSingleQuotedScalarString(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3543,7 +3543,7 @@ func TestStmtAltIf_AltIf(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3655,7 +3655,7 @@ func TestStmtAltIf_AltElseIf(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3744,7 +3744,7 @@ func TestStmtAltIf_AltElse(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3921,7 +3921,7 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4042,7 +4042,7 @@ func TestStmtClassConstList_WithoutModifiers(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4120,7 +4120,7 @@ func TestStmtClassMethod_SimpleClassMethod(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4268,7 +4268,7 @@ func TestStmtClassMethod_PrivateProtectedClassMethod(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4370,7 +4370,7 @@ func TestStmtClassMethod_Php5ClassMethod(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4484,7 +4484,7 @@ func TestStmtClassMethod_AbstractClassMethod(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4528,7 +4528,7 @@ func TestStmtClass_SimpleClass(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4585,7 +4585,7 @@ func TestStmtClass_AbstractClass(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4675,7 +4675,7 @@ func TestStmtClass_ClassExtends(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4767,7 +4767,7 @@ func TestStmtClass_ClassImplement(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4882,7 +4882,7 @@ func TestStmtClass_ClassImplements(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4980,7 +4980,7 @@ func TestStmtConstList(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5045,7 +5045,7 @@ func TestStmtContinue_Empty(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5121,7 +5121,7 @@ func TestStmtContinue_Light(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5197,7 +5197,7 @@ func TestStmtContinue(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5273,7 +5273,7 @@ func TestStmtDeclare(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5382,7 +5382,7 @@ func TestStmtDeclare_Stmts(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5460,7 +5460,7 @@ func TestStmtDeclare_Alt(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5514,7 +5514,7 @@ func TestStmtDo(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5580,7 +5580,7 @@ func TestStmtEcho(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5635,7 +5635,7 @@ func TestStmtEcho_Parenthesis(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5678,7 +5678,7 @@ func TestStmtExpression(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5873,7 +5873,7 @@ func TestStmtFor(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5993,7 +5993,7 @@ func TestStmtFor_Alt(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6078,7 +6078,7 @@ func TestStmtForeach(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6153,7 +6153,7 @@ func TestStmtForeach_Expr(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6238,7 +6238,7 @@ func TestStmtForeach_Alt(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6344,7 +6344,7 @@ func TestStmtForeach_WithKey(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6440,7 +6440,7 @@ func TestStmtForeach_ExprWithKey(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6556,7 +6556,7 @@ func TestStmtForeach_WithRef(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6684,7 +6684,7 @@ func TestStmtForeach_WithList(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6729,7 +6729,7 @@ func TestStmtFunction(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6785,7 +6785,7 @@ func TestStmtFunction_Return(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6952,7 +6952,7 @@ func TestStmtFunction_ReturnVar(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7019,7 +7019,7 @@ func TestStmtFunction_Ref(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7074,7 +7074,7 @@ func TestStmtGlobal(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7234,7 +7234,7 @@ func TestStmtGlobal_Vars(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7298,7 +7298,7 @@ func TestStmtGotoLabel(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7330,7 +7330,7 @@ func TestStmtHaltCompiler(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7394,7 +7394,7 @@ func TestStmtIf(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7502,7 +7502,7 @@ func TestStmtIf_ElseIf(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7587,7 +7587,7 @@ func TestStmtIf_Else(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7758,7 +7758,7 @@ func TestStmtIf_ElseElseIf(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7939,7 +7939,7 @@ func TestStmtIf_ElseIfElseIfElse(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7982,7 +7982,7 @@ func TestStmtInlineHtml(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8026,7 +8026,7 @@ func TestStmtInterface(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8105,7 +8105,7 @@ func TestStmtInterface_Extend(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8207,7 +8207,7 @@ func TestStmtInterface_Extends(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8262,7 +8262,7 @@ func TestStmtNamespace(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8318,7 +8318,7 @@ func TestStmtNamespace_Stmts(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8351,7 +8351,7 @@ func TestStmtNamespace_Anonymous(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8452,7 +8452,7 @@ func TestStmtProperty(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8606,7 +8606,7 @@ func TestStmtProperty_Properties(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8760,7 +8760,7 @@ func TestStmtProperty_Properties2(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8825,7 +8825,7 @@ func TestStmtStaticVar(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8932,7 +8932,7 @@ func TestStmtStaticVar_Vars(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9039,7 +9039,7 @@ func TestStmtStaticVar_Vars2(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9165,7 +9165,7 @@ func TestStmtSwitch(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9291,7 +9291,7 @@ func TestStmtSwitch_Semicolon(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9407,7 +9407,7 @@ func TestStmtSwitch_Alt(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9511,7 +9511,7 @@ func TestStmtSwitch_AltSemicolon(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9564,7 +9564,7 @@ func TestStmtThrow(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9608,7 +9608,7 @@ func TestStmtTrait(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9698,7 +9698,7 @@ func TestStmtTraitUse(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9811,7 +9811,7 @@ func TestStmtTraitUse_Uses(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9924,7 +9924,7 @@ func TestStmtTraitUse_EmptyAdaptations(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10081,7 +10081,7 @@ func TestStmtTraitUse_Modifier(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10249,7 +10249,7 @@ func TestStmtTraitUse_AliasModifier(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10531,7 +10531,7 @@ func TestStmtTraitUse_Adaptions(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10567,7 +10567,7 @@ func TestStmtTry_Try(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10661,7 +10661,7 @@ func TestStmtTry_TryCatch(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10812,7 +10812,7 @@ func TestStmtTry_TryCatchCatch(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10917,7 +10917,7 @@ func TestStmtTry_TryCatchFinally(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11123,7 +11123,7 @@ func TestStmtTry_TryCatchCatchCatch(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11178,7 +11178,7 @@ func TestStmtUnset(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11254,7 +11254,7 @@ func TestStmtUnset_Vars(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11321,7 +11321,7 @@ func TestStmtUse(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11388,7 +11388,7 @@ func TestStmtUse_FullyQualified(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11466,7 +11466,7 @@ func TestStmtUse_FullyQualifiedAlias(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11566,7 +11566,7 @@ func TestStmtUse_List(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11677,7 +11677,7 @@ func TestStmtUse_ListAlias(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11788,7 +11788,7 @@ func TestStmtUse_ListFunctionType(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11921,7 +11921,7 @@ func TestStmtUse_ListFunctionTypeAliases(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12032,7 +12032,7 @@ func TestStmtUse_ListConstType(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12165,7 +12165,7 @@ func TestStmtUse_ListConstTypeAliases(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12230,7 +12230,7 @@ func TestStmtBreak_Empty(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12306,7 +12306,7 @@ func TestStmtBreak_Light(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12382,7 +12382,7 @@ func TestStmtBreak(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12458,7 +12458,7 @@ func TestExprArrayDimFetch(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12553,7 +12553,7 @@ func TestExprArrayDimFetch_Nested(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12596,7 +12596,7 @@ func TestExprArray(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12661,7 +12661,7 @@ func TestExprArray_Item(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12779,7 +12779,7 @@ func TestExprArray_Items(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12842,7 +12842,7 @@ func TestExprBitwiseNot(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12905,7 +12905,7 @@ func TestExprBooleanNot(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12981,7 +12981,7 @@ func TestExprClassConstFetch(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13045,7 +13045,7 @@ func TestExprClassConstFetch_Static(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13108,7 +13108,7 @@ func TestExprClone_Brackets(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13171,7 +13171,7 @@ func TestExprClone(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13216,7 +13216,7 @@ func TestExprClosure(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13393,7 +13393,7 @@ func TestExprClosure_Use(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13570,7 +13570,7 @@ func TestExprClosure_Use2(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13635,7 +13635,7 @@ func TestExprConstFetch(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13700,7 +13700,7 @@ func TestExprConstFetch_Relative(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13765,7 +13765,7 @@ func TestExprConstFetch_FullyQualified(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13828,7 +13828,7 @@ func TestExprEmpty(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13891,7 +13891,7 @@ func TestExprErrorSuppress(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13954,7 +13954,7 @@ func TestExprEval(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13997,7 +13997,7 @@ func TestExprExit(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14040,7 +14040,7 @@ func TestExprExit_Empty(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14104,7 +14104,7 @@ func TestExprExit_Expr(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14147,7 +14147,7 @@ func TestExprDie(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14190,7 +14190,7 @@ func TestExprDie_Empty(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14254,7 +14254,7 @@ func TestExprDie_Expr(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14329,7 +14329,7 @@ func TestExprFunctionCall(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14404,7 +14404,7 @@ func TestExprFunctionCall_Relative(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14504,7 +14504,7 @@ func TestExprFunctionCall_FullyQualified(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14622,7 +14622,7 @@ func TestExprFunctionCall_Var(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14753,7 +14753,7 @@ func TestExprFunctionCall_ExprArg(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14816,7 +14816,7 @@ func TestExprPostDec(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14879,7 +14879,7 @@ func TestExprPostInc(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14942,7 +14942,7 @@ func TestExprPreDec(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15005,7 +15005,7 @@ func TestExprPreInc(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15068,7 +15068,7 @@ func TestExprInclude(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15131,7 +15131,7 @@ func TestExprInclude_Once(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15194,7 +15194,7 @@ func TestExprRequire(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15257,7 +15257,7 @@ func TestExprRequire_Once(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15343,7 +15343,7 @@ func TestExprInstanceOf(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15429,7 +15429,7 @@ func TestExprInstanceOf_Relative(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15515,7 +15515,7 @@ func TestExprInstanceOf_FullyQualified(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15580,7 +15580,7 @@ func TestExprIsset(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15666,7 +15666,7 @@ func TestExprIsset_Variables(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15740,7 +15740,7 @@ func TestExprList_Empty(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15846,7 +15846,7 @@ func TestExprList(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15962,7 +15962,7 @@ func TestExprList_ArrayIndex(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16090,7 +16090,7 @@ func TestExprList_List(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16197,7 +16197,7 @@ func TestExprList_EmptyItem(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16306,7 +16306,7 @@ func TestExprList_EmptyItems(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16390,7 +16390,7 @@ func TestExprMethodCall(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16455,7 +16455,7 @@ func TestExprNew(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16530,7 +16530,7 @@ func TestExprNew_Relative(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16605,7 +16605,7 @@ func TestExprNew_FullyQualified(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16668,7 +16668,7 @@ func TestExprPrint(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16742,7 +16742,7 @@ func TestExprPropertyFetch(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16859,7 +16859,7 @@ func TestExprReference_ForeachWithRef(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16935,7 +16935,7 @@ func TestExprShellExec(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16978,7 +16978,7 @@ func TestExprShortArray(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17043,7 +17043,7 @@ func TestExprShortArray_Item(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17161,7 +17161,7 @@ func TestExprShortArray_Items(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17247,7 +17247,7 @@ func TestExprStaticCall(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17333,7 +17333,7 @@ func TestExprStaticCall_Relative(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17419,7 +17419,7 @@ func TestExprStaticCall_FullyQualified(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17515,7 +17515,7 @@ func TestExprStaticCall_Var(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17609,7 +17609,7 @@ func TestExprStaticCall_VarVar(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17695,7 +17695,7 @@ func TestExprStaticPropertyFetch(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17781,7 +17781,7 @@ func TestExprStaticPropertyFetch_Relative(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17867,7 +17867,7 @@ func TestExprStaticPropertyFetch_FullyQualified(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17972,7 +17972,7 @@ func TestExprTernary(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18056,7 +18056,7 @@ func TestExprTernary_Simple(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18213,7 +18213,7 @@ func TestExprTernary_NestedTrue(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18370,7 +18370,7 @@ func TestExprTernary_NestedCond(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18433,7 +18433,7 @@ func TestExprUnaryMinus(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18496,7 +18496,7 @@ func TestExprUnaryPlus(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18549,7 +18549,7 @@ func TestExprVariable(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18612,7 +18612,7 @@ func TestExprVariable_Variable(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18654,7 +18654,7 @@ func TestExprYield(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18717,7 +18717,7 @@ func TestExprYield_Val(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18801,7 +18801,7 @@ func TestExprYield_KeyVal(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18854,7 +18854,7 @@ func TestExprYield_Expr(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18928,7 +18928,7 @@ func TestExprYield_KeyExpr(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19014,7 +19014,7 @@ func TestExprAssign_Assign(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19098,7 +19098,7 @@ func TestExprAssign_Reference(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19194,7 +19194,7 @@ func TestExprAssign_ReferenceNew(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19335,7 +19335,7 @@ func TestExprAssign_ReferenceArgs(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19419,7 +19419,7 @@ func TestExprAssign_BitwiseAnd(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19503,7 +19503,7 @@ func TestExprAssign_BitwiseOr(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19587,7 +19587,7 @@ func TestExprAssign_BitwiseXor(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19671,7 +19671,7 @@ func TestExprAssign_Concat(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19755,7 +19755,7 @@ func TestExprAssign_Div(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19839,7 +19839,7 @@ func TestExprAssign_Minus(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19923,7 +19923,7 @@ func TestExprAssign_Mod(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20007,7 +20007,7 @@ func TestExprAssign_Mul(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20091,7 +20091,7 @@ func TestExprAssign_Plus(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20175,7 +20175,7 @@ func TestExprAssign_Pow(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20259,7 +20259,7 @@ func TestExprAssign_ShiftLeft(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20343,7 +20343,7 @@ func TestExprAssign_ShiftRight(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20429,7 +20429,7 @@ func TestExprBinary_BitwiseAnd(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20513,7 +20513,7 @@ func TestExprBinary_BitwiseOr(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20597,7 +20597,7 @@ func TestExprBinary_BitwiseXor(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20681,7 +20681,7 @@ func TestExprBinary_BooleanAnd(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20765,7 +20765,7 @@ func TestExprBinary_BooleanOr(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20849,7 +20849,7 @@ func TestExprBinary_Concat(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20933,7 +20933,7 @@ func TestExprBinary_Div(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21017,7 +21017,7 @@ func TestExprBinary_Equal(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21101,7 +21101,7 @@ func TestExprBinary_GreaterOrEqual(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21185,7 +21185,7 @@ func TestExprBinary_Greater(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21269,7 +21269,7 @@ func TestExprBinary_Identical(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21353,7 +21353,7 @@ func TestExprBinary_LogicalAnd(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21437,7 +21437,7 @@ func TestExprBinary_LogicalOr(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21521,7 +21521,7 @@ func TestExprBinary_LogicalXor(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21605,7 +21605,7 @@ func TestExprBinary_Minus(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21689,7 +21689,7 @@ func TestExprBinary_Mod(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21773,7 +21773,7 @@ func TestExprBinary_Mul(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21857,7 +21857,7 @@ func TestExprBinary_NotEqual(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21941,7 +21941,7 @@ func TestExprBinary_NotIdentical(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22025,7 +22025,7 @@ func TestExprBinary_Plus(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22109,7 +22109,7 @@ func TestExprBinary_Pow(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22193,7 +22193,7 @@ func TestExprBinary_ShiftLeft(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22277,7 +22277,7 @@ func TestExprBinary_ShiftRight(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22361,7 +22361,7 @@ func TestExprBinary_SmallerOrEqual(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22445,7 +22445,7 @@ func TestExprBinary_Smaller(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22510,7 +22510,7 @@ func TestExprCast_Array(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22573,7 +22573,7 @@ func TestExprCast_Bool(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22636,7 +22636,7 @@ func TestExprCast_BoolShort(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22699,7 +22699,7 @@ func TestExprCast_Double(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22762,7 +22762,7 @@ func TestExprCast_CastFloat(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22825,7 +22825,7 @@ func TestExprCast_Int(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22888,7 +22888,7 @@ func TestExprCast_IntShort(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22951,7 +22951,7 @@ func TestExprCast_Object(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23014,7 +23014,7 @@ func TestExprCast_String(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23077,7 +23077,7 @@ func TestExprCast_BinaryString(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23140,7 +23140,7 @@ func TestExprCast_Unset(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) diff --git a/internal/php5/php5_bench_test.go b/internal/php5/php5_bench_test.go index 2c7d11c..2b94e89 100644 --- a/internal/php5/php5_bench_test.go +++ b/internal/php5/php5_bench_test.go @@ -413,7 +413,7 @@ CAD; ` for n := 0; n < b.N; n++ { - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() } } diff --git a/internal/php5/php5_test.go b/internal/php5/php5_test.go index 295e0b0..68a7b05 100644 --- a/internal/php5/php5_test.go +++ b/internal/php5/php5_test.go @@ -22455,7 +22455,7 @@ func TestPhp5(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22592,7 +22592,7 @@ func TestPhp5Strings(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22818,7 +22818,7 @@ CAD; }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22838,7 +22838,7 @@ func TestPhp5ControlCharsErrors(t *testing.T) { }, } - php5parser := php5.NewParser([]byte(src), "5.6") + php5parser := php5.NewParser([]byte(src), "5.6", false) php5parser.Parse() actual := php5parser.GetErrors() assert.DeepEqual(t, expected, actual) diff --git a/internal/php7/parser.go b/internal/php7/parser.go index 72dab68..df00e2d 100644 --- a/internal/php7/parser.go +++ b/internal/php7/parser.go @@ -21,17 +21,23 @@ type Parser struct { positionBuilder *positionbuilder.PositionBuilder rootNode ast.Vertex errors []*errors.Error + withTokens bool } // NewParser creates and returns new Parser -func NewParser(src []byte, v string) *Parser { - parser := &Parser{} +func NewParser(src []byte, v string, withTokens bool) *Parser { + parser := &Parser{ + withTokens: withTokens, + } - lexer := scanner.NewLexer(src, func(e *errors.Error) { - parser.errors = append(parser.errors, e) - }) - lexer.PHPVersion = v + scannerConfig := scanner.Config{ + WithHiddenTokens: withTokens, + ErrHandlerFunc: func(e *errors.Error) { + parser.errors = append(parser.errors, e) + }, + } + lexer := scanner.NewLexer(src, v, scannerConfig) parser.Lexer = lexer return parser @@ -57,10 +63,6 @@ func (l *Parser) GetErrors() []*errors.Error { return l.errors } -func (l *Parser) WithTokens() { - l.Lexer.SetWithHiddenTokens(true) -} - // Parse the php7 Parser entrypoint func (l *Parser) Parse() int { // init @@ -96,7 +98,7 @@ func isDollar(r rune) bool { } func (l *Parser) MoveFreeFloating(src ast.Vertex, dst ast.Vertex) { - if l.Lexer.GetWithHiddenTokens() == false { + if l.withTokens == false { return } @@ -109,7 +111,7 @@ func (l *Parser) MoveFreeFloating(src ast.Vertex, dst ast.Vertex) { } func (l *Parser) setFreeFloating(dst ast.Vertex, p token.Position, strings []token.Token) { - if l.Lexer.GetWithHiddenTokens() == false { + if l.withTokens == false { return } @@ -126,7 +128,7 @@ func (l *Parser) setFreeFloating(dst ast.Vertex, p token.Position, strings []tok } func (l *Parser) GetFreeFloatingToken(t *scanner.Token) []token.Token { - if l.Lexer.GetWithHiddenTokens() == false { + if l.withTokens == false { return []token.Token{} } @@ -139,7 +141,7 @@ func (l *Parser) GetFreeFloatingToken(t *scanner.Token) []token.Token { } func (l *Parser) addDollarToken(v ast.Vertex) { - if l.Lexer.GetWithHiddenTokens() == false { + if l.withTokens == false { return } @@ -152,7 +154,7 @@ func (l *Parser) addDollarToken(v ast.Vertex) { } func (l *Parser) splitSemiColonAndPhpCloseTag(htmlNode ast.Vertex, prevNode ast.Vertex) { - if l.Lexer.GetWithHiddenTokens() == false { + if l.withTokens == false { return } diff --git a/internal/php7/parser_test.go b/internal/php7/parser_test.go index bceae9c..e4a2100 100644 --- a/internal/php7/parser_test.go +++ b/internal/php7/parser_test.go @@ -56,7 +56,7 @@ func TestIdentifier(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -949,7 +949,7 @@ func TestPhp7ArgumentNode(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1742,7 +1742,7 @@ func TestPhp7ParameterNode(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1763,7 +1763,7 @@ func TestCommentEndFile(t *testing.T) { Stmts: []ast.Vertex{}, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1840,7 +1840,7 @@ func TestName(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1915,7 +1915,7 @@ func TestFullyQualified(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -1990,7 +1990,7 @@ func TestRelative(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2068,7 +2068,7 @@ func TestScalarEncapsed_SimpleVar(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2144,7 +2144,7 @@ func TestScalarEncapsed_SimpleVarOneChar(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2231,7 +2231,7 @@ func TestScalarEncapsed_SimpleVarEndsEcapsed(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2328,7 +2328,7 @@ func TestScalarEncapsed_StringVarCurveOpen(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2436,7 +2436,7 @@ func TestScalarEncapsed_SimpleVarPropertyFetch(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2512,7 +2512,7 @@ func TestScalarEncapsed_DollarOpenCurlyBraces(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2609,7 +2609,7 @@ func TestScalarEncapsed_DollarOpenCurlyBracesDimNumber(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2716,7 +2716,7 @@ func TestScalarEncapsed_CurlyOpenMethodCall(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2807,7 +2807,7 @@ LBL; }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2898,7 +2898,7 @@ LBL; }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -2957,7 +2957,7 @@ LBL; }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3002,7 +3002,7 @@ CAD; }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3061,7 +3061,7 @@ CAD; }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3105,7 +3105,7 @@ func TestScalarMagicConstant(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3148,7 +3148,7 @@ func TestScalarNumber_LNumber(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3191,7 +3191,7 @@ func TestScalarNumber_DNumber(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3234,7 +3234,7 @@ func TestScalarNumber_Float(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3277,7 +3277,7 @@ func TestScalarNumber_BinaryLNumber(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3320,7 +3320,7 @@ func TestScalarNumber_BinaryDNumber(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3363,7 +3363,7 @@ func TestScalarNumber_HLNumber(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3406,7 +3406,7 @@ func TestScalarNumber_HDNumber(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3449,7 +3449,7 @@ func TestScalarString_DoubleQuotedScalarString(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3492,7 +3492,7 @@ func TestScalarString_DoubleQuotedScalarStringWithEscapedVar(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3537,7 +3537,7 @@ func TestScalarString_MultilineDoubleQuotedScalarString(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3580,7 +3580,7 @@ func TestScalarString_SingleQuotedScalarString(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3625,7 +3625,7 @@ func TestScalarString_MultilineSingleQuotedScalarString(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3694,7 +3694,7 @@ func TestStmtAltIf_AltIf(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3806,7 +3806,7 @@ func TestStmtAltIf_AltElseIf(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -3895,7 +3895,7 @@ func TestStmtAltIf_AltElse(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4072,7 +4072,7 @@ func TestStmtAltIf_AltElseElseIf(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4206,7 +4206,7 @@ func TestStmtClassConstList(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4327,7 +4327,7 @@ func TestStmtClassConstList_WithoutModifiers(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4405,7 +4405,7 @@ func TestStmtClassMethod_SimpleClassMethod(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4553,7 +4553,7 @@ func TestStmtClassMethod_PrivateProtectedClassMethod(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4678,7 +4678,7 @@ func TestStmtClassMethod_Php7ClassMethod(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4792,7 +4792,7 @@ func TestStmtClassMethod_AbstractClassMethod(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4918,7 +4918,7 @@ func TestStmtClassMethod_Php7AbstractClassMethod(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -4962,7 +4962,7 @@ func TestStmtClass_SimpleClass(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5019,7 +5019,7 @@ func TestStmtClass_AbstractClass(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5109,7 +5109,7 @@ func TestStmtClass_ClassExtends(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5201,7 +5201,7 @@ func TestStmtClass_ClassImplement(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5316,7 +5316,7 @@ func TestStmtClass_ClassImplements(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5470,7 +5470,7 @@ func TestStmtClass_AnonimousClass(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5568,7 +5568,7 @@ func TestStmtConstList(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5633,7 +5633,7 @@ func TestStmtContinue_Empty(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5709,7 +5709,7 @@ func TestStmtContinue_Light(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5785,7 +5785,7 @@ func TestStmtContinue(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5861,7 +5861,7 @@ func TestStmtDeclare(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -5970,7 +5970,7 @@ func TestStmtDeclare_Stmts(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6048,7 +6048,7 @@ func TestStmtDeclare_Alt(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6102,7 +6102,7 @@ func TestStmtDo(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6168,7 +6168,7 @@ func TestStmtEcho(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6223,7 +6223,7 @@ func TestStmtEcho_Parenthesis(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6266,7 +6266,7 @@ func TestStmtExpression(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6461,7 +6461,7 @@ func TestStmtFor(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6581,7 +6581,7 @@ func TestStmtFor_Alt(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6666,7 +6666,7 @@ func TestStmtForeach(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6741,7 +6741,7 @@ func TestStmtForeach_Expr(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6826,7 +6826,7 @@ func TestStmtForeach_Alt(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -6932,7 +6932,7 @@ func TestStmtForeach_WithKey(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7028,7 +7028,7 @@ func TestStmtForeach_ExprWithKey(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7144,7 +7144,7 @@ func TestStmtForeach_WithRef(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7272,7 +7272,7 @@ func TestStmtForeach_WithList(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7317,7 +7317,7 @@ func TestStmtFunction(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7373,7 +7373,7 @@ func TestStmtFunction_Return(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7540,7 +7540,7 @@ func TestStmtFunction_ReturnVar(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7607,7 +7607,7 @@ func TestStmtFunction_Ref(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7675,7 +7675,7 @@ func TestStmtFunction_ReturnType(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7730,7 +7730,7 @@ func TestStmtGlobal(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7890,7 +7890,7 @@ func TestStmtGlobal_Vars(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7954,7 +7954,7 @@ func TestStmtGotoLabel(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -7986,7 +7986,7 @@ func TestStmtHaltCompiler(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8050,7 +8050,7 @@ func TestStmtIf(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8158,7 +8158,7 @@ func TestStmtIf_ElseIf(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8243,7 +8243,7 @@ func TestStmtIf_Else(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8414,7 +8414,7 @@ func TestStmtIf_ElseElseIf(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8595,7 +8595,7 @@ func TestStmtIf_ElseIfElseIfElse(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8638,7 +8638,7 @@ func TestStmtInlineHtml(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8682,7 +8682,7 @@ func TestStmtInterface(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8761,7 +8761,7 @@ func TestStmtInterface_Extend(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8863,7 +8863,7 @@ func TestStmtInterface_Extends(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8918,7 +8918,7 @@ func TestStmtNamespace(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -8974,7 +8974,7 @@ func TestStmtNamespace_Stmts(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9007,7 +9007,7 @@ func TestStmtNamespace_Anonymous(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9108,7 +9108,7 @@ func TestStmtProperty(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9262,7 +9262,7 @@ func TestStmtProperty_Properties(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9416,7 +9416,7 @@ func TestStmtProperty_Properties2(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9540,7 +9540,7 @@ func TestStmtProperty_PropertyType(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9605,7 +9605,7 @@ func TestStmtStaticVar(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9712,7 +9712,7 @@ func TestStmtStaticVar_Vars(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9819,7 +9819,7 @@ func TestStmtStaticVar_Vars2(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -9945,7 +9945,7 @@ func TestStmtSwitch(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10071,7 +10071,7 @@ func TestStmtSwitch_Semicolon(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10187,7 +10187,7 @@ func TestStmtSwitch_Alt(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10291,7 +10291,7 @@ func TestStmtSwitch_AltSemicolon(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10344,7 +10344,7 @@ func TestStmtThrow(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10388,7 +10388,7 @@ func TestStmtTrait(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10478,7 +10478,7 @@ func TestStmtTraitUse(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10591,7 +10591,7 @@ func TestStmtTraitUse_Uses(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10704,7 +10704,7 @@ func TestStmtTraitUse_EmptyAdaptations(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -10861,7 +10861,7 @@ func TestStmtTraitUse_Modifier(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11029,7 +11029,7 @@ func TestStmtTraitUse_AliasModifier(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11311,7 +11311,7 @@ func TestStmtTraitUse_Adaptions(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11347,7 +11347,7 @@ func TestStmtTry_Try(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11441,7 +11441,7 @@ func TestStmtTry_TryCatch(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11558,7 +11558,7 @@ func TestStmtTry_Php7TryCatch(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11709,7 +11709,7 @@ func TestStmtTry_TryCatchCatch(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -11814,7 +11814,7 @@ func TestStmtTry_TryCatchFinally(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12020,7 +12020,7 @@ func TestStmtTry_TryCatchCatchCatch(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12075,7 +12075,7 @@ func TestStmtUnset(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12151,7 +12151,7 @@ func TestStmtUnset_Vars(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12227,7 +12227,7 @@ func TestStmtUnset_TrailingComma(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12294,7 +12294,7 @@ func TestStmtUse(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12361,7 +12361,7 @@ func TestStmtUse_FullyQualified(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12439,7 +12439,7 @@ func TestStmtUse_FullyQualifiedAlias(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12539,7 +12539,7 @@ func TestStmtUse_List(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12650,7 +12650,7 @@ func TestStmtUse_ListAlias(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12761,7 +12761,7 @@ func TestStmtUse_ListFunctionType(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -12894,7 +12894,7 @@ func TestStmtUse_ListFunctionTypeAliases(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13005,7 +13005,7 @@ func TestStmtUse_ListConstType(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13138,7 +13138,7 @@ func TestStmtUse_ListConstTypeAliases(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13261,7 +13261,7 @@ func TestStmtUse_GroupUse(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13395,7 +13395,7 @@ func TestStmtUse_GroupUseAlias(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13529,7 +13529,7 @@ func TestStmtUse_FunctionGroupUse(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13663,7 +13663,7 @@ func TestStmtUse_ConstGroupUse(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13808,7 +13808,7 @@ func TestStmtUse_MixedGroupUse(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13873,7 +13873,7 @@ func TestStmtBreak_Empty(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -13949,7 +13949,7 @@ func TestStmtBreak_Light(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14025,7 +14025,7 @@ func TestStmtBreak(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14101,7 +14101,7 @@ func TestExprArrayDimFetch(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14196,7 +14196,7 @@ func TestExprArrayDimFetch_Nested(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14239,7 +14239,7 @@ func TestExprArray(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14304,7 +14304,7 @@ func TestExprArray_Item(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14422,7 +14422,7 @@ func TestExprArray_Items(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14498,7 +14498,7 @@ func TestExprArray_ItemUnpack(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14563,7 +14563,7 @@ func TestExprArrowFunction(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14651,7 +14651,7 @@ func TestExprArrowFunction_ReturnType(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14714,7 +14714,7 @@ func TestExprBitwiseNot(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14777,7 +14777,7 @@ func TestExprBooleanNot(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14853,7 +14853,7 @@ func TestExprClassConstFetch(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14917,7 +14917,7 @@ func TestExprClassConstFetch_Static(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -14980,7 +14980,7 @@ func TestExprClone_Brackets(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15043,7 +15043,7 @@ func TestExprClone(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15088,7 +15088,7 @@ func TestExprClosure(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15265,7 +15265,7 @@ func TestExprClosure_Use(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15442,7 +15442,7 @@ func TestExprClosure_Use2(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15510,7 +15510,7 @@ func TestExprClosure_ReturnType(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15575,7 +15575,7 @@ func TestExprConstFetch(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15640,7 +15640,7 @@ func TestExprConstFetch_Relative(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15705,7 +15705,7 @@ func TestExprConstFetch_FullyQualified(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15768,7 +15768,7 @@ func TestExprEmpty(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15831,7 +15831,7 @@ func TestExprErrorSuppress(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15894,7 +15894,7 @@ func TestExprEval(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15937,7 +15937,7 @@ func TestExprExit(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -15980,7 +15980,7 @@ func TestExprExit_Empty(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16044,7 +16044,7 @@ func TestExprExit_Expr(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16087,7 +16087,7 @@ func TestExprDie(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16130,7 +16130,7 @@ func TestExprDie_Empty(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16194,7 +16194,7 @@ func TestExprDie_Expr(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16269,7 +16269,7 @@ func TestExprFunctionCall(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16344,7 +16344,7 @@ func TestExprFunctionCall_Relative(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16444,7 +16444,7 @@ func TestExprFunctionCall_FullyQualified(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16562,7 +16562,7 @@ func TestExprFunctionCall_Var(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16693,7 +16693,7 @@ func TestExprFunctionCall_ExprArg(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16756,7 +16756,7 @@ func TestExprPostDec(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16819,7 +16819,7 @@ func TestExprPostInc(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16882,7 +16882,7 @@ func TestExprPreDec(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -16945,7 +16945,7 @@ func TestExprPreInc(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17008,7 +17008,7 @@ func TestExprInclude(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17071,7 +17071,7 @@ func TestExprInclude_Once(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17134,7 +17134,7 @@ func TestExprRequire(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17197,7 +17197,7 @@ func TestExprRequire_Once(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17283,7 +17283,7 @@ func TestExprInstanceOf(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17369,7 +17369,7 @@ func TestExprInstanceOf_Relative(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17455,7 +17455,7 @@ func TestExprInstanceOf_FullyQualified(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17520,7 +17520,7 @@ func TestExprIsset(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17606,7 +17606,7 @@ func TestExprIsset_Variables(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17680,7 +17680,7 @@ func TestExprList_Empty(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17786,7 +17786,7 @@ func TestExprList(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -17902,7 +17902,7 @@ func TestExprList_ArrayIndex(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18030,7 +18030,7 @@ func TestExprList_List(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18137,7 +18137,7 @@ func TestExprList_EmptyItem(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18246,7 +18246,7 @@ func TestExprList_EmptyItems(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18330,7 +18330,7 @@ func TestExprMethodCall(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18395,7 +18395,7 @@ func TestExprNew(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18470,7 +18470,7 @@ func TestExprNew_Relative(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18545,7 +18545,7 @@ func TestExprNew_FullyQualified(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18676,7 +18676,7 @@ func TestExprNew_Anonymous(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18739,7 +18739,7 @@ func TestExprPrint(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18813,7 +18813,7 @@ func TestExprPropertyFetch(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -18930,7 +18930,7 @@ func TestExprReference_ForeachWithRef(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19006,7 +19006,7 @@ func TestExprShellExec(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19049,7 +19049,7 @@ func TestExprShortArray(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19114,7 +19114,7 @@ func TestExprShortArray_Item(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19232,7 +19232,7 @@ func TestExprShortArray_Items(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19338,7 +19338,7 @@ func TestExprShortList(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19454,7 +19454,7 @@ func TestExprShortList_ArrayIndex(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19582,7 +19582,7 @@ func TestExprShortList_List(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19668,7 +19668,7 @@ func TestExprStaticCall(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19754,7 +19754,7 @@ func TestExprStaticCall_Relative(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19840,7 +19840,7 @@ func TestExprStaticCall_FullyQualified(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19936,7 +19936,7 @@ func TestExprStaticCall_Var(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20030,7 +20030,7 @@ func TestExprStaticCall_VarVar(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20116,7 +20116,7 @@ func TestExprStaticPropertyFetch(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20202,7 +20202,7 @@ func TestExprStaticPropertyFetch_Relative(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20288,7 +20288,7 @@ func TestExprStaticPropertyFetch_FullyQualified(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20393,7 +20393,7 @@ func TestExprTernary(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20477,7 +20477,7 @@ func TestExprTernary_Simple(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20634,7 +20634,7 @@ func TestExprTernary_NestedTrue(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20791,7 +20791,7 @@ func TestExprTernary_NestedCond(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20854,7 +20854,7 @@ func TestExprUnaryMinus(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20917,7 +20917,7 @@ func TestExprUnaryPlus(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20970,7 +20970,7 @@ func TestExprVariable(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21033,7 +21033,7 @@ func TestExprVariable_Variable(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21075,7 +21075,7 @@ func TestExprYield(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21138,7 +21138,7 @@ func TestExprYield_Val(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21222,7 +21222,7 @@ func TestExprYield_KeyVal(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21275,7 +21275,7 @@ func TestExprYield_Expr(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21349,7 +21349,7 @@ func TestExprYield_KeyExpr(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21412,7 +21412,7 @@ func TestExprYieldFrom(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21498,7 +21498,7 @@ func TestExprAssign_Assign(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21582,7 +21582,7 @@ func TestExprAssign_Reference(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21678,7 +21678,7 @@ func TestExprAssign_ReferenceNew(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21819,7 +21819,7 @@ func TestExprAssign_ReferenceArgs(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21903,7 +21903,7 @@ func TestExprAssign_BitwiseAnd(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -21987,7 +21987,7 @@ func TestExprAssign_BitwiseOr(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22071,7 +22071,7 @@ func TestExprAssign_BitwiseXor(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22155,7 +22155,7 @@ func TestExprAssign_Concat(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22239,7 +22239,7 @@ func TestExprAssign_Div(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22323,7 +22323,7 @@ func TestExprAssign_Minus(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22407,7 +22407,7 @@ func TestExprAssign_Mod(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22491,7 +22491,7 @@ func TestExprAssign_Mul(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22575,7 +22575,7 @@ func TestExprAssign_Plus(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22659,7 +22659,7 @@ func TestExprAssign_Pow(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22743,7 +22743,7 @@ func TestExprAssign_ShiftLeft(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22827,7 +22827,7 @@ func TestExprAssign_ShiftRight(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22911,7 +22911,7 @@ func TestExprAssign_Coalesce(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -22997,7 +22997,7 @@ func TestExprBinary_BitwiseAnd(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23081,7 +23081,7 @@ func TestExprBinary_BitwiseOr(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23165,7 +23165,7 @@ func TestExprBinary_BitwiseXor(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23249,7 +23249,7 @@ func TestExprBinary_BooleanAnd(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23333,7 +23333,7 @@ func TestExprBinary_BooleanOr(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23417,7 +23417,7 @@ func TestExprBinary_Coalesce(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23501,7 +23501,7 @@ func TestExprBinary_Concat(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23585,7 +23585,7 @@ func TestExprBinary_Div(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23669,7 +23669,7 @@ func TestExprBinary_Equal(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23753,7 +23753,7 @@ func TestExprBinary_GreaterOrEqual(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23837,7 +23837,7 @@ func TestExprBinary_Greater(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -23921,7 +23921,7 @@ func TestExprBinary_Identical(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24005,7 +24005,7 @@ func TestExprBinary_LogicalAnd(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24089,7 +24089,7 @@ func TestExprBinary_LogicalOr(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24173,7 +24173,7 @@ func TestExprBinary_LogicalXor(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24257,7 +24257,7 @@ func TestExprBinary_Minus(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24341,7 +24341,7 @@ func TestExprBinary_Mod(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24425,7 +24425,7 @@ func TestExprBinary_Mul(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24509,7 +24509,7 @@ func TestExprBinary_NotEqual(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24593,7 +24593,7 @@ func TestExprBinary_NotIdentical(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24677,7 +24677,7 @@ func TestExprBinary_Plus(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24761,7 +24761,7 @@ func TestExprBinary_Pow(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24845,7 +24845,7 @@ func TestExprBinary_ShiftLeft(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -24929,7 +24929,7 @@ func TestExprBinary_ShiftRight(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25013,7 +25013,7 @@ func TestExprBinary_SmallerOrEqual(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25097,7 +25097,7 @@ func TestExprBinary_Smaller(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25181,7 +25181,7 @@ func TestExprBinary_Spaceship(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25246,7 +25246,7 @@ func TestExprCast_Array(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25309,7 +25309,7 @@ func TestExprCast_Bool(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25372,7 +25372,7 @@ func TestExprCast_BoolShort(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25435,7 +25435,7 @@ func TestExprCast_Double(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25498,7 +25498,7 @@ func TestExprCast_CastFloat(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25561,7 +25561,7 @@ func TestExprCast_Int(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25624,7 +25624,7 @@ func TestExprCast_IntShort(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25687,7 +25687,7 @@ func TestExprCast_Object(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25750,7 +25750,7 @@ func TestExprCast_String(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25813,7 +25813,7 @@ func TestExprCast_BinaryString(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -25876,7 +25876,7 @@ func TestExprCast_Unset(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) diff --git a/internal/php7/php7_bench_test.go b/internal/php7/php7_bench_test.go index a5a9aee..8058be7 100644 --- a/internal/php7/php7_bench_test.go +++ b/internal/php7/php7_bench_test.go @@ -381,7 +381,7 @@ CAD; ` for n := 0; n < b.N; n++ { - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() } } diff --git a/internal/php7/php7_test.go b/internal/php7/php7_test.go index 5e0268a..7b78b29 100644 --- a/internal/php7/php7_test.go +++ b/internal/php7/php7_test.go @@ -19633,7 +19633,7 @@ func TestPhp7(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19770,7 +19770,7 @@ func TestPhp5Strings(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -19996,7 +19996,7 @@ CAD; }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetRootNode() assert.DeepEqual(t, expected, actual) @@ -20016,7 +20016,7 @@ func TestPhp7ControlCharsErrors(t *testing.T) { }, } - php7parser := php7.NewParser([]byte(src), "7.4") + php7parser := php7.NewParser([]byte(src), "7.4", false) php7parser.Parse() actual := php7parser.GetErrors() assert.DeepEqual(t, expected, actual) diff --git a/internal/scanner/lexer.go b/internal/scanner/lexer.go index 60aaec9..4b242d3 100644 --- a/internal/scanner/lexer.go +++ b/internal/scanner/lexer.go @@ -13,37 +13,42 @@ import ( type Scanner interface { Lex() *Token ReturnTokenToPool(t *Token) - GetWithHiddenTokens() bool - SetWithHiddenTokens(bool) +} + +type Config struct { + WithHiddenTokens bool + ErrHandlerFunc func(*errors.Error) } type Lexer struct { - data []byte - errHandlerFunc func(*errors.Error) + data []byte + phpVersion string + withHiddenTokens bool + errHandlerFunc func(*errors.Error) + + p, pe, cs int + ts, te, act int + stack []int + top int - p, pe, cs int - ts, te, act int - stack []int - top int heredocLabel []byte - - TokenPool *TokenPool - HiddenTokens []token.Token - WithHiddenTokens bool - NewLines NewLines - PHPVersion string + tokenPool *TokenPool + hiddenTokens []token.Token + newLines NewLines } -func NewLexer(data []byte, errHandlerFunc func(*errors.Error)) *Lexer { +func NewLexer(data []byte, phpVersion string, config Config) *Lexer { lex := &Lexer{ - data: data, - errHandlerFunc: errHandlerFunc, + data: data, + phpVersion: phpVersion, + errHandlerFunc: config.ErrHandlerFunc, + withHiddenTokens: config.WithHiddenTokens, pe: len(data), stack: make([]int, 0), - TokenPool: &TokenPool{}, - NewLines: NewLines{make([]int, 0, 128)}, + tokenPool: &TokenPool{}, + newLines: NewLines{make([]int, 0, 128)}, } initLexer(lex) @@ -51,31 +56,23 @@ func NewLexer(data []byte, errHandlerFunc func(*errors.Error)) *Lexer { return lex } -func (l *Lexer) ReturnTokenToPool(t *Token) { - l.TokenPool.Put(t) -} - -func (l *Lexer) GetWithHiddenTokens() bool { - return l.WithHiddenTokens -} - -func (l *Lexer) SetWithHiddenTokens(b bool) { - l.WithHiddenTokens = b +func (lex *Lexer) ReturnTokenToPool(t *Token) { + lex.tokenPool.Put(t) } func (lex *Lexer) setTokenPosition(token *Token) { - token.Position.StartLine = lex.NewLines.GetLine(lex.ts) - token.Position.EndLine = lex.NewLines.GetLine(lex.te - 1) + token.Position.StartLine = lex.newLines.GetLine(lex.ts) + token.Position.EndLine = lex.newLines.GetLine(lex.te - 1) token.Position.StartPos = lex.ts token.Position.EndPos = lex.te } -func (lex *Lexer) addToken(id TokenID, ps, pe int) { - if !lex.WithHiddenTokens { +func (lex *Lexer) addHiddenToken(id TokenID, ps, pe int) { + if !lex.withHiddenTokens { return } - lex.HiddenTokens = append(lex.HiddenTokens, token.Token{ + lex.hiddenTokens = append(lex.hiddenTokens, token.Token{ ID: token.ID(id), Value: lex.data[ps:pe], }) @@ -112,7 +109,7 @@ func (lex *Lexer) isNotStringEnd(s byte) bool { } func (lex *Lexer) isHeredocEnd(p int) bool { - r, err := version.Compare(lex.PHPVersion, "7.3") + r, err := version.Compare(lex.phpVersion, "7.3") if err != nil { return lex.isHeredocEndSince73(p) } @@ -239,8 +236,8 @@ func (lex *Lexer) error(msg string) { } pos := position.NewPosition( - lex.NewLines.GetLine(lex.ts), - lex.NewLines.GetLine(lex.te-1), + lex.newLines.GetLine(lex.ts), + lex.newLines.GetLine(lex.te-1), lex.ts, lex.te, ) diff --git a/internal/scanner/scanner.go b/internal/scanner/scanner.go index 576f19a..0a3ecd8 100644 --- a/internal/scanner/scanner.go +++ b/internal/scanner/scanner.go @@ -33,7 +33,7 @@ const lexer_en_halt_compiller_end int = 526 func initLexer(lex *Lexer) { - // line internal/scanner/scanner.go:41 +// line internal/scanner/scanner.go:41 { lex.cs = lexer_start lex.top = 0 @@ -42,15 +42,15 @@ func initLexer(lex *Lexer) { lex.act = 0 } - // line internal/scanner/scanner.rl:19 +// line internal/scanner/scanner.rl:19 } func (lex *Lexer) Lex() *Token { - lex.HiddenTokens = nil + lex.hiddenTokens = nil eof := lex.pe var tok TokenID - token := lex.TokenPool.Get() + token := lex.tokenPool.Get() token.Hidden = nil token.Value = lex.data[0:0] @@ -59,7 +59,7 @@ func (lex *Lexer) Lex() *Token { _, _ = lblStart, lblEnd - // line internal/scanner/scanner.go:68 +// line internal/scanner/scanner.go:68 { var _widec int16 if (lex.p) == (lex.pe) { @@ -2196,7 +2196,7 @@ func (lex *Lexer) Lex() *Token { goto st_out tr0: lex.cs = 111 - // line internal/scanner/scanner.rl:130 +// line internal/scanner/scanner.rl:130 (lex.p) = (lex.te) - 1 { lex.cs = 114 @@ -2205,7 +2205,7 @@ func (lex *Lexer) Lex() *Token { goto _again tr162: lex.cs = 111 - // line internal/scanner/scanner.rl:130 +// line internal/scanner/scanner.rl:130 lex.te = (lex.p) + 1 { lex.cs = 114 @@ -2214,7 +2214,7 @@ func (lex *Lexer) Lex() *Token { goto _again tr164: lex.cs = 111 - // line internal/scanner/scanner.rl:130 +// line internal/scanner/scanner.rl:130 lex.te = (lex.p) (lex.p)-- { @@ -2223,33 +2223,33 @@ func (lex *Lexer) Lex() *Token { } goto _again tr165: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:127 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:127 lex.te = (lex.p) (lex.p)-- { - lex.addToken(T_COMMENT, lex.ts, lex.te) + lex.addHiddenToken(T_COMMENT, lex.ts, lex.te) } goto st111 st111: - // line NONE:1 +// line NONE:1 lex.ts = 0 if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof111 } st_case_111: - // line NONE:1 +// line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:2252 +// line internal/scanner/scanner.go:2252 if lex.data[(lex.p)] == 35 { goto tr163 } goto tr162 tr163: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st112 @@ -2258,7 +2258,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof112 } st_case_112: - // line internal/scanner/scanner.go:2267 +// line internal/scanner/scanner.go:2267 if lex.data[(lex.p)] == 33 { goto st1 } @@ -2280,25 +2280,25 @@ func (lex *Lexer) Lex() *Token { goto tr165 tr3: lex.cs = 114 - // line internal/scanner/scanner.rl:143 +// line internal/scanner/scanner.rl:143 (lex.p) = (lex.te) - 1 { - lex.addToken(T_OPEN_TAG, lex.ts, lex.te) + lex.addHiddenToken(T_OPEN_TAG, lex.ts, lex.te) lex.cs = 121 } goto _again tr6: lex.cs = 114 - // line internal/scanner/scanner.rl:147 +// line internal/scanner/scanner.rl:147 lex.te = (lex.p) + 1 { lex.ungetCnt(lex.te - lex.ts - 5) - lex.addToken(T_OPEN_TAG, lex.ts, lex.ts+5) + lex.addHiddenToken(T_OPEN_TAG, lex.ts, lex.ts+5) lex.cs = 121 } goto _again tr169: - // line internal/scanner/scanner.rl:137 +// line internal/scanner/scanner.rl:137 lex.te = (lex.p) (lex.p)-- { @@ -2313,9 +2313,9 @@ func (lex *Lexer) Lex() *Token { } goto st114 tr171: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:137 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:137 lex.te = (lex.p) (lex.p)-- { @@ -2331,17 +2331,17 @@ func (lex *Lexer) Lex() *Token { goto st114 tr176: lex.cs = 114 - // line internal/scanner/scanner.rl:143 +// line internal/scanner/scanner.rl:143 lex.te = (lex.p) (lex.p)-- { - lex.addToken(T_OPEN_TAG, lex.ts, lex.te) + lex.addHiddenToken(T_OPEN_TAG, lex.ts, lex.te) lex.cs = 121 } goto _again tr177: lex.cs = 114 - // line internal/scanner/scanner.rl:152 +// line internal/scanner/scanner.rl:152 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -2355,29 +2355,29 @@ func (lex *Lexer) Lex() *Token { goto _again tr179: lex.cs = 114 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:147 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:147 lex.te = (lex.p) (lex.p)-- { lex.ungetCnt(lex.te - lex.ts - 5) - lex.addToken(T_OPEN_TAG, lex.ts, lex.ts+5) + lex.addHiddenToken(T_OPEN_TAG, lex.ts, lex.ts+5) lex.cs = 121 } goto _again st114: - // line NONE:1 +// line NONE:1 lex.ts = 0 if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof114 } st_case_114: - // line NONE:1 +// line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:2375 +// line internal/scanner/scanner.go:2375 switch lex.data[(lex.p)] { case 10: goto st116 @@ -2386,15 +2386,15 @@ func (lex *Lexer) Lex() *Token { } goto st115 tr172: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st115 st115: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof115 } st_case_115: - // line internal/scanner/scanner.go:2392 +// line internal/scanner/scanner.go:2392 switch lex.data[(lex.p)] { case 10: goto st116 @@ -2403,15 +2403,15 @@ func (lex *Lexer) Lex() *Token { } goto st115 tr173: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st116 st116: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof116 } st_case_116: - // line internal/scanner/scanner.go:2409 +// line internal/scanner/scanner.go:2409 switch lex.data[(lex.p)] { case 10: goto tr173 @@ -2420,15 +2420,15 @@ func (lex *Lexer) Lex() *Token { } goto tr172 tr174: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st117 st117: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof117 } st_case_117: - // line internal/scanner/scanner.go:2426 +// line internal/scanner/scanner.go:2426 switch lex.data[(lex.p)] { case 10: goto st116 @@ -2453,7 +2453,7 @@ func (lex *Lexer) Lex() *Token { } goto st115 tr175: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st119 @@ -2462,7 +2462,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof119 } st_case_119: - // line internal/scanner/scanner.go:2460 +// line internal/scanner/scanner.go:2460 switch lex.data[(lex.p)] { case 61: goto tr177 @@ -2528,15 +2528,15 @@ func (lex *Lexer) Lex() *Token { } goto tr3 tr9: - // line internal/scanner/scanner.rl:161 +// line internal/scanner/scanner.rl:161 (lex.p) = (lex.te) - 1 { - lex.addToken(T_WHITESPACE, lex.ts, lex.te) + lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te) } goto st121 tr11: lex.cs = 121 - // line NONE:1 +// line NONE:1 switch lex.act { case 10: { @@ -3348,7 +3348,7 @@ func (lex *Lexer) Lex() *Token { goto _again tr14: - // line internal/scanner/scanner.rl:351 +// line internal/scanner/scanner.rl:351 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3361,7 +3361,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr18: - // line internal/scanner/scanner.rl:374 +// line internal/scanner/scanner.rl:374 (lex.p) = (lex.te) - 1 { c := lex.data[lex.p] @@ -3369,7 +3369,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr22: - // line internal/scanner/scanner.rl:336 +// line internal/scanner/scanner.rl:336 (lex.p) = (lex.te) - 1 { // rune, _ := utf8.DecodeRune(lex.data[lex.ts:lex.te]); @@ -3384,7 +3384,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr37: - // line internal/scanner/scanner.rl:311 +// line internal/scanner/scanner.rl:311 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3397,7 +3397,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr44: - // line internal/scanner/scanner.rl:316 +// line internal/scanner/scanner.rl:316 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3410,7 +3410,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr48: - // line internal/scanner/scanner.rl:312 +// line internal/scanner/scanner.rl:312 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3423,7 +3423,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr56: - // line internal/scanner/scanner.rl:313 +// line internal/scanner/scanner.rl:313 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3436,7 +3436,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr63: - // line internal/scanner/scanner.rl:314 +// line internal/scanner/scanner.rl:314 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3449,7 +3449,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr72: - // line internal/scanner/scanner.rl:315 +// line internal/scanner/scanner.rl:315 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3462,7 +3462,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr83: - // line internal/scanner/scanner.rl:317 +// line internal/scanner/scanner.rl:317 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3475,7 +3475,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr84: - // line internal/scanner/scanner.rl:279 +// line internal/scanner/scanner.rl:279 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3488,7 +3488,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr87: - // line internal/scanner/scanner.rl:165 +// line internal/scanner/scanner.rl:165 (lex.p) = (lex.te) - 1 { lex.setTokenPosition(token) @@ -3501,7 +3501,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr95: - // line internal/scanner/scanner.rl:323 +// line internal/scanner/scanner.rl:323 lex.te = (lex.p) + 1 { isDocComment := false @@ -3510,14 +3510,14 @@ func (lex *Lexer) Lex() *Token { } if isDocComment { - lex.addToken(T_DOC_COMMENT, lex.ts, lex.te) + lex.addHiddenToken(T_DOC_COMMENT, lex.ts, lex.te) } else { - lex.addToken(T_COMMENT, lex.ts, lex.te) + lex.addHiddenToken(T_COMMENT, lex.ts, lex.te) } } goto st121 tr96: - // line internal/scanner/scanner.rl:176 +// line internal/scanner/scanner.rl:176 (lex.p) = (lex.te) - 1 { base := 10 @@ -3549,7 +3549,7 @@ func (lex *Lexer) Lex() *Token { goto st121 tr109: lex.cs = 121 - // line internal/scanner/scanner.rl:163 +// line internal/scanner/scanner.rl:163 (lex.p) = (lex.te) - 1 { lex.setTokenPosition(token) @@ -3563,7 +3563,7 @@ func (lex *Lexer) Lex() *Token { goto _again tr125: lex.cs = 121 - // line internal/scanner/scanner.rl:162 +// line internal/scanner/scanner.rl:162 (lex.p) = (lex.te) - 1 { lex.setTokenPosition(token) @@ -3576,7 +3576,7 @@ func (lex *Lexer) Lex() *Token { } goto _again tr127: - // line internal/scanner/scanner.rl:347 +// line internal/scanner/scanner.rl:347 (lex.p) = (lex.te) - 1 { lex.setTokenPosition(token) @@ -3589,7 +3589,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr129: - // line internal/scanner/scanner.rl:260 +// line internal/scanner/scanner.rl:260 (lex.p) = (lex.te) - 1 { lex.setTokenPosition(token) @@ -3602,7 +3602,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr140: - // line internal/scanner/scanner.rl:259 +// line internal/scanner/scanner.rl:259 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3615,7 +3615,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr180: - // line internal/scanner/scanner.rl:374 +// line internal/scanner/scanner.rl:374 lex.te = (lex.p) + 1 { c := lex.data[lex.p] @@ -3623,7 +3623,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr191: - // line internal/scanner/scanner.rl:336 +// line internal/scanner/scanner.rl:336 lex.te = (lex.p) + 1 { // rune, _ := utf8.DecodeRune(lex.data[lex.ts:lex.te]); @@ -3638,7 +3638,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr225: - // line internal/scanner/scanner.rl:278 +// line internal/scanner/scanner.rl:278 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3652,7 +3652,7 @@ func (lex *Lexer) Lex() *Token { goto st121 tr228: lex.cs = 121 - // line internal/scanner/scanner.rl:371 +// line internal/scanner/scanner.rl:371 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3665,7 +3665,7 @@ func (lex *Lexer) Lex() *Token { } goto _again tr229: - // line internal/scanner/scanner.rl:344 +// line internal/scanner/scanner.rl:344 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3675,7 +3675,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr231: - // line internal/scanner/scanner.rl:345 +// line internal/scanner/scanner.rl:345 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3685,25 +3685,25 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr232: - // line internal/scanner/scanner.rl:161 +// line internal/scanner/scanner.rl:161 lex.te = (lex.p) (lex.p)-- { - lex.addToken(T_WHITESPACE, lex.ts, lex.te) + lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te) } goto st121 tr234: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:161 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:161 lex.te = (lex.p) (lex.p)-- { - lex.addToken(T_WHITESPACE, lex.ts, lex.te) + lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te) } goto st121 tr238: - // line internal/scanner/scanner.rl:374 +// line internal/scanner/scanner.rl:374 lex.te = (lex.p) (lex.p)-- { @@ -3712,7 +3712,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr239: - // line internal/scanner/scanner.rl:336 +// line internal/scanner/scanner.rl:336 lex.te = (lex.p) (lex.p)-- { @@ -3728,7 +3728,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr241: - // line internal/scanner/scanner.rl:297 +// line internal/scanner/scanner.rl:297 lex.te = (lex.p) (lex.p)-- { @@ -3742,7 +3742,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr242: - // line internal/scanner/scanner.rl:298 +// line internal/scanner/scanner.rl:298 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3756,7 +3756,7 @@ func (lex *Lexer) Lex() *Token { goto st121 tr243: lex.cs = 121 - // line internal/scanner/scanner.rl:372 +// line internal/scanner/scanner.rl:372 lex.te = (lex.p) (lex.p)-- { @@ -3770,27 +3770,27 @@ func (lex *Lexer) Lex() *Token { } goto _again tr244: - // line internal/scanner/scanner.rl:319 +// line internal/scanner/scanner.rl:319 lex.te = (lex.p) (lex.p)-- { lex.ungetStr("?>") - lex.addToken(T_COMMENT, lex.ts, lex.te) + lex.addHiddenToken(T_COMMENT, lex.ts, lex.te) } goto st121 tr246: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:319 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:319 lex.te = (lex.p) (lex.p)-- { lex.ungetStr("?>") - lex.addToken(T_COMMENT, lex.ts, lex.te) + lex.addHiddenToken(T_COMMENT, lex.ts, lex.te) } goto st121 tr250: - // line internal/scanner/scanner.rl:346 +// line internal/scanner/scanner.rl:346 lex.te = (lex.p) (lex.p)-- { @@ -3804,7 +3804,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr251: - // line internal/scanner/scanner.rl:292 +// line internal/scanner/scanner.rl:292 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3817,7 +3817,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr252: - // line internal/scanner/scanner.rl:281 +// line internal/scanner/scanner.rl:281 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3830,7 +3830,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr253: - // line internal/scanner/scanner.rl:283 +// line internal/scanner/scanner.rl:283 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3843,7 +3843,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr255: - // line internal/scanner/scanner.rl:286 +// line internal/scanner/scanner.rl:286 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3856,7 +3856,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr256: - // line internal/scanner/scanner.rl:305 +// line internal/scanner/scanner.rl:305 lex.te = (lex.p) (lex.p)-- { @@ -3870,7 +3870,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr257: - // line internal/scanner/scanner.rl:287 +// line internal/scanner/scanner.rl:287 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3883,7 +3883,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr258: - // line internal/scanner/scanner.rl:294 +// line internal/scanner/scanner.rl:294 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3896,7 +3896,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr259: - // line internal/scanner/scanner.rl:289 +// line internal/scanner/scanner.rl:289 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3909,7 +3909,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr260: - // line internal/scanner/scanner.rl:293 +// line internal/scanner/scanner.rl:293 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3922,7 +3922,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr261: - // line internal/scanner/scanner.rl:290 +// line internal/scanner/scanner.rl:290 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3936,7 +3936,7 @@ func (lex *Lexer) Lex() *Token { goto st121 tr262: lex.cs = 121 - // line internal/scanner/scanner.rl:349 +// line internal/scanner/scanner.rl:349 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3949,7 +3949,7 @@ func (lex *Lexer) Lex() *Token { } goto _again tr264: - // line internal/scanner/scanner.rl:285 +// line internal/scanner/scanner.rl:285 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3962,7 +3962,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr265: - // line internal/scanner/scanner.rl:165 +// line internal/scanner/scanner.rl:165 lex.te = (lex.p) (lex.p)-- { @@ -3976,7 +3976,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr268: - // line internal/scanner/scanner.rl:288 +// line internal/scanner/scanner.rl:288 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3989,7 +3989,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr269: - // line internal/scanner/scanner.rl:176 +// line internal/scanner/scanner.rl:176 lex.te = (lex.p) (lex.p)-- { @@ -4021,7 +4021,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr274: - // line internal/scanner/scanner.rl:166 +// line internal/scanner/scanner.rl:166 lex.te = (lex.p) (lex.p)-- { @@ -4048,7 +4048,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr275: - // line internal/scanner/scanner.rl:191 +// line internal/scanner/scanner.rl:191 lex.te = (lex.p) (lex.p)-- { @@ -4075,7 +4075,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr276: - // line internal/scanner/scanner.rl:280 +// line internal/scanner/scanner.rl:280 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -4089,7 +4089,7 @@ func (lex *Lexer) Lex() *Token { goto st121 tr277: lex.cs = 121 - // line internal/scanner/scanner.rl:163 +// line internal/scanner/scanner.rl:163 lex.te = (lex.p) (lex.p)-- { @@ -4104,9 +4104,9 @@ func (lex *Lexer) Lex() *Token { goto _again tr279: lex.cs = 121 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:163 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:163 lex.te = (lex.p) (lex.p)-- { @@ -4120,7 +4120,7 @@ func (lex *Lexer) Lex() *Token { } goto _again tr282: - // line internal/scanner/scanner.rl:297 +// line internal/scanner/scanner.rl:297 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -4133,7 +4133,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr283: - // line internal/scanner/scanner.rl:306 +// line internal/scanner/scanner.rl:306 lex.te = (lex.p) (lex.p)-- { @@ -4147,7 +4147,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr284: - // line internal/scanner/scanner.rl:301 +// line internal/scanner/scanner.rl:301 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -4161,9 +4161,9 @@ func (lex *Lexer) Lex() *Token { goto st121 tr285: lex.cs = 121 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:357 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:357 lex.te = (lex.p) (lex.p)-- { @@ -4185,7 +4185,7 @@ func (lex *Lexer) Lex() *Token { } goto _again tr286: - // line internal/scanner/scanner.rl:304 +// line internal/scanner/scanner.rl:304 lex.te = (lex.p) (lex.p)-- { @@ -4199,7 +4199,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr287: - // line internal/scanner/scanner.rl:296 +// line internal/scanner/scanner.rl:296 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -4212,7 +4212,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr289: - // line internal/scanner/scanner.rl:295 +// line internal/scanner/scanner.rl:295 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -4225,7 +4225,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr290: - // line internal/scanner/scanner.rl:299 +// line internal/scanner/scanner.rl:299 lex.te = (lex.p) (lex.p)-- { @@ -4239,7 +4239,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr291: - // line internal/scanner/scanner.rl:300 +// line internal/scanner/scanner.rl:300 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -4252,7 +4252,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr292: - // line internal/scanner/scanner.rl:303 +// line internal/scanner/scanner.rl:303 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -4265,7 +4265,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr294: - // line internal/scanner/scanner.rl:307 +// line internal/scanner/scanner.rl:307 lex.te = (lex.p) (lex.p)-- { @@ -4279,7 +4279,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr295: - // line internal/scanner/scanner.rl:302 +// line internal/scanner/scanner.rl:302 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -4293,7 +4293,7 @@ func (lex *Lexer) Lex() *Token { goto st121 tr298: lex.cs = 121 - // line internal/scanner/scanner.rl:162 +// line internal/scanner/scanner.rl:162 lex.te = (lex.p) (lex.p)-- { @@ -4308,9 +4308,9 @@ func (lex *Lexer) Lex() *Token { goto _again tr300: lex.cs = 121 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:162 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:162 lex.te = (lex.p) (lex.p)-- { @@ -4324,7 +4324,7 @@ func (lex *Lexer) Lex() *Token { } goto _again tr301: - // line internal/scanner/scanner.rl:308 +// line internal/scanner/scanner.rl:308 lex.te = (lex.p) (lex.p)-- { @@ -4338,7 +4338,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr302: - // line internal/scanner/scanner.rl:309 +// line internal/scanner/scanner.rl:309 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -4351,7 +4351,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr303: - // line internal/scanner/scanner.rl:347 +// line internal/scanner/scanner.rl:347 lex.te = (lex.p) (lex.p)-- { @@ -4365,7 +4365,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr383: - // line internal/scanner/scanner.rl:217 +// line internal/scanner/scanner.rl:217 lex.te = (lex.p) (lex.p)-- { @@ -4379,7 +4379,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr403: - // line internal/scanner/scanner.rl:221 +// line internal/scanner/scanner.rl:221 lex.te = (lex.p) (lex.p)-- { @@ -4393,7 +4393,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr432: - // line internal/scanner/scanner.rl:229 +// line internal/scanner/scanner.rl:229 lex.te = (lex.p) (lex.p)-- { @@ -4407,7 +4407,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr436: - // line internal/scanner/scanner.rl:231 +// line internal/scanner/scanner.rl:231 lex.te = (lex.p) (lex.p)-- { @@ -4421,7 +4421,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr468: - // line internal/scanner/scanner.rl:261 +// line internal/scanner/scanner.rl:261 lex.te = (lex.p) (lex.p)-- { @@ -4435,7 +4435,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr536: - // line internal/scanner/scanner.rl:263 +// line internal/scanner/scanner.rl:263 lex.te = (lex.p) (lex.p)-- { @@ -4449,7 +4449,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr582: - // line internal/scanner/scanner.rl:260 +// line internal/scanner/scanner.rl:260 lex.te = (lex.p) (lex.p)-- { @@ -4463,7 +4463,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr587: - // line internal/scanner/scanner.rl:291 +// line internal/scanner/scanner.rl:291 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -4476,7 +4476,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr661: - // line internal/scanner/scanner.rl:284 +// line internal/scanner/scanner.rl:284 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -4489,7 +4489,7 @@ func (lex *Lexer) Lex() *Token { } goto st121 tr662: - // line internal/scanner/scanner.rl:282 +// line internal/scanner/scanner.rl:282 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -4502,17 +4502,17 @@ func (lex *Lexer) Lex() *Token { } goto st121 st121: - // line NONE:1 +// line NONE:1 lex.ts = 0 if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof121 } st_case_121: - // line NONE:1 +// line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:3377 +// line internal/scanner/scanner.go:3377 switch lex.data[(lex.p)] { case 10: goto tr10 @@ -4689,23 +4689,23 @@ func (lex *Lexer) Lex() *Token { } goto tr211 tr181: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st122 tr235: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st122 st122: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof122 } st_case_122: - // line internal/scanner/scanner.go:3570 +// line internal/scanner/scanner.go:3570 switch lex.data[(lex.p)] { case 10: goto tr10 @@ -4719,23 +4719,23 @@ func (lex *Lexer) Lex() *Token { } goto tr232 tr10: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st123 tr236: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st123 st123: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof123 } st_case_123: - // line internal/scanner/scanner.go:3600 +// line internal/scanner/scanner.go:3600 switch lex.data[(lex.p)] { case 10: goto tr236 @@ -4749,15 +4749,15 @@ func (lex *Lexer) Lex() *Token { } goto tr234 tr237: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st6 st6: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof6 } st_case_6: - // line internal/scanner/scanner.go:3622 +// line internal/scanner/scanner.go:3622 if lex.data[(lex.p)] == 10 { goto tr10 } @@ -4790,10 +4790,10 @@ func (lex *Lexer) Lex() *Token { } goto tr241 tr184: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:372 +// line internal/scanner/scanner.rl:372 lex.act = 140 goto st127 st127: @@ -4801,7 +4801,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof127 } st_case_127: - // line internal/scanner/scanner.go:3666 +// line internal/scanner/scanner.go:3666 switch lex.data[(lex.p)] { case 10: goto tr13 @@ -4818,14 +4818,14 @@ func (lex *Lexer) Lex() *Token { } goto st7 tr13: - // line internal/scanner/scanner.rl:39 +// line internal/scanner/scanner.rl:39 if lex.data[lex.p] == '\n' { - lex.NewLines.Append(lex.p) + lex.newLines.Append(lex.p) } if lex.data[lex.p] == '\r' && lex.data[lex.p+1] != '\n' { - lex.NewLines.Append(lex.p) + lex.newLines.Append(lex.p) } goto st7 @@ -4834,7 +4834,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof7 } st_case_7: - // line internal/scanner/scanner.go:3699 +// line internal/scanner/scanner.go:3699 switch lex.data[(lex.p)] { case 10: goto tr13 @@ -4911,15 +4911,15 @@ func (lex *Lexer) Lex() *Token { } goto st7 tr247: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st128 st128: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof128 } st_case_128: - // line internal/scanner/scanner.go:3784 +// line internal/scanner/scanner.go:3784 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -4966,15 +4966,15 @@ func (lex *Lexer) Lex() *Token { } goto tr244 tr248: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st129 st129: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof129 } st_case_129: - // line internal/scanner/scanner.go:3839 +// line internal/scanner/scanner.go:3839 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -5089,7 +5089,7 @@ func (lex *Lexer) Lex() *Token { } goto tr239 tr189: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st134 @@ -5098,7 +5098,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof134 } st_case_134: - // line internal/scanner/scanner.go:3963 +// line internal/scanner/scanner.go:3963 switch lex.data[(lex.p)] { case 10: goto tr20 @@ -5111,14 +5111,14 @@ func (lex *Lexer) Lex() *Token { } goto st11 tr20: - // line internal/scanner/scanner.rl:39 +// line internal/scanner/scanner.rl:39 if lex.data[lex.p] == '\n' { - lex.NewLines.Append(lex.p) + lex.newLines.Append(lex.p) } if lex.data[lex.p] == '\r' && lex.data[lex.p+1] != '\n' { - lex.NewLines.Append(lex.p) + lex.newLines.Append(lex.p) } goto st11 @@ -5127,7 +5127,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof11 } st_case_11: - // line internal/scanner/scanner.go:3992 +// line internal/scanner/scanner.go:3992 switch lex.data[(lex.p)] { case 10: goto tr20 @@ -5152,7 +5152,7 @@ func (lex *Lexer) Lex() *Token { } goto st11 tr190: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st135 @@ -5161,7 +5161,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof135 } st_case_135: - // line internal/scanner/scanner.go:4026 +// line internal/scanner/scanner.go:4026 switch lex.data[(lex.p)] { case 9: goto st13 @@ -6000,7 +6000,7 @@ func (lex *Lexer) Lex() *Token { } goto tr239 tr195: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st140 @@ -6009,7 +6009,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof140 } st_case_140: - // line internal/scanner/scanner.go:4874 +// line internal/scanner/scanner.go:4874 switch lex.data[(lex.p)] { case 46: goto st67 @@ -6030,10 +6030,10 @@ func (lex *Lexer) Lex() *Token { } goto tr22 tr88: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:165 +// line internal/scanner/scanner.rl:165 lex.act = 10 goto st141 st141: @@ -6041,7 +6041,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof141 } st_case_141: - // line internal/scanner/scanner.go:4906 +// line internal/scanner/scanner.go:4906 switch lex.data[(lex.p)] { case 69: goto st68 @@ -6079,10 +6079,10 @@ func (lex *Lexer) Lex() *Token { } goto tr11 tr86: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:165 +// line internal/scanner/scanner.rl:165 lex.act = 10 goto st142 st142: @@ -6090,7 +6090,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof142 } st_case_142: - // line internal/scanner/scanner.go:4955 +// line internal/scanner/scanner.go:4955 if lex.data[(lex.p)] == 95 { goto st69 } @@ -6108,7 +6108,7 @@ func (lex *Lexer) Lex() *Token { } goto tr87 tr196: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st143 @@ -6117,7 +6117,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof143 } st_case_143: - // line internal/scanner/scanner.go:4982 +// line internal/scanner/scanner.go:4982 switch lex.data[(lex.p)] { case 42: goto st71 @@ -6128,15 +6128,15 @@ func (lex *Lexer) Lex() *Token { } goto tr239 tr92: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st71 st71: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof71 } st_case_71: - // line internal/scanner/scanner.go:5001 +// line internal/scanner/scanner.go:5001 switch lex.data[(lex.p)] { case 10: goto st72 @@ -6145,15 +6145,15 @@ func (lex *Lexer) Lex() *Token { } goto st71 tr93: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st72 st72: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof72 } st_case_72: - // line internal/scanner/scanner.go:5018 +// line internal/scanner/scanner.go:5018 switch lex.data[(lex.p)] { case 10: goto tr93 @@ -6162,15 +6162,15 @@ func (lex *Lexer) Lex() *Token { } goto tr92 tr94: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st73 st73: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof73 } st_case_73: - // line internal/scanner/scanner.go:5035 +// line internal/scanner/scanner.go:5035 switch lex.data[(lex.p)] { case 10: goto st72 @@ -6181,10 +6181,10 @@ func (lex *Lexer) Lex() *Token { } goto st71 tr197: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:176 +// line internal/scanner/scanner.rl:176 lex.act = 12 goto st144 st144: @@ -6192,7 +6192,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof144 } st_case_144: - // line internal/scanner/scanner.go:5057 +// line internal/scanner/scanner.go:5057 switch lex.data[(lex.p)] { case 46: goto tr270 @@ -6212,10 +6212,10 @@ func (lex *Lexer) Lex() *Token { } goto tr269 tr270: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:165 +// line internal/scanner/scanner.rl:165 lex.act = 10 goto st145 st145: @@ -6223,7 +6223,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof145 } st_case_145: - // line internal/scanner/scanner.go:5088 +// line internal/scanner/scanner.go:5088 switch lex.data[(lex.p)] { case 69: goto st68 @@ -6235,10 +6235,10 @@ func (lex *Lexer) Lex() *Token { } goto tr265 tr97: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:176 +// line internal/scanner/scanner.rl:176 lex.act = 12 goto st146 st146: @@ -6246,7 +6246,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof146 } st_case_146: - // line internal/scanner/scanner.go:5111 +// line internal/scanner/scanner.go:5111 switch lex.data[(lex.p)] { case 46: goto tr270 @@ -6280,10 +6280,10 @@ func (lex *Lexer) Lex() *Token { } goto tr11 tr98: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:166 +// line internal/scanner/scanner.rl:166 lex.act = 11 goto st147 st147: @@ -6291,7 +6291,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof147 } st_case_147: - // line internal/scanner/scanner.go:5156 +// line internal/scanner/scanner.go:5156 if lex.data[(lex.p)] == 95 { goto st75 } @@ -6318,10 +6318,10 @@ func (lex *Lexer) Lex() *Token { } goto tr11 tr99: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:191 +// line internal/scanner/scanner.rl:191 lex.act = 13 goto st148 st148: @@ -6329,7 +6329,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof148 } st_case_148: - // line internal/scanner/scanner.go:5194 +// line internal/scanner/scanner.go:5194 if lex.data[(lex.p)] == 95 { goto st76 } @@ -6356,7 +6356,7 @@ func (lex *Lexer) Lex() *Token { } goto tr239 tr199: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st150 @@ -6365,7 +6365,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof150 } st_case_150: - // line internal/scanner/scanner.go:5230 +// line internal/scanner/scanner.go:5230 switch lex.data[(lex.p)] { case 10: goto st78 @@ -6381,15 +6381,15 @@ func (lex *Lexer) Lex() *Token { } goto tr239 tr104: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st77 st77: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof77 } st_case_77: - // line internal/scanner/scanner.go:5254 +// line internal/scanner/scanner.go:5254 switch lex.data[(lex.p)] { case 10: goto st78 @@ -6405,15 +6405,15 @@ func (lex *Lexer) Lex() *Token { } goto tr22 tr105: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st78 st78: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof78 } st_case_78: - // line internal/scanner/scanner.go:5278 +// line internal/scanner/scanner.go:5278 switch lex.data[(lex.p)] { case 10: goto tr105 @@ -6429,35 +6429,35 @@ func (lex *Lexer) Lex() *Token { } goto tr22 tr106: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st79 st79: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof79 } st_case_79: - // line internal/scanner/scanner.go:5302 +// line internal/scanner/scanner.go:5302 if lex.data[(lex.p)] == 10 { goto st78 } goto tr22 tr107: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st80 st80: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof80 } st_case_80: - // line internal/scanner/scanner.go:5316 +// line internal/scanner/scanner.go:5316 if lex.data[(lex.p)] == 62 { goto tr108 } goto tr22 tr108: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st151 @@ -6466,7 +6466,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof151 } st_case_151: - // line internal/scanner/scanner.go:5331 +// line internal/scanner/scanner.go:5331 switch lex.data[(lex.p)] { case 10: goto st152 @@ -6504,10 +6504,10 @@ func (lex *Lexer) Lex() *Token { } goto tr239 tr280: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:306 +// line internal/scanner/scanner.rl:306 lex.act = 118 goto st154 st154: @@ -6515,7 +6515,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof154 } st_case_154: - // line internal/scanner/scanner.go:5380 +// line internal/scanner/scanner.go:5380 switch lex.data[(lex.p)] { case 60: goto st82 @@ -6575,7 +6575,7 @@ func (lex *Lexer) Lex() *Token { } goto tr115 tr115: - // line internal/scanner/scanner.rl:36 +// line internal/scanner/scanner.rl:36 lblStart = lex.p goto st84 st84: @@ -6583,7 +6583,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof84 } st_case_84: - // line internal/scanner/scanner.go:5448 +// line internal/scanner/scanner.go:5448 switch lex.data[(lex.p)] { case 34: goto tr116 @@ -6609,7 +6609,7 @@ func (lex *Lexer) Lex() *Token { } goto st84 tr116: - // line internal/scanner/scanner.rl:37 +// line internal/scanner/scanner.rl:37 lblEnd = lex.p goto st85 st85: @@ -6617,7 +6617,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof85 } st_case_85: - // line internal/scanner/scanner.go:5482 +// line internal/scanner/scanner.go:5482 switch lex.data[(lex.p)] { case 10: goto st155 @@ -6626,7 +6626,7 @@ func (lex *Lexer) Lex() *Token { } goto tr11 tr122: - // line internal/scanner/scanner.rl:37 +// line internal/scanner/scanner.rl:37 lblEnd = lex.p goto st155 st155: @@ -6634,10 +6634,10 @@ func (lex *Lexer) Lex() *Token { goto _test_eof155 } st_case_155: - // line internal/scanner/scanner.go:5499 +// line internal/scanner/scanner.go:5499 goto tr285 tr123: - // line internal/scanner/scanner.rl:37 +// line internal/scanner/scanner.rl:37 lblEnd = lex.p goto st86 st86: @@ -6645,7 +6645,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof86 } st_case_86: - // line internal/scanner/scanner.go:5510 +// line internal/scanner/scanner.go:5510 if lex.data[(lex.p)] == 10 { goto st155 } @@ -6672,7 +6672,7 @@ func (lex *Lexer) Lex() *Token { } goto tr120 tr120: - // line internal/scanner/scanner.rl:36 +// line internal/scanner/scanner.rl:36 lblStart = lex.p goto st88 st88: @@ -6680,7 +6680,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof88 } st_case_88: - // line internal/scanner/scanner.go:5545 +// line internal/scanner/scanner.go:5545 switch lex.data[(lex.p)] { case 39: goto tr116 @@ -6706,7 +6706,7 @@ func (lex *Lexer) Lex() *Token { } goto st88 tr114: - // line internal/scanner/scanner.rl:36 +// line internal/scanner/scanner.rl:36 lblStart = lex.p goto st89 st89: @@ -6714,7 +6714,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof89 } st_case_89: - // line internal/scanner/scanner.go:5579 +// line internal/scanner/scanner.go:5579 switch lex.data[(lex.p)] { case 10: goto tr122 @@ -6805,7 +6805,7 @@ func (lex *Lexer) Lex() *Token { } goto tr239 tr296: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st162 @@ -6814,7 +6814,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof162 } st_case_162: - // line internal/scanner/scanner.go:5679 +// line internal/scanner/scanner.go:5679 switch lex.data[(lex.p)] { case 10: goto st163 @@ -6890,493 +6890,493 @@ func (lex *Lexer) Lex() *Token { } goto tr211 tr211: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:347 +// line internal/scanner/scanner.rl:347 lex.act = 135 goto st166 tr307: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:204 +// line internal/scanner/scanner.rl:204 lex.act = 16 goto st166 tr313: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:202 +// line internal/scanner/scanner.rl:202 lex.act = 14 goto st166 tr314: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:275 +// line internal/scanner/scanner.rl:275 lex.act = 87 goto st166 tr317: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:203 +// line internal/scanner/scanner.rl:203 lex.act = 15 goto st166 tr322: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:205 +// line internal/scanner/scanner.rl:205 lex.act = 17 goto st166 tr334: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:206 +// line internal/scanner/scanner.rl:206 lex.act = 18 goto st166 tr335: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:207 +// line internal/scanner/scanner.rl:207 lex.act = 19 goto st166 tr337: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:208 +// line internal/scanner/scanner.rl:208 lex.act = 20 goto st166 tr344: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:233 +// line internal/scanner/scanner.rl:233 lex.act = 45 goto st166 tr348: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:209 +// line internal/scanner/scanner.rl:209 lex.act = 21 goto st166 tr350: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:210 +// line internal/scanner/scanner.rl:210 lex.act = 22 goto st166 tr354: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:211 +// line internal/scanner/scanner.rl:211 lex.act = 23 goto st166 tr358: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:212 +// line internal/scanner/scanner.rl:212 lex.act = 24 goto st166 tr361: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:215 +// line internal/scanner/scanner.rl:215 lex.act = 27 goto st166 tr367: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:213 +// line internal/scanner/scanner.rl:213 lex.act = 25 goto st166 tr371: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:214 +// line internal/scanner/scanner.rl:214 lex.act = 26 goto st166 tr372: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:227 +// line internal/scanner/scanner.rl:227 lex.act = 39 goto st166 tr380: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:216 +// line internal/scanner/scanner.rl:216 lex.act = 28 goto st166 tr385: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:218 +// line internal/scanner/scanner.rl:218 lex.act = 30 goto st166 tr388: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:219 +// line internal/scanner/scanner.rl:219 lex.act = 31 goto st166 tr400: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:220 +// line internal/scanner/scanner.rl:220 lex.act = 32 goto st166 tr407: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:222 +// line internal/scanner/scanner.rl:222 lex.act = 34 goto st166 tr408: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:223 +// line internal/scanner/scanner.rl:223 lex.act = 35 goto st166 tr413: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:224 +// line internal/scanner/scanner.rl:224 lex.act = 36 goto st166 tr417: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:225 +// line internal/scanner/scanner.rl:225 lex.act = 37 goto st166 tr419: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:226 +// line internal/scanner/scanner.rl:226 lex.act = 38 goto st166 tr425: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:228 +// line internal/scanner/scanner.rl:228 lex.act = 40 goto st166 tr427: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:234 +// line internal/scanner/scanner.rl:234 lex.act = 46 goto st166 tr434: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:230 +// line internal/scanner/scanner.rl:230 lex.act = 42 goto st166 tr440: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:232 +// line internal/scanner/scanner.rl:232 lex.act = 44 goto st166 tr446: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:235 +// line internal/scanner/scanner.rl:235 lex.act = 47 goto st166 tr448: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:236 +// line internal/scanner/scanner.rl:236 lex.act = 48 goto st166 tr449: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:237 +// line internal/scanner/scanner.rl:237 lex.act = 49 goto st166 tr460: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:239 +// line internal/scanner/scanner.rl:239 lex.act = 51 goto st166 tr473: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:262 +// line internal/scanner/scanner.rl:262 lex.act = 74 goto st166 tr481: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:240 +// line internal/scanner/scanner.rl:240 lex.act = 52 goto st166 tr485: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:241 +// line internal/scanner/scanner.rl:241 lex.act = 53 goto st166 tr491: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:242 +// line internal/scanner/scanner.rl:242 lex.act = 54 goto st166 tr494: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:238 +// line internal/scanner/scanner.rl:238 lex.act = 50 goto st166 tr497: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:243 +// line internal/scanner/scanner.rl:243 lex.act = 55 goto st166 tr506: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:244 +// line internal/scanner/scanner.rl:244 lex.act = 56 goto st166 tr507: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:274 +// line internal/scanner/scanner.rl:274 lex.act = 86 goto st166 tr508: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:276 +// line internal/scanner/scanner.rl:276 lex.act = 88 goto st166 tr515: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:247 +// line internal/scanner/scanner.rl:247 lex.act = 59 goto st166 tr518: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:245 +// line internal/scanner/scanner.rl:245 lex.act = 57 goto st166 tr524: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:248 +// line internal/scanner/scanner.rl:248 lex.act = 60 goto st166 tr528: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:246 +// line internal/scanner/scanner.rl:246 lex.act = 58 goto st166 tr541: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:264 +// line internal/scanner/scanner.rl:264 lex.act = 76 goto st166 tr544: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:249 +// line internal/scanner/scanner.rl:249 lex.act = 61 goto st166 tr550: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:250 +// line internal/scanner/scanner.rl:250 lex.act = 62 goto st166 tr554: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:251 +// line internal/scanner/scanner.rl:251 lex.act = 63 goto st166 tr559: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:252 +// line internal/scanner/scanner.rl:252 lex.act = 64 goto st166 tr561: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:254 +// line internal/scanner/scanner.rl:254 lex.act = 66 goto st166 tr563: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:253 +// line internal/scanner/scanner.rl:253 lex.act = 65 goto st166 tr568: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:255 +// line internal/scanner/scanner.rl:255 lex.act = 67 goto st166 tr569: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:256 +// line internal/scanner/scanner.rl:256 lex.act = 68 goto st166 tr571: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:257 +// line internal/scanner/scanner.rl:257 lex.act = 69 goto st166 tr575: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:258 +// line internal/scanner/scanner.rl:258 lex.act = 70 goto st166 tr577: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:277 +// line internal/scanner/scanner.rl:277 lex.act = 89 goto st166 tr586: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:259 +// line internal/scanner/scanner.rl:259 lex.act = 71 goto st166 tr602: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:265 +// line internal/scanner/scanner.rl:265 lex.act = 77 goto st166 tr606: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:266 +// line internal/scanner/scanner.rl:266 lex.act = 78 goto st166 tr612: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:267 +// line internal/scanner/scanner.rl:267 lex.act = 79 goto st166 tr620: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:268 +// line internal/scanner/scanner.rl:268 lex.act = 80 goto st166 tr632: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:273 +// line internal/scanner/scanner.rl:273 lex.act = 85 goto st166 tr637: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:269 +// line internal/scanner/scanner.rl:269 lex.act = 81 goto st166 tr644: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:271 +// line internal/scanner/scanner.rl:271 lex.act = 83 goto st166 tr654: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:270 +// line internal/scanner/scanner.rl:270 lex.act = 82 goto st166 tr660: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:272 +// line internal/scanner/scanner.rl:272 lex.act = 84 goto st166 st166: @@ -7384,7 +7384,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof166 } st_case_166: - // line internal/scanner/scanner.go:6249 +// line internal/scanner/scanner.go:6249 if lex.data[(lex.p)] == 96 { goto tr11 } @@ -7717,10 +7717,10 @@ func (lex *Lexer) Lex() *Token { } goto tr211 tr205: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:347 +// line internal/scanner/scanner.rl:347 lex.act = 135 goto st177 st177: @@ -7728,7 +7728,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof177 } st_case_177: - // line internal/scanner/scanner.go:6593 +// line internal/scanner/scanner.go:6593 switch lex.data[(lex.p)] { case 34: goto st7 @@ -14713,7 +14713,7 @@ func (lex *Lexer) Lex() *Token { } goto tr211 tr581: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st397 @@ -14722,7 +14722,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof397 } st_case_397: - // line internal/scanner/scanner.go:13587 +// line internal/scanner/scanner.go:13587 switch lex.data[(lex.p)] { case 10: goto st94 @@ -14765,15 +14765,15 @@ func (lex *Lexer) Lex() *Token { } goto tr211 tr134: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st93 st93: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof93 } st_case_93: - // line internal/scanner/scanner.go:13638 +// line internal/scanner/scanner.go:13638 switch lex.data[(lex.p)] { case 10: goto st94 @@ -14791,15 +14791,15 @@ func (lex *Lexer) Lex() *Token { } goto tr129 tr135: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st94 st94: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof94 } st_case_94: - // line internal/scanner/scanner.go:13664 +// line internal/scanner/scanner.go:13664 switch lex.data[(lex.p)] { case 10: goto tr135 @@ -14817,29 +14817,29 @@ func (lex *Lexer) Lex() *Token { } goto tr129 tr136: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st95 st95: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof95 } st_case_95: - // line internal/scanner/scanner.go:13690 +// line internal/scanner/scanner.go:13690 if lex.data[(lex.p)] == 10 { goto st94 } goto tr129 tr137: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st96 st96: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof96 } st_case_96: - // line internal/scanner/scanner.go:13704 +// line internal/scanner/scanner.go:13704 switch lex.data[(lex.p)] { case 82: goto st97 @@ -16943,14 +16943,14 @@ func (lex *Lexer) Lex() *Token { } goto tr239 tr141: - // line internal/scanner/scanner.rl:381 +// line internal/scanner/scanner.rl:381 (lex.p) = (lex.te) - 1 { - lex.addToken(T_WHITESPACE, lex.ts, lex.te) + lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te) } goto st468 tr663: - // line internal/scanner/scanner.rl:384 +// line internal/scanner/scanner.rl:384 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -16960,25 +16960,25 @@ func (lex *Lexer) Lex() *Token { } goto st468 tr668: - // line internal/scanner/scanner.rl:381 +// line internal/scanner/scanner.rl:381 lex.te = (lex.p) (lex.p)-- { - lex.addToken(T_WHITESPACE, lex.ts, lex.te) + lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te) } goto st468 tr670: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:381 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:381 lex.te = (lex.p) (lex.p)-- { - lex.addToken(T_WHITESPACE, lex.ts, lex.te) + lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te) } goto st468 tr674: - // line internal/scanner/scanner.rl:384 +// line internal/scanner/scanner.rl:384 lex.te = (lex.p) (lex.p)-- { @@ -16989,7 +16989,7 @@ func (lex *Lexer) Lex() *Token { } goto st468 tr675: - // line internal/scanner/scanner.rl:382 +// line internal/scanner/scanner.rl:382 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -17003,7 +17003,7 @@ func (lex *Lexer) Lex() *Token { goto st468 tr676: lex.cs = 468 - // line internal/scanner/scanner.rl:383 +// line internal/scanner/scanner.rl:383 lex.te = (lex.p) (lex.p)-- { @@ -17017,17 +17017,17 @@ func (lex *Lexer) Lex() *Token { } goto _again st468: - // line NONE:1 +// line NONE:1 lex.ts = 0 if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof468 } st_case_468: - // line NONE:1 +// line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:15860 +// line internal/scanner/scanner.go:15860 switch lex.data[(lex.p)] { case 10: goto tr142 @@ -17064,23 +17064,23 @@ func (lex *Lexer) Lex() *Token { } goto st473 tr664: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st469 tr671: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st469 st469: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof469 } st_case_469: - // line internal/scanner/scanner.go:15913 +// line internal/scanner/scanner.go:15913 switch lex.data[(lex.p)] { case 10: goto tr142 @@ -17094,23 +17094,23 @@ func (lex *Lexer) Lex() *Token { } goto tr668 tr142: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st470 tr672: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st470 st470: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof470 } st_case_470: - // line internal/scanner/scanner.go:15943 +// line internal/scanner/scanner.go:15943 switch lex.data[(lex.p)] { case 10: goto tr672 @@ -17124,15 +17124,15 @@ func (lex *Lexer) Lex() *Token { } goto tr670 tr673: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st99 st99: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof99 } st_case_99: - // line internal/scanner/scanner.go:15965 +// line internal/scanner/scanner.go:15965 if lex.data[(lex.p)] == 10 { goto tr142 } @@ -17183,7 +17183,7 @@ func (lex *Lexer) Lex() *Token { goto st473 tr679: lex.cs = 474 - // line NONE:1 +// line NONE:1 switch lex.act { case 0: { @@ -17208,9 +17208,9 @@ func (lex *Lexer) Lex() *Token { goto _again tr680: lex.cs = 474 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:388 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:388 lex.te = (lex.p) (lex.p)-- { @@ -17224,20 +17224,20 @@ func (lex *Lexer) Lex() *Token { } goto _again st474: - // line NONE:1 +// line NONE:1 lex.ts = 0 - // line NONE:1 +// line NONE:1 lex.act = 0 if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof474 } st_case_474: - // line NONE:1 +// line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:16059 +// line internal/scanner/scanner.go:16059 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -17288,19 +17288,19 @@ func (lex *Lexer) Lex() *Token { lex.cs = 0 goto _out tr677: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:388 +// line internal/scanner/scanner.rl:388 lex.act = 146 goto st475 tr681: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:388 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:388 lex.act = 146 goto st475 st475: @@ -17308,7 +17308,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof475 } st_case_475: - // line internal/scanner/scanner.go:16130 +// line internal/scanner/scanner.go:16130 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -17355,15 +17355,15 @@ func (lex *Lexer) Lex() *Token { } goto tr679 tr682: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st476 st476: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof476 } st_case_476: - // line internal/scanner/scanner.go:16185 +// line internal/scanner/scanner.go:16185 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -17410,7 +17410,7 @@ func (lex *Lexer) Lex() *Token { } goto tr680 tr143: - // line internal/scanner/scanner.rl:397 +// line internal/scanner/scanner.rl:397 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -17421,7 +17421,7 @@ func (lex *Lexer) Lex() *Token { } goto st477 tr689: - // line internal/scanner/scanner.rl:399 +// line internal/scanner/scanner.rl:399 lex.te = (lex.p) (lex.p)-- { @@ -17437,7 +17437,7 @@ func (lex *Lexer) Lex() *Token { } goto st477 tr690: - // line internal/scanner/scanner.rl:398 +// line internal/scanner/scanner.rl:398 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -17448,7 +17448,7 @@ func (lex *Lexer) Lex() *Token { goto st477 tr691: lex.cs = 477 - // line NONE:1 +// line NONE:1 switch lex.act { case 147: { @@ -17487,9 +17487,9 @@ func (lex *Lexer) Lex() *Token { goto _again tr692: lex.cs = 477 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:400 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:400 lex.te = (lex.p) (lex.p)-- { @@ -17507,7 +17507,7 @@ func (lex *Lexer) Lex() *Token { goto _again tr696: lex.cs = 477 - // line internal/scanner/scanner.rl:400 +// line internal/scanner/scanner.rl:400 lex.te = (lex.p) (lex.p)-- { @@ -17524,17 +17524,17 @@ func (lex *Lexer) Lex() *Token { } goto _again st477: - // line NONE:1 +// line NONE:1 lex.ts = 0 if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof477 } st_case_477: - // line NONE:1 +// line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:16314 +// line internal/scanner/scanner.go:16314 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -17608,33 +17608,33 @@ func (lex *Lexer) Lex() *Token { } goto st0 tr685: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:400 +// line internal/scanner/scanner.rl:400 lex.act = 150 goto st479 tr693: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:400 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:400 lex.act = 150 goto st479 tr695: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:398 +// line internal/scanner/scanner.rl:398 lex.act = 148 goto st479 tr697: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:397 +// line internal/scanner/scanner.rl:397 lex.act = 147 goto st479 st479: @@ -17642,7 +17642,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof479 } st_case_479: - // line internal/scanner/scanner.go:16422 +// line internal/scanner/scanner.go:16422 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -17689,15 +17689,15 @@ func (lex *Lexer) Lex() *Token { } goto tr691 tr694: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st480 st480: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof480 } st_case_480: - // line internal/scanner/scanner.go:16477 +// line internal/scanner/scanner.go:16477 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -17854,7 +17854,7 @@ func (lex *Lexer) Lex() *Token { } goto tr696 tr145: - // line internal/scanner/scanner.rl:412 +// line internal/scanner/scanner.rl:412 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -17866,7 +17866,7 @@ func (lex *Lexer) Lex() *Token { goto st483 tr699: lex.cs = 483 - // line internal/scanner/scanner.rl:415 +// line internal/scanner/scanner.rl:415 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -17879,7 +17879,7 @@ func (lex *Lexer) Lex() *Token { } goto _again tr706: - // line internal/scanner/scanner.rl:414 +// line internal/scanner/scanner.rl:414 lex.te = (lex.p) (lex.p)-- { @@ -17895,7 +17895,7 @@ func (lex *Lexer) Lex() *Token { } goto st483 tr707: - // line internal/scanner/scanner.rl:413 +// line internal/scanner/scanner.rl:413 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -17906,7 +17906,7 @@ func (lex *Lexer) Lex() *Token { goto st483 tr708: lex.cs = 483 - // line NONE:1 +// line NONE:1 switch lex.act { case 151: { @@ -17951,9 +17951,9 @@ func (lex *Lexer) Lex() *Token { goto _again tr709: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:416 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:416 lex.te = (lex.p) (lex.p)-- { @@ -17967,7 +17967,7 @@ func (lex *Lexer) Lex() *Token { } goto st483 tr713: - // line internal/scanner/scanner.rl:416 +// line internal/scanner/scanner.rl:416 lex.te = (lex.p) (lex.p)-- { @@ -17981,17 +17981,17 @@ func (lex *Lexer) Lex() *Token { } goto st483 st483: - // line NONE:1 +// line NONE:1 lex.ts = 0 if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof483 } st_case_483: - // line NONE:1 +// line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:16711 +// line internal/scanner/scanner.go:16711 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -18069,40 +18069,40 @@ func (lex *Lexer) Lex() *Token { } goto st0 tr701: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:416 +// line internal/scanner/scanner.rl:416 lex.act = 155 goto st485 tr704: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:415 +// line internal/scanner/scanner.rl:415 lex.act = 154 goto st485 tr710: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:416 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:416 lex.act = 155 goto st485 tr712: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:413 +// line internal/scanner/scanner.rl:413 lex.act = 152 goto st485 tr714: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:412 +// line internal/scanner/scanner.rl:412 lex.act = 151 goto st485 st485: @@ -18110,7 +18110,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof485 } st_case_485: - // line internal/scanner/scanner.go:16830 +// line internal/scanner/scanner.go:16830 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -18157,15 +18157,15 @@ func (lex *Lexer) Lex() *Token { } goto tr708 tr711: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st486 st486: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof486 } st_case_486: - // line internal/scanner/scanner.go:16885 +// line internal/scanner/scanner.go:16885 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -18322,7 +18322,7 @@ func (lex *Lexer) Lex() *Token { } goto tr713 tr146: - // line internal/scanner/scanner.rl:424 +// line internal/scanner/scanner.rl:424 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -18334,7 +18334,7 @@ func (lex *Lexer) Lex() *Token { goto st489 tr715: lex.cs = 489 - // line internal/scanner/scanner.rl:427 +// line internal/scanner/scanner.rl:427 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -18347,7 +18347,7 @@ func (lex *Lexer) Lex() *Token { } goto _again tr723: - // line internal/scanner/scanner.rl:426 +// line internal/scanner/scanner.rl:426 lex.te = (lex.p) (lex.p)-- { @@ -18363,7 +18363,7 @@ func (lex *Lexer) Lex() *Token { } goto st489 tr724: - // line internal/scanner/scanner.rl:425 +// line internal/scanner/scanner.rl:425 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -18374,7 +18374,7 @@ func (lex *Lexer) Lex() *Token { goto st489 tr725: lex.cs = 489 - // line NONE:1 +// line NONE:1 switch lex.act { case 156: { @@ -18419,9 +18419,9 @@ func (lex *Lexer) Lex() *Token { goto _again tr726: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:428 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:428 lex.te = (lex.p) (lex.p)-- { @@ -18435,7 +18435,7 @@ func (lex *Lexer) Lex() *Token { } goto st489 tr730: - // line internal/scanner/scanner.rl:428 +// line internal/scanner/scanner.rl:428 lex.te = (lex.p) (lex.p)-- { @@ -18449,17 +18449,17 @@ func (lex *Lexer) Lex() *Token { } goto st489 st489: - // line NONE:1 +// line NONE:1 lex.ts = 0 if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof489 } st_case_489: - // line NONE:1 +// line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:17119 +// line internal/scanner/scanner.go:17119 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -18537,40 +18537,40 @@ func (lex *Lexer) Lex() *Token { } goto st0 tr718: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:428 +// line internal/scanner/scanner.rl:428 lex.act = 160 goto st491 tr720: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:427 +// line internal/scanner/scanner.rl:427 lex.act = 159 goto st491 tr727: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:428 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:428 lex.act = 160 goto st491 tr729: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:425 +// line internal/scanner/scanner.rl:425 lex.act = 157 goto st491 tr731: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:424 +// line internal/scanner/scanner.rl:424 lex.act = 156 goto st491 st491: @@ -18578,7 +18578,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof491 } st_case_491: - // line internal/scanner/scanner.go:17238 +// line internal/scanner/scanner.go:17238 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -18625,15 +18625,15 @@ func (lex *Lexer) Lex() *Token { } goto tr725 tr728: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st492 st492: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof492 } st_case_492: - // line internal/scanner/scanner.go:17293 +// line internal/scanner/scanner.go:17293 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -18791,7 +18791,7 @@ func (lex *Lexer) Lex() *Token { goto tr730 tr733: lex.cs = 495 - // line internal/scanner/scanner.rl:436 +// line internal/scanner/scanner.rl:436 lex.te = (lex.p) (lex.p)-- { @@ -18805,17 +18805,17 @@ func (lex *Lexer) Lex() *Token { } goto _again st495: - // line NONE:1 +// line NONE:1 lex.ts = 0 if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof495 } st_case_495: - // line NONE:1 +// line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:17472 +// line internal/scanner/scanner.go:17472 if lex.data[(lex.p)] == 96 { goto st0 } @@ -18859,7 +18859,7 @@ func (lex *Lexer) Lex() *Token { } goto st496 tr147: - // line internal/scanner/scanner.rl:455 +// line internal/scanner/scanner.rl:455 (lex.p) = (lex.te) - 1 { lex.ungetCnt(1) @@ -18871,7 +18871,7 @@ func (lex *Lexer) Lex() *Token { } goto st497 tr148: - // line internal/scanner/scanner.rl:452 +// line internal/scanner/scanner.rl:452 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -18885,7 +18885,7 @@ func (lex *Lexer) Lex() *Token { } goto st497 tr734: - // line internal/scanner/scanner.rl:455 +// line internal/scanner/scanner.rl:455 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -18897,7 +18897,7 @@ func (lex *Lexer) Lex() *Token { } goto st497 tr738: - // line internal/scanner/scanner.rl:454 +// line internal/scanner/scanner.rl:454 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -18907,7 +18907,7 @@ func (lex *Lexer) Lex() *Token { } goto st497 tr739: - // line internal/scanner/scanner.rl:455 +// line internal/scanner/scanner.rl:455 lex.te = (lex.p) (lex.p)-- { @@ -18920,7 +18920,7 @@ func (lex *Lexer) Lex() *Token { } goto st497 tr741: - // line internal/scanner/scanner.rl:451 +// line internal/scanner/scanner.rl:451 lex.te = (lex.p) (lex.p)-- { @@ -18934,7 +18934,7 @@ func (lex *Lexer) Lex() *Token { } goto st497 tr743: - // line internal/scanner/scanner.rl:453 +// line internal/scanner/scanner.rl:453 lex.te = (lex.p) (lex.p)-- { @@ -18948,17 +18948,17 @@ func (lex *Lexer) Lex() *Token { } goto st497 st497: - // line NONE:1 +// line NONE:1 lex.ts = 0 if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof497 } st_case_497: - // line NONE:1 +// line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:17564 +// line internal/scanner/scanner.go:17564 switch lex.data[(lex.p)] { case 36: goto st498 @@ -19030,7 +19030,7 @@ func (lex *Lexer) Lex() *Token { } goto st499 tr736: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st500 @@ -19039,7 +19039,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof500 } st_case_500: - // line internal/scanner/scanner.go:17645 +// line internal/scanner/scanner.go:17645 if lex.data[(lex.p)] == 62 { goto st103 } @@ -19092,7 +19092,7 @@ func (lex *Lexer) Lex() *Token { } goto st501 tr149: - // line internal/scanner/scanner.rl:459 +// line internal/scanner/scanner.rl:459 (lex.p) = (lex.te) - 1 { lex.setTokenPosition(token) @@ -19105,7 +19105,7 @@ func (lex *Lexer) Lex() *Token { } goto st502 tr744: - // line internal/scanner/scanner.rl:465 +// line internal/scanner/scanner.rl:465 lex.te = (lex.p) + 1 { c := lex.data[lex.p] @@ -19113,7 +19113,7 @@ func (lex *Lexer) Lex() *Token { } goto st502 tr745: - // line internal/scanner/scanner.rl:462 +// line internal/scanner/scanner.rl:462 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -19123,7 +19123,7 @@ func (lex *Lexer) Lex() *Token { } goto st502 tr748: - // line internal/scanner/scanner.rl:463 +// line internal/scanner/scanner.rl:463 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -19136,7 +19136,7 @@ func (lex *Lexer) Lex() *Token { } goto st502 tr752: - // line internal/scanner/scanner.rl:464 +// line internal/scanner/scanner.rl:464 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -19146,9 +19146,9 @@ func (lex *Lexer) Lex() *Token { } goto st502 tr753: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:462 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:462 lex.te = (lex.p) (lex.p)-- { @@ -19159,7 +19159,7 @@ func (lex *Lexer) Lex() *Token { } goto st502 tr754: - // line internal/scanner/scanner.rl:465 +// line internal/scanner/scanner.rl:465 lex.te = (lex.p) (lex.p)-- { @@ -19168,7 +19168,7 @@ func (lex *Lexer) Lex() *Token { } goto st502 tr755: - // line internal/scanner/scanner.rl:463 +// line internal/scanner/scanner.rl:463 lex.te = (lex.p) (lex.p)-- { @@ -19182,7 +19182,7 @@ func (lex *Lexer) Lex() *Token { } goto st502 tr757: - // line internal/scanner/scanner.rl:460 +// line internal/scanner/scanner.rl:460 lex.te = (lex.p) (lex.p)-- { @@ -19196,7 +19196,7 @@ func (lex *Lexer) Lex() *Token { } goto st502 tr758: - // line internal/scanner/scanner.rl:459 +// line internal/scanner/scanner.rl:459 lex.te = (lex.p) (lex.p)-- { @@ -19210,7 +19210,7 @@ func (lex *Lexer) Lex() *Token { } goto st502 tr762: - // line internal/scanner/scanner.rl:461 +// line internal/scanner/scanner.rl:461 lex.te = (lex.p) (lex.p)-- { @@ -19224,17 +19224,17 @@ func (lex *Lexer) Lex() *Token { } goto st502 st502: - // line NONE:1 +// line NONE:1 lex.ts = 0 if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof502 } st_case_502: - // line NONE:1 +// line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:17777 +// line internal/scanner/scanner.go:17777 switch lex.data[(lex.p)] { case 10: goto st503 @@ -19362,7 +19362,7 @@ func (lex *Lexer) Lex() *Token { } goto st506 tr750: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st507 @@ -19371,7 +19371,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof507 } st_case_507: - // line internal/scanner/scanner.go:17914 +// line internal/scanner/scanner.go:17914 switch lex.data[(lex.p)] { case 95: goto st104 @@ -19385,7 +19385,7 @@ func (lex *Lexer) Lex() *Token { } goto tr758 tr150: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st508 @@ -19394,7 +19394,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof508 } st_case_508: - // line internal/scanner/scanner.go:17937 +// line internal/scanner/scanner.go:17937 if lex.data[(lex.p)] == 95 { goto st104 } @@ -19421,7 +19421,7 @@ func (lex *Lexer) Lex() *Token { } goto tr149 tr151: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st509 @@ -19430,7 +19430,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof509 } st_case_509: - // line internal/scanner/scanner.go:17973 +// line internal/scanner/scanner.go:17973 if lex.data[(lex.p)] == 95 { goto st105 } @@ -19457,7 +19457,7 @@ func (lex *Lexer) Lex() *Token { } goto tr149 tr152: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st510 @@ -19466,7 +19466,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof510 } st_case_510: - // line internal/scanner/scanner.go:18009 +// line internal/scanner/scanner.go:18009 if lex.data[(lex.p)] == 95 { goto st106 } @@ -19511,7 +19511,7 @@ func (lex *Lexer) Lex() *Token { goto st511 tr153: lex.cs = 512 - // line internal/scanner/scanner.rl:473 +// line internal/scanner/scanner.rl:473 (lex.p) = (lex.te) - 1 { lex.ungetCnt(1) @@ -19520,7 +19520,7 @@ func (lex *Lexer) Lex() *Token { goto _again tr155: lex.cs = 512 - // line internal/scanner/scanner.rl:472 +// line internal/scanner/scanner.rl:472 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -19535,7 +19535,7 @@ func (lex *Lexer) Lex() *Token { goto _again tr763: lex.cs = 512 - // line internal/scanner/scanner.rl:473 +// line internal/scanner/scanner.rl:473 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -19544,7 +19544,7 @@ func (lex *Lexer) Lex() *Token { goto _again tr765: lex.cs = 512 - // line internal/scanner/scanner.rl:473 +// line internal/scanner/scanner.rl:473 lex.te = (lex.p) (lex.p)-- { @@ -19553,17 +19553,17 @@ func (lex *Lexer) Lex() *Token { } goto _again st512: - // line NONE:1 +// line NONE:1 lex.ts = 0 if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof512 } st_case_512: - // line NONE:1 +// line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:18088 +// line internal/scanner/scanner.go:18088 if lex.data[(lex.p)] == 96 { goto tr763 } @@ -19581,7 +19581,7 @@ func (lex *Lexer) Lex() *Token { } goto tr764 tr764: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st513 @@ -19590,7 +19590,7 @@ func (lex *Lexer) Lex() *Token { goto _test_eof513 } st_case_513: - // line internal/scanner/scanner.go:18115 +// line internal/scanner/scanner.go:18115 switch lex.data[(lex.p)] { case 91: goto tr155 @@ -19649,15 +19649,15 @@ func (lex *Lexer) Lex() *Token { } goto st107 tr156: - // line internal/scanner/scanner.rl:477 +// line internal/scanner/scanner.rl:477 (lex.p) = (lex.te) - 1 { - lex.addToken(T_WHITESPACE, lex.ts, lex.te) + lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te) } goto st514 tr766: lex.cs = 514 - // line internal/scanner/scanner.rl:479 +// line internal/scanner/scanner.rl:479 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -19666,7 +19666,7 @@ func (lex *Lexer) Lex() *Token { goto _again tr769: lex.cs = 514 - // line internal/scanner/scanner.rl:478 +// line internal/scanner/scanner.rl:478 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -19679,26 +19679,26 @@ func (lex *Lexer) Lex() *Token { } goto _again tr770: - // line internal/scanner/scanner.rl:477 +// line internal/scanner/scanner.rl:477 lex.te = (lex.p) (lex.p)-- { - lex.addToken(T_WHITESPACE, lex.ts, lex.te) + lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te) } goto st514 tr772: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:477 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:477 lex.te = (lex.p) (lex.p)-- { - lex.addToken(T_WHITESPACE, lex.ts, lex.te) + lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te) } goto st514 tr776: lex.cs = 514 - // line internal/scanner/scanner.rl:479 +// line internal/scanner/scanner.rl:479 lex.te = (lex.p) (lex.p)-- { @@ -19707,17 +19707,17 @@ func (lex *Lexer) Lex() *Token { } goto _again st514: - // line NONE:1 +// line NONE:1 lex.ts = 0 if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof514 } st_case_514: - // line NONE:1 +// line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:18222 +// line internal/scanner/scanner.go:18222 switch lex.data[(lex.p)] { case 10: goto tr157 @@ -19733,23 +19733,23 @@ func (lex *Lexer) Lex() *Token { } goto tr766 tr767: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st515 tr773: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st515 st515: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof515 } st_case_515: - // line internal/scanner/scanner.go:18254 +// line internal/scanner/scanner.go:18254 switch lex.data[(lex.p)] { case 10: goto tr157 @@ -19763,23 +19763,23 @@ func (lex *Lexer) Lex() *Token { } goto tr770 tr157: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st516 tr774: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st516 st516: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof516 } st_case_516: - // line internal/scanner/scanner.go:18284 +// line internal/scanner/scanner.go:18284 switch lex.data[(lex.p)] { case 10: goto tr774 @@ -19793,15 +19793,15 @@ func (lex *Lexer) Lex() *Token { } goto tr772 tr775: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st108 st108: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof108 } st_case_108: - // line internal/scanner/scanner.go:18306 +// line internal/scanner/scanner.go:18306 if lex.data[(lex.p)] == 10 { goto tr157 } @@ -19816,15 +19816,15 @@ func (lex *Lexer) Lex() *Token { } goto tr776 tr158: - // line internal/scanner/scanner.rl:483 +// line internal/scanner/scanner.rl:483 (lex.p) = (lex.te) - 1 { - lex.addToken(T_WHITESPACE, lex.ts, lex.te) + lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te) } goto st518 tr777: lex.cs = 518 - // line internal/scanner/scanner.rl:485 +// line internal/scanner/scanner.rl:485 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -19833,7 +19833,7 @@ func (lex *Lexer) Lex() *Token { goto _again tr780: lex.cs = 518 - // line internal/scanner/scanner.rl:484 +// line internal/scanner/scanner.rl:484 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -19846,26 +19846,26 @@ func (lex *Lexer) Lex() *Token { } goto _again tr781: - // line internal/scanner/scanner.rl:483 +// line internal/scanner/scanner.rl:483 lex.te = (lex.p) (lex.p)-- { - lex.addToken(T_WHITESPACE, lex.ts, lex.te) + lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te) } goto st518 tr783: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:483 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:483 lex.te = (lex.p) (lex.p)-- { - lex.addToken(T_WHITESPACE, lex.ts, lex.te) + lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te) } goto st518 tr787: lex.cs = 518 - // line internal/scanner/scanner.rl:485 +// line internal/scanner/scanner.rl:485 lex.te = (lex.p) (lex.p)-- { @@ -19874,17 +19874,17 @@ func (lex *Lexer) Lex() *Token { } goto _again st518: - // line NONE:1 +// line NONE:1 lex.ts = 0 if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof518 } st_case_518: - // line NONE:1 +// line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:18369 +// line internal/scanner/scanner.go:18369 switch lex.data[(lex.p)] { case 10: goto tr159 @@ -19900,23 +19900,23 @@ func (lex *Lexer) Lex() *Token { } goto tr777 tr778: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st519 tr784: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st519 st519: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof519 } st_case_519: - // line internal/scanner/scanner.go:18401 +// line internal/scanner/scanner.go:18401 switch lex.data[(lex.p)] { case 10: goto tr159 @@ -19930,23 +19930,23 @@ func (lex *Lexer) Lex() *Token { } goto tr781 tr159: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st520 tr785: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st520 st520: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof520 } st_case_520: - // line internal/scanner/scanner.go:18431 +// line internal/scanner/scanner.go:18431 switch lex.data[(lex.p)] { case 10: goto tr785 @@ -19960,15 +19960,15 @@ func (lex *Lexer) Lex() *Token { } goto tr783 tr786: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st109 st109: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof109 } st_case_109: - // line internal/scanner/scanner.go:18453 +// line internal/scanner/scanner.go:18453 if lex.data[(lex.p)] == 10 { goto tr159 } @@ -19983,15 +19983,15 @@ func (lex *Lexer) Lex() *Token { } goto tr787 tr160: - // line internal/scanner/scanner.rl:489 +// line internal/scanner/scanner.rl:489 (lex.p) = (lex.te) - 1 { - lex.addToken(T_WHITESPACE, lex.ts, lex.te) + lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te) } goto st522 tr788: lex.cs = 522 - // line internal/scanner/scanner.rl:491 +// line internal/scanner/scanner.rl:491 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -20000,7 +20000,7 @@ func (lex *Lexer) Lex() *Token { goto _again tr791: lex.cs = 522 - // line internal/scanner/scanner.rl:490 +// line internal/scanner/scanner.rl:490 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -20013,26 +20013,26 @@ func (lex *Lexer) Lex() *Token { } goto _again tr792: - // line internal/scanner/scanner.rl:489 +// line internal/scanner/scanner.rl:489 lex.te = (lex.p) (lex.p)-- { - lex.addToken(T_WHITESPACE, lex.ts, lex.te) + lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te) } goto st522 tr794: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:489 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:489 lex.te = (lex.p) (lex.p)-- { - lex.addToken(T_WHITESPACE, lex.ts, lex.te) + lex.addHiddenToken(T_WHITESPACE, lex.ts, lex.te) } goto st522 tr798: lex.cs = 522 - // line internal/scanner/scanner.rl:491 +// line internal/scanner/scanner.rl:491 lex.te = (lex.p) (lex.p)-- { @@ -20041,17 +20041,17 @@ func (lex *Lexer) Lex() *Token { } goto _again st522: - // line NONE:1 +// line NONE:1 lex.ts = 0 if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof522 } st_case_522: - // line NONE:1 +// line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:18516 +// line internal/scanner/scanner.go:18516 switch lex.data[(lex.p)] { case 10: goto tr161 @@ -20067,23 +20067,23 @@ func (lex *Lexer) Lex() *Token { } goto tr788 tr789: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st523 tr795: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st523 st523: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof523 } st_case_523: - // line internal/scanner/scanner.go:18548 +// line internal/scanner/scanner.go:18548 switch lex.data[(lex.p)] { case 10: goto tr161 @@ -20097,23 +20097,23 @@ func (lex *Lexer) Lex() *Token { } goto tr792 tr161: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 goto st524 tr796: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st524 st524: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof524 } st_case_524: - // line internal/scanner/scanner.go:18578 +// line internal/scanner/scanner.go:18578 switch lex.data[(lex.p)] { case 10: goto tr796 @@ -20127,15 +20127,15 @@ func (lex *Lexer) Lex() *Token { } goto tr794 tr797: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st110 st110: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof110 } st_case_110: - // line internal/scanner/scanner.go:18600 +// line internal/scanner/scanner.go:18600 if lex.data[(lex.p)] == 10 { goto tr161 } @@ -20150,7 +20150,7 @@ func (lex *Lexer) Lex() *Token { } goto tr798 tr801: - // line NONE:1 +// line NONE:1 switch lex.act { case 0: { @@ -20161,54 +20161,54 @@ func (lex *Lexer) Lex() *Token { case 186: { (lex.p) = (lex.te) - 1 - lex.addToken(T_HALT_COMPILER, lex.ts, lex.te) + lex.addHiddenToken(T_HALT_COMPILER, lex.ts, lex.te) } } goto st526 tr802: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:495 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:495 lex.te = (lex.p) (lex.p)-- { - lex.addToken(T_HALT_COMPILER, lex.ts, lex.te) + lex.addHiddenToken(T_HALT_COMPILER, lex.ts, lex.te) } goto st526 st526: - // line NONE:1 +// line NONE:1 lex.ts = 0 - // line NONE:1 +// line NONE:1 lex.act = 0 if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof526 } st_case_526: - // line NONE:1 +// line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:18647 +// line internal/scanner/scanner.go:18647 if lex.data[(lex.p)] == 10 { goto st528 } goto tr799 tr799: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:495 +// line internal/scanner/scanner.rl:495 lex.act = 186 goto st527 tr803: - // line NONE:1 +// line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:495 +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) +// line internal/scanner/scanner.rl:495 lex.act = 186 goto st527 st527: @@ -20216,21 +20216,21 @@ func (lex *Lexer) Lex() *Token { goto _test_eof527 } st_case_527: - // line internal/scanner/scanner.go:18673 +// line internal/scanner/scanner.go:18673 if lex.data[(lex.p)] == 10 { goto st528 } goto tr799 tr804: - // line internal/scanner/scanner.rl:55 - lex.NewLines.Append(lex.p) +// line internal/scanner/scanner.rl:55 + lex.newLines.Append(lex.p) goto st528 st528: if (lex.p)++; (lex.p) == (lex.pe) { goto _test_eof528 } st_case_528: - // line internal/scanner/scanner.go:18687 +// line internal/scanner/scanner.go:18687 if lex.data[(lex.p)] == 10 { goto tr804 } @@ -22852,9 +22852,9 @@ func (lex *Lexer) Lex() *Token { } } - // line internal/scanner/scanner.rl:499 +// line internal/scanner/scanner.rl:499 - token.Hidden = lex.HiddenTokens + token.Hidden = lex.hiddenTokens token.Value = lex.data[lex.ts:lex.te] token.ID = tok diff --git a/internal/scanner/scanner.rl b/internal/scanner/scanner.rl index f885098..0dc87ad 100644 --- a/internal/scanner/scanner.rl +++ b/internal/scanner/scanner.rl @@ -19,11 +19,11 @@ func initLexer(lex *Lexer) { } func (lex *Lexer) Lex() *Token { - lex.HiddenTokens = nil + lex.hiddenTokens = nil eof := lex.pe var tok TokenID - token := lex.TokenPool.Get() + token := lex.tokenPool.Get() token.Hidden = nil token.Value = lex.data[0:0] @@ -38,11 +38,11 @@ func (lex *Lexer) Lex() *Token { action constant_string_new_line { if lex.data[lex.p] == '\n' { - lex.NewLines.Append(lex.p) + lex.newLines.Append(lex.p) } if lex.data[lex.p] == '\r' && lex.data[lex.p+1] != '\n' { - lex.NewLines.Append(lex.p) + lex.newLines.Append(lex.p) } } @@ -52,7 +52,7 @@ func (lex *Lexer) Lex() *Token { action is_not_string_end_or_var { lex.isNotStringEnd('"') && lex.isNotStringVar() } action is_not_backqoute_end_or_var { lex.isNotStringEnd('`') && lex.isNotStringVar() } - newline = ('\r\n' >(nl, 1) | '\r' >(nl, 0) | '\n' >(nl, 0)) %{lex.NewLines.Append(lex.p);}; + newline = ('\r\n' >(nl, 1) | '\r' >(nl, 0) | '\n' >(nl, 0)) %{lex.newLines.Append(lex.p);}; any_line = any | newline; whitespace = [\t\v\f ]; whitespace_line = [\t\v\f ] | newline; @@ -125,7 +125,7 @@ func (lex *Lexer) Lex() *Token { main := |* "#!" any* :>> newline => { - lex.addToken(T_COMMENT, lex.ts, lex.te) + lex.addHiddenToken(T_COMMENT, lex.ts, lex.te) }; any => { fnext html; @@ -141,12 +141,12 @@ func (lex *Lexer) Lex() *Token { fbreak; }; ' { - lex.addToken(T_OPEN_TAG, lex.ts, lex.te) + lex.addHiddenToken(T_OPEN_TAG, lex.ts, lex.te) fnext php; }; ' { lex.ungetCnt(lex.te - lex.ts - 5) - lex.addToken(T_OPEN_TAG, lex.ts, lex.ts+5) + lex.addHiddenToken(T_OPEN_TAG, lex.ts, lex.ts+5) fnext php; }; ' { @@ -158,7 +158,7 @@ func (lex *Lexer) Lex() *Token { *|; php := |* - whitespace_line* => {lex.addToken(T_WHITESPACE, lex.ts, lex.te)}; + whitespace_line* => {lex.addHiddenToken(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 +318,7 @@ func (lex *Lexer) Lex() *Token { ('#' | '//') any_line* when is_not_comment_end => { lex.ungetStr("?>") - lex.addToken(T_COMMENT, lex.ts, lex.te) + lex.addHiddenToken(T_COMMENT, lex.ts, lex.te) }; '/*' any_line* :>> '*/' { isDocComment := false; @@ -327,9 +327,9 @@ func (lex *Lexer) Lex() *Token { } if isDocComment { - lex.addToken(T_DOC_COMMENT, lex.ts, lex.te) + lex.addHiddenToken(T_DOC_COMMENT, lex.ts, lex.te) } else { - lex.addToken(T_COMMENT, lex.ts, lex.te) + lex.addHiddenToken(T_COMMENT, lex.ts, lex.te) } }; @@ -378,7 +378,7 @@ func (lex *Lexer) Lex() *Token { *|; property := |* - whitespace_line* => {lex.addToken(T_WHITESPACE, lex.ts, lex.te)}; + whitespace_line* => {lex.addHiddenToken(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,31 +474,31 @@ func (lex *Lexer) Lex() *Token { *|; halt_compiller_open_parenthesis := |* - whitespace_line* => {lex.addToken(T_WHITESPACE, lex.ts, lex.te)}; + whitespace_line* => {lex.addHiddenToken(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.addToken(T_WHITESPACE, lex.ts, lex.te)}; + whitespace_line* => {lex.addHiddenToken(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.addToken(T_WHITESPACE, lex.ts, lex.te)}; + whitespace_line* => {lex.addHiddenToken(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.addToken(T_HALT_COMPILER, lex.ts, lex.te); }; + any_line* => { lex.addHiddenToken(T_HALT_COMPILER, lex.ts, lex.te); }; *|; write exec; }%% - token.Hidden = lex.HiddenTokens + token.Hidden = lex.hiddenTokens token.Value = lex.data[lex.ts:lex.te] token.ID = tok diff --git a/internal/scanner/scanner_test.go b/internal/scanner/scanner_test.go index c9f63af..9199f1d 100644 --- a/internal/scanner/scanner_test.go +++ b/internal/scanner/scanner_test.go @@ -353,8 +353,8 @@ func TestTokens(t *testing.T) { T_UNSET_CAST.String(), } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true actual := []string{} for { @@ -381,8 +381,8 @@ func TestShebang(t *testing.T) { "\n", } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true actual := []string{} tkn := lexer.Lex() @@ -401,8 +401,8 @@ func TestShebangHtml(t *testing.T) { 0.1 ` - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true tkn := lexer.Lex() assert.Equal(t, tkn.ID, T_INLINE_HTML) @@ -451,8 +451,8 @@ func TestNumberTokens(t *testing.T) { T_DNUMBER.String(), } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true actual := []string{} for { @@ -508,8 +508,8 @@ func TestConstantStrings(t *testing.T) { T_CONSTANT_ENCAPSED_STRING.String(), } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true actual := []string{} for { @@ -555,7 +555,7 @@ func TestSingleQuoteStringTokens(t *testing.T) { T_CONSTANT_ENCAPSED_STRING.String(), } - lexer := NewLexer([]byte(src), nil) + lexer := NewLexer([]byte(src), "7.4", Config{}) actual := []string{} for { @@ -642,8 +642,8 @@ func TestTeplateStringTokens(t *testing.T) { TokenID(int('"')).String(), } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true actual := []string{} for { @@ -727,8 +727,8 @@ func TestBackquoteStringTokens(t *testing.T) { TokenID(int('`')).String(), } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true actual := []string{} for { @@ -821,8 +821,8 @@ CAT; TokenID(int(';')).String(), } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true actual := []string{} for { @@ -894,8 +894,8 @@ CAT T_END_HEREDOC.String(), } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true actual := []string{} for { @@ -933,8 +933,8 @@ CAT; TokenID(int(';')).String(), } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true actual := []string{} for { @@ -964,8 +964,8 @@ func TestHereDocTokens73(t *testing.T) { T_VARIABLE.String(), } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true actual := []string{} for { @@ -994,9 +994,9 @@ CAT;` TokenID(int(';')).String(), } - lexer := NewLexer([]byte(src), nil) - lexer.PHPVersion = "7.2" - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.phpVersion = "7.2" + lexer.withHiddenTokens = true actual := []string{} for { @@ -1027,8 +1027,8 @@ func TestInlineHtmlNopTokens(t *testing.T) { T_INLINE_HTML.String(), } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true actual := []string{} for { @@ -1062,7 +1062,7 @@ func TestStringTokensAfterVariable(t *testing.T) { "\"", } - lexer := NewLexer([]byte(src), nil) + lexer := NewLexer([]byte(src), "7.4", Config{}) actual := []string{} actualTokens := []string{} @@ -1095,7 +1095,7 @@ func TestSlashAfterVariable(t *testing.T) { "3", } - lexer := NewLexer([]byte(src), nil) + lexer := NewLexer([]byte(src), "7.4", Config{}) actual := []string{} actualTokens := []string{} @@ -1132,12 +1132,12 @@ func TestCommentEnd(t *testing.T) { }, } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true lexer.Lex() - actual := lexer.HiddenTokens + actual := lexer.hiddenTokens assert.DeepEqual(t, expected, actual) } @@ -1161,8 +1161,8 @@ func TestCommentNewLine(t *testing.T) { }, } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true tkn := lexer.Lex() @@ -1190,8 +1190,8 @@ func TestCommentNewLine1(t *testing.T) { }, } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true tkn := lexer.Lex() @@ -1219,8 +1219,8 @@ func TestCommentNewLine2(t *testing.T) { }, } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true tkn := lexer.Lex() @@ -1249,8 +1249,8 @@ func TestCommentWithPhpEndTag(t *testing.T) { }, } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true tkn := lexer.Lex() @@ -1279,8 +1279,8 @@ func TestInlineComment(t *testing.T) { }, } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true tkn := lexer.Lex() @@ -1309,12 +1309,12 @@ func TestInlineComment2(t *testing.T) { }, } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true lexer.Lex() - actual := lexer.HiddenTokens + actual := lexer.hiddenTokens assert.DeepEqual(t, expected, actual) } @@ -1343,12 +1343,12 @@ func TestEmptyInlineComment(t *testing.T) { }, } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true lexer.Lex() - actual := lexer.HiddenTokens + actual := lexer.hiddenTokens assert.DeepEqual(t, expected, actual) } @@ -1373,8 +1373,8 @@ func TestEmptyInlineComment2(t *testing.T) { }, } - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true tkn := lexer.Lex() @@ -1387,8 +1387,8 @@ func TestMethodCallTokens(t *testing.T) { src := ` bar ( '' ) ;` - lexer := NewLexer([]byte(src), nil) - lexer.WithHiddenTokens = true + lexer := NewLexer([]byte(src), "7.4", Config{}) + lexer.withHiddenTokens = true expected := []token.Token{ { @@ -1469,8 +1469,8 @@ func TestYieldFromTokens(t *testing.T) { src := `