diff --git a/internal/scanner/lexer.go b/internal/scanner/lexer.go
index 7986acb..8c0381f 100644
--- a/internal/scanner/lexer.go
+++ b/internal/scanner/lexer.go
@@ -15,7 +15,6 @@ type Lexer struct {
 	phpVersion     string
 	errHandlerFunc func(*errors.Error)
 
-	sts, ste    int
 	p, pe, cs   int
 	ts, te, act int
 	stack       []int
@@ -57,26 +56,18 @@ func (lex *Lexer) setTokenPosition(token *token.Token) {
 	token.Position = pos
 }
 
-func (lex *Lexer) addSkippedToken(t *token.Token, id token.ID, ps, pe int) {
-	if lex.sts == -1 {
-		lex.sts = lex.ts
-	}
-
-	lex.ste = lex.te
-
-	// TODO remove after parser refactoring
-
+func (lex *Lexer) addFreeFloatingToken(t *token.Token, id token.ID, ps, pe int) {
 	skippedTkn := lex.tokenPool.Get()
 	skippedTkn.ID = id
 	skippedTkn.Value = lex.data[ps:pe]
 
 	lex.setTokenPosition(skippedTkn)
 
-	if t.SkippedTokens == nil {
-		t.SkippedTokens = make([]*token.Token, 0, 2)
+	if t.FreeFloating == nil {
+		t.FreeFloating = make([]*token.Token, 0, 2)
 	}
 
-	t.SkippedTokens = append(t.SkippedTokens, skippedTkn)
+	t.FreeFloating = append(t.FreeFloating, skippedTkn)
 }
 
 func (lex *Lexer) isNotStringVar() bool {
diff --git a/internal/scanner/scanner.go b/internal/scanner/scanner.go
index 9f779e6..bd7768b 100644
--- a/internal/scanner/scanner.go
+++ b/internal/scanner/scanner.go
@@ -53,15 +53,12 @@ func (lex *Lexer) Lex() *token.Token {
 
 	tkn := lex.tokenPool.Get()
 
-	lex.sts = -1
-	lex.ste = 0
-
 	lblStart := 0
 	lblEnd := 0
 
 	_, _ = lblStart, lblEnd
 
-	// line internal/scanner/scanner.go:70
+	// line internal/scanner/scanner.go:67
 	{
 		var _widec int16
 		if (lex.p) == (lex.pe) {
@@ -2218,7 +2215,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto st_out
 	tr0:
 		lex.cs = 113
-		// line internal/scanner/scanner.rl:132
+		// line internal/scanner/scanner.rl:129
 		(lex.p) = (lex.te) - 1
 		{
 			lex.cs = 116
@@ -2227,7 +2224,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto _again
 	tr169:
 		lex.cs = 113
-		// line internal/scanner/scanner.rl:132
+		// line internal/scanner/scanner.rl:129
 		lex.te = (lex.p) + 1
 		{
 			lex.cs = 116
@@ -2236,7 +2233,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto _again
 	tr171:
 		lex.cs = 113
-		// line internal/scanner/scanner.rl:132
+		// line internal/scanner/scanner.rl:129
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -2245,13 +2242,13 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto _again
 	tr172:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:129
+		// line internal/scanner/scanner.rl:126
 		lex.te = (lex.p)
 		(lex.p)--
 		{
-			lex.addSkippedToken(tkn, token.T_COMMENT, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_COMMENT, lex.ts, lex.te)
 		}
 		goto st113
 	st113:
@@ -2265,7 +2262,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.ts = (lex.p)
 
-		// line internal/scanner/scanner.go:2274
+		// line internal/scanner/scanner.go:2271
 		if lex.data[(lex.p)] == 35 {
 			goto tr170
 		}
@@ -2280,13 +2277,13 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof114
 		}
 	st_case_114:
-		// line internal/scanner/scanner.go:2289
+		// line internal/scanner/scanner.go:2286
 		if lex.data[(lex.p)] == 33 {
 			goto st1
 		}
 		goto tr171
 	tr3:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -2302,7 +2299,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof1
 		}
 	st_case_1:
-		// line internal/scanner/scanner.go:2311
+		// line internal/scanner/scanner.go:2308
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr2
@@ -2311,7 +2308,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st1
 	tr2:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -2327,29 +2324,29 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof115
 		}
 	st_case_115:
-		// line internal/scanner/scanner.go:2336
+		// line internal/scanner/scanner.go:2333
 		goto tr172
 	tr4:
 		lex.cs = 116
-		// line internal/scanner/scanner.rl:145
+		// line internal/scanner/scanner.rl:142
 		(lex.p) = (lex.te) - 1
 		{
-			lex.addSkippedToken(tkn, token.T_OPEN_TAG, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_OPEN_TAG, lex.ts, lex.te)
 			lex.cs = 123
 		}
 		goto _again
 	tr7:
 		lex.cs = 116
-		// line internal/scanner/scanner.rl:149
+		// line internal/scanner/scanner.rl:146
 		lex.te = (lex.p) + 1
 		{
 			lex.ungetCnt(lex.te - lex.ts - 5)
-			lex.addSkippedToken(tkn, token.T_OPEN_TAG, lex.ts, lex.ts+5)
+			lex.addFreeFloatingToken(tkn, token.T_OPEN_TAG, lex.ts, lex.ts+5)
 			lex.cs = 123
 		}
 		goto _again
 	tr177:
-		// line internal/scanner/scanner.rl:139
+		// line internal/scanner/scanner.rl:136
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -2364,9 +2361,9 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st116
 	tr179:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:139
+		// line internal/scanner/scanner.rl:136
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -2382,17 +2379,17 @@ func (lex *Lexer) Lex() *token.Token {
 		goto st116
 	tr185:
 		lex.cs = 116
-		// line internal/scanner/scanner.rl:145
+		// line internal/scanner/scanner.rl:142
 		lex.te = (lex.p)
 		(lex.p)--
 		{
-			lex.addSkippedToken(tkn, token.T_OPEN_TAG, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_OPEN_TAG, lex.ts, lex.te)
 			lex.cs = 123
 		}
 		goto _again
 	tr186:
 		lex.cs = 116
-		// line internal/scanner/scanner.rl:154
+		// line internal/scanner/scanner.rl:151
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -2406,14 +2403,14 @@ func (lex *Lexer) Lex() *token.Token {
 		goto _again
 	tr188:
 		lex.cs = 116
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:149
+		// line internal/scanner/scanner.rl:146
 		lex.te = (lex.p)
 		(lex.p)--
 		{
 			lex.ungetCnt(lex.te - lex.ts - 5)
-			lex.addSkippedToken(tkn, token.T_OPEN_TAG, lex.ts, lex.ts+5)
+			lex.addFreeFloatingToken(tkn, token.T_OPEN_TAG, lex.ts, lex.ts+5)
 			lex.cs = 123
 		}
 		goto _again
@@ -2428,7 +2425,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.ts = (lex.p)
 
-		// line internal/scanner/scanner.go:2426
+		// line internal/scanner/scanner.go:2423
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr174
@@ -2439,7 +2436,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st117
 	tr175:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -2451,13 +2448,13 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st117
 	tr180:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
 		goto st117
 	tr182:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -2473,7 +2470,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof117
 		}
 	st_case_117:
-		// line internal/scanner/scanner.go:2471
+		// line internal/scanner/scanner.go:2468
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr174
@@ -2484,7 +2481,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st117
 	tr174:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -2496,9 +2493,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st118
 	tr181:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -2514,7 +2511,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof118
 		}
 	st_case_118:
-		// line internal/scanner/scanner.go:2512
+		// line internal/scanner/scanner.go:2509
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr181
@@ -2525,7 +2522,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr180
 	tr183:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
 		goto st119
 	st119:
@@ -2533,7 +2530,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof119
 		}
 	st_case_119:
-		// line internal/scanner/scanner.go:2531
+		// line internal/scanner/scanner.go:2528
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr174
@@ -2571,7 +2568,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof121
 		}
 	st_case_121:
-		// line internal/scanner/scanner.go:2569
+		// line internal/scanner/scanner.go:2566
 		switch lex.data[(lex.p)] {
 		case 61:
 			goto tr186
@@ -2622,7 +2619,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr4
 	tr8:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -2638,10 +2635,10 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof122
 		}
 	st_case_122:
-		// line internal/scanner/scanner.go:2636
+		// line internal/scanner/scanner.go:2633
 		goto tr188
 	tr9:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -2657,16 +2654,16 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof5
 		}
 	st_case_5:
-		// line internal/scanner/scanner.go:2655
+		// line internal/scanner/scanner.go:2652
 		if lex.data[(lex.p)] == 10 {
 			goto tr8
 		}
 		goto tr4
 	tr10:
-		// line internal/scanner/scanner.rl:163
+		// line internal/scanner/scanner.rl:160
 		(lex.p) = (lex.te) - 1
 		{
-			lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
 		}
 		goto st123
 	tr12:
@@ -3483,7 +3480,7 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto _again
 	tr15:
-		// line internal/scanner/scanner.rl:351
+		// line internal/scanner/scanner.rl:348
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3496,7 +3493,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr19:
-		// line internal/scanner/scanner.rl:374
+		// line internal/scanner/scanner.rl:371
 		(lex.p) = (lex.te) - 1
 		{
 			c := lex.data[lex.p]
@@ -3504,7 +3501,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr23:
-		// line internal/scanner/scanner.rl:338
+		// line internal/scanner/scanner.rl:335
 		(lex.p) = (lex.te) - 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3517,7 +3514,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr38:
-		// line internal/scanner/scanner.rl:313
+		// line internal/scanner/scanner.rl:310
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3530,7 +3527,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr45:
-		// line internal/scanner/scanner.rl:318
+		// line internal/scanner/scanner.rl:315
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3543,7 +3540,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr49:
-		// line internal/scanner/scanner.rl:314
+		// line internal/scanner/scanner.rl:311
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3556,7 +3553,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr57:
-		// line internal/scanner/scanner.rl:315
+		// line internal/scanner/scanner.rl:312
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3569,7 +3566,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr64:
-		// line internal/scanner/scanner.rl:316
+		// line internal/scanner/scanner.rl:313
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3582,7 +3579,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr73:
-		// line internal/scanner/scanner.rl:317
+		// line internal/scanner/scanner.rl:314
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3595,7 +3592,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr84:
-		// line internal/scanner/scanner.rl:319
+		// line internal/scanner/scanner.rl:316
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3608,7 +3605,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr85:
-		// line internal/scanner/scanner.rl:281
+		// line internal/scanner/scanner.rl:278
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3621,7 +3618,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr88:
-		// line internal/scanner/scanner.rl:167
+		// line internal/scanner/scanner.rl:164
 		(lex.p) = (lex.te) - 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3634,7 +3631,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr98:
-		// line internal/scanner/scanner.rl:325
+		// line internal/scanner/scanner.rl:322
 		lex.te = (lex.p) + 1
 		{
 			isDocComment := false
@@ -3643,14 +3640,14 @@ func (lex *Lexer) Lex() *token.Token {
 			}
 
 			if isDocComment {
-				lex.addSkippedToken(tkn, token.T_DOC_COMMENT, lex.ts, lex.te)
+				lex.addFreeFloatingToken(tkn, token.T_DOC_COMMENT, lex.ts, lex.te)
 			} else {
-				lex.addSkippedToken(tkn, token.T_COMMENT, lex.ts, lex.te)
+				lex.addFreeFloatingToken(tkn, token.T_COMMENT, lex.ts, lex.te)
 			}
 		}
 		goto st123
 	tr99:
-		// line internal/scanner/scanner.rl:178
+		// line internal/scanner/scanner.rl:175
 		(lex.p) = (lex.te) - 1
 		{
 			base := 10
@@ -3682,7 +3679,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto st123
 	tr112:
 		lex.cs = 123
-		// line internal/scanner/scanner.rl:165
+		// line internal/scanner/scanner.rl:162
 		(lex.p) = (lex.te) - 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3696,7 +3693,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto _again
 	tr128:
 		lex.cs = 123
-		// line internal/scanner/scanner.rl:164
+		// line internal/scanner/scanner.rl:161
 		(lex.p) = (lex.te) - 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3709,7 +3706,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto _again
 	tr130:
-		// line internal/scanner/scanner.rl:347
+		// line internal/scanner/scanner.rl:344
 		(lex.p) = (lex.te) - 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3722,7 +3719,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr132:
-		// line internal/scanner/scanner.rl:262
+		// line internal/scanner/scanner.rl:259
 		(lex.p) = (lex.te) - 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3735,7 +3732,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr143:
-		// line internal/scanner/scanner.rl:261
+		// line internal/scanner/scanner.rl:258
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3748,7 +3745,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr189:
-		// line internal/scanner/scanner.rl:374
+		// line internal/scanner/scanner.rl:371
 		lex.te = (lex.p) + 1
 		{
 			c := lex.data[lex.p]
@@ -3756,7 +3753,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr200:
-		// line internal/scanner/scanner.rl:338
+		// line internal/scanner/scanner.rl:335
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3769,7 +3766,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr234:
-		// line internal/scanner/scanner.rl:280
+		// line internal/scanner/scanner.rl:277
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3783,7 +3780,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto st123
 	tr237:
 		lex.cs = 123
-		// line internal/scanner/scanner.rl:371
+		// line internal/scanner/scanner.rl:368
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3796,7 +3793,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto _again
 	tr238:
-		// line internal/scanner/scanner.rl:344
+		// line internal/scanner/scanner.rl:341
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3806,7 +3803,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr240:
-		// line internal/scanner/scanner.rl:345
+		// line internal/scanner/scanner.rl:342
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3816,25 +3813,25 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr241:
-		// line internal/scanner/scanner.rl:163
+		// line internal/scanner/scanner.rl:160
 		lex.te = (lex.p)
 		(lex.p)--
 		{
-			lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
 		}
 		goto st123
 	tr243:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:163
+		// line internal/scanner/scanner.rl:160
 		lex.te = (lex.p)
 		(lex.p)--
 		{
-			lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
 		}
 		goto st123
 	tr247:
-		// line internal/scanner/scanner.rl:374
+		// line internal/scanner/scanner.rl:371
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -3843,7 +3840,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr248:
-		// line internal/scanner/scanner.rl:338
+		// line internal/scanner/scanner.rl:335
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -3857,7 +3854,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr250:
-		// line internal/scanner/scanner.rl:299
+		// line internal/scanner/scanner.rl:296
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -3871,7 +3868,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr251:
-		// line internal/scanner/scanner.rl:300
+		// line internal/scanner/scanner.rl:297
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3885,7 +3882,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto st123
 	tr252:
 		lex.cs = 123
-		// line internal/scanner/scanner.rl:372
+		// line internal/scanner/scanner.rl:369
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -3899,27 +3896,27 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto _again
 	tr253:
-		// line internal/scanner/scanner.rl:321
+		// line internal/scanner/scanner.rl:318
 		lex.te = (lex.p)
 		(lex.p)--
 		{
 			lex.ungetStr("?>")
-			lex.addSkippedToken(tkn, token.T_COMMENT, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_COMMENT, lex.ts, lex.te)
 		}
 		goto st123
 	tr256:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:321
+		// line internal/scanner/scanner.rl:318
 		lex.te = (lex.p)
 		(lex.p)--
 		{
 			lex.ungetStr("?>")
-			lex.addSkippedToken(tkn, token.T_COMMENT, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_COMMENT, lex.ts, lex.te)
 		}
 		goto st123
 	tr261:
-		// line internal/scanner/scanner.rl:346
+		// line internal/scanner/scanner.rl:343
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -3933,7 +3930,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr262:
-		// line internal/scanner/scanner.rl:294
+		// line internal/scanner/scanner.rl:291
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3946,7 +3943,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr263:
-		// line internal/scanner/scanner.rl:283
+		// line internal/scanner/scanner.rl:280
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3959,7 +3956,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr264:
-		// line internal/scanner/scanner.rl:285
+		// line internal/scanner/scanner.rl:282
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3972,7 +3969,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr266:
-		// line internal/scanner/scanner.rl:288
+		// line internal/scanner/scanner.rl:285
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -3985,7 +3982,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr267:
-		// line internal/scanner/scanner.rl:307
+		// line internal/scanner/scanner.rl:304
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -3999,7 +3996,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr268:
-		// line internal/scanner/scanner.rl:289
+		// line internal/scanner/scanner.rl:286
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4012,7 +4009,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr269:
-		// line internal/scanner/scanner.rl:296
+		// line internal/scanner/scanner.rl:293
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4025,7 +4022,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr270:
-		// line internal/scanner/scanner.rl:291
+		// line internal/scanner/scanner.rl:288
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4038,7 +4035,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr271:
-		// line internal/scanner/scanner.rl:295
+		// line internal/scanner/scanner.rl:292
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4051,7 +4048,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr272:
-		// line internal/scanner/scanner.rl:292
+		// line internal/scanner/scanner.rl:289
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4065,7 +4062,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto st123
 	tr273:
 		lex.cs = 123
-		// line internal/scanner/scanner.rl:349
+		// line internal/scanner/scanner.rl:346
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4078,7 +4075,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto _again
 	tr275:
-		// line internal/scanner/scanner.rl:287
+		// line internal/scanner/scanner.rl:284
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4091,7 +4088,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr276:
-		// line internal/scanner/scanner.rl:167
+		// line internal/scanner/scanner.rl:164
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4105,7 +4102,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr279:
-		// line internal/scanner/scanner.rl:290
+		// line internal/scanner/scanner.rl:287
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4118,7 +4115,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr280:
-		// line internal/scanner/scanner.rl:178
+		// line internal/scanner/scanner.rl:175
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4150,7 +4147,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr285:
-		// line internal/scanner/scanner.rl:168
+		// line internal/scanner/scanner.rl:165
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4177,7 +4174,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr286:
-		// line internal/scanner/scanner.rl:193
+		// line internal/scanner/scanner.rl:190
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4204,7 +4201,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr287:
-		// line internal/scanner/scanner.rl:282
+		// line internal/scanner/scanner.rl:279
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4218,7 +4215,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto st123
 	tr288:
 		lex.cs = 123
-		// line internal/scanner/scanner.rl:165
+		// line internal/scanner/scanner.rl:162
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4233,9 +4230,9 @@ func (lex *Lexer) Lex() *token.Token {
 		goto _again
 	tr290:
 		lex.cs = 123
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:165
+		// line internal/scanner/scanner.rl:162
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4249,7 +4246,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto _again
 	tr293:
-		// line internal/scanner/scanner.rl:299
+		// line internal/scanner/scanner.rl:296
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4262,7 +4259,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr294:
-		// line internal/scanner/scanner.rl:308
+		// line internal/scanner/scanner.rl:305
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4276,7 +4273,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr295:
-		// line internal/scanner/scanner.rl:303
+		// line internal/scanner/scanner.rl:300
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4290,9 +4287,9 @@ func (lex *Lexer) Lex() *token.Token {
 		goto st123
 	tr296:
 		lex.cs = 123
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:357
+		// line internal/scanner/scanner.rl:354
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4314,7 +4311,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto _again
 	tr297:
-		// line internal/scanner/scanner.rl:306
+		// line internal/scanner/scanner.rl:303
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4328,7 +4325,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr298:
-		// line internal/scanner/scanner.rl:298
+		// line internal/scanner/scanner.rl:295
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4341,7 +4338,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr300:
-		// line internal/scanner/scanner.rl:297
+		// line internal/scanner/scanner.rl:294
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4354,7 +4351,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr301:
-		// line internal/scanner/scanner.rl:301
+		// line internal/scanner/scanner.rl:298
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4368,7 +4365,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr302:
-		// line internal/scanner/scanner.rl:302
+		// line internal/scanner/scanner.rl:299
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4381,7 +4378,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr303:
-		// line internal/scanner/scanner.rl:305
+		// line internal/scanner/scanner.rl:302
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4394,7 +4391,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr305:
-		// line internal/scanner/scanner.rl:309
+		// line internal/scanner/scanner.rl:306
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4408,7 +4405,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr306:
-		// line internal/scanner/scanner.rl:304
+		// line internal/scanner/scanner.rl:301
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4422,7 +4419,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto st123
 	tr309:
 		lex.cs = 123
-		// line internal/scanner/scanner.rl:164
+		// line internal/scanner/scanner.rl:161
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4437,9 +4434,9 @@ func (lex *Lexer) Lex() *token.Token {
 		goto _again
 	tr311:
 		lex.cs = 123
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:164
+		// line internal/scanner/scanner.rl:161
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4453,7 +4450,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto _again
 	tr312:
-		// line internal/scanner/scanner.rl:310
+		// line internal/scanner/scanner.rl:307
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4467,7 +4464,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr313:
-		// line internal/scanner/scanner.rl:311
+		// line internal/scanner/scanner.rl:308
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4480,7 +4477,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr314:
-		// line internal/scanner/scanner.rl:347
+		// line internal/scanner/scanner.rl:344
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4494,7 +4491,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr394:
-		// line internal/scanner/scanner.rl:219
+		// line internal/scanner/scanner.rl:216
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4508,7 +4505,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr414:
-		// line internal/scanner/scanner.rl:223
+		// line internal/scanner/scanner.rl:220
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4522,7 +4519,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr443:
-		// line internal/scanner/scanner.rl:231
+		// line internal/scanner/scanner.rl:228
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4536,7 +4533,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr447:
-		// line internal/scanner/scanner.rl:233
+		// line internal/scanner/scanner.rl:230
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4550,7 +4547,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr479:
-		// line internal/scanner/scanner.rl:263
+		// line internal/scanner/scanner.rl:260
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4564,7 +4561,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr547:
-		// line internal/scanner/scanner.rl:265
+		// line internal/scanner/scanner.rl:262
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4578,7 +4575,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr593:
-		// line internal/scanner/scanner.rl:262
+		// line internal/scanner/scanner.rl:259
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -4592,7 +4589,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr598:
-		// line internal/scanner/scanner.rl:293
+		// line internal/scanner/scanner.rl:290
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4605,7 +4602,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr672:
-		// line internal/scanner/scanner.rl:286
+		// line internal/scanner/scanner.rl:283
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4618,7 +4615,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st123
 	tr673:
-		// line internal/scanner/scanner.rl:284
+		// line internal/scanner/scanner.rl:281
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -4641,7 +4638,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.ts = (lex.p)
 
-		// line internal/scanner/scanner.go:3506
+		// line internal/scanner/scanner.go:3503
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr11
@@ -4826,7 +4823,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
 		goto st124
 	st124:
@@ -4834,7 +4831,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof124
 		}
 	st_case_124:
-		// line internal/scanner/scanner.go:3699
+		// line internal/scanner/scanner.go:3696
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr11
@@ -4851,7 +4848,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -4866,9 +4863,9 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -4884,7 +4881,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof125
 		}
 	st_case_125:
-		// line internal/scanner/scanner.go:3749
+		// line internal/scanner/scanner.go:3746
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr245
@@ -4898,7 +4895,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr243
 	tr242:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -4910,9 +4907,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st6
 	tr246:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -4928,13 +4925,13 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof6
 		}
 	st_case_6:
-		// line internal/scanner/scanner.go:3793
+		// line internal/scanner/scanner.go:3790
 		if lex.data[(lex.p)] == 10 {
 			goto tr11
 		}
 		goto tr10
 	tr191:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -4950,7 +4947,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof126
 		}
 	st_case_126:
-		// line internal/scanner/scanner.go:3815
+		// line internal/scanner/scanner.go:3812
 		if lex.data[(lex.p)] == 10 {
 			goto tr11
 		}
@@ -4977,7 +4974,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:372
+		// line internal/scanner/scanner.rl:369
 		lex.act = 140
 		goto st129
 	st129:
@@ -4985,7 +4982,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof129
 		}
 	st_case_129:
-		// line internal/scanner/scanner.go:3850
+		// line internal/scanner/scanner.go:3847
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr14
@@ -5002,7 +4999,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st7
 	tr14:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -5018,7 +5015,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof7
 		}
 	st_case_7:
-		// line internal/scanner/scanner.go:3883
+		// line internal/scanner/scanner.go:3880
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr14
@@ -5095,7 +5092,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st7
 	tr255:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -5107,13 +5104,13 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st130
 	tr257:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
 		goto st130
 	tr259:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -5129,7 +5126,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof130
 		}
 	st_case_130:
-		// line internal/scanner/scanner.go:3994
+		// line internal/scanner/scanner.go:3991
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -5179,7 +5176,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr253
 	tr254:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -5191,9 +5188,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st131
 	tr258:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -5209,7 +5206,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof131
 		}
 	st_case_131:
-		// line internal/scanner/scanner.go:4074
+		// line internal/scanner/scanner.go:4071
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -5336,7 +5333,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof136
 		}
 	st_case_136:
-		// line internal/scanner/scanner.go:4201
+		// line internal/scanner/scanner.go:4198
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr21
@@ -5349,7 +5346,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st11
 	tr21:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -5365,7 +5362,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof11
 		}
 	st_case_11:
-		// line internal/scanner/scanner.go:4230
+		// line internal/scanner/scanner.go:4227
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr21
@@ -5399,7 +5396,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof137
 		}
 	st_case_137:
-		// line internal/scanner/scanner.go:4264
+		// line internal/scanner/scanner.go:4261
 		switch lex.data[(lex.p)] {
 		case 9:
 			goto st13
@@ -6247,7 +6244,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof142
 		}
 	st_case_142:
-		// line internal/scanner/scanner.go:5112
+		// line internal/scanner/scanner.go:5109
 		switch lex.data[(lex.p)] {
 		case 46:
 			goto st67
@@ -6271,7 +6268,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:167
+		// line internal/scanner/scanner.rl:164
 		lex.act = 10
 		goto st143
 	st143:
@@ -6279,7 +6276,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof143
 		}
 	st_case_143:
-		// line internal/scanner/scanner.go:5144
+		// line internal/scanner/scanner.go:5141
 		switch lex.data[(lex.p)] {
 		case 69:
 			goto st68
@@ -6320,7 +6317,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:167
+		// line internal/scanner/scanner.rl:164
 		lex.act = 10
 		goto st144
 	st144:
@@ -6328,7 +6325,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof144
 		}
 	st_case_144:
-		// line internal/scanner/scanner.go:5193
+		// line internal/scanner/scanner.go:5190
 		if lex.data[(lex.p)] == 95 {
 			goto st69
 		}
@@ -6355,7 +6352,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof145
 		}
 	st_case_145:
-		// line internal/scanner/scanner.go:5220
+		// line internal/scanner/scanner.go:5217
 		switch lex.data[(lex.p)] {
 		case 42:
 			goto st71
@@ -6366,7 +6363,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr248
 	tr92:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -6378,13 +6375,13 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st71
 	tr94:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
 		goto st71
 	tr96:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -6400,7 +6397,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof71
 		}
 	st_case_71:
-		// line internal/scanner/scanner.go:5265
+		// line internal/scanner/scanner.go:5262
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr91
@@ -6411,7 +6408,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st71
 	tr91:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -6423,9 +6420,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st72
 	tr95:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -6441,7 +6438,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof72
 		}
 	st_case_72:
-		// line internal/scanner/scanner.go:5306
+		// line internal/scanner/scanner.go:5303
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr95
@@ -6452,7 +6449,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr94
 	tr97:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
 		goto st73
 	st73:
@@ -6460,7 +6457,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof73
 		}
 	st_case_73:
-		// line internal/scanner/scanner.go:5325
+		// line internal/scanner/scanner.go:5322
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr91
@@ -6476,7 +6473,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:178
+		// line internal/scanner/scanner.rl:175
 		lex.act = 12
 		goto st146
 	st146:
@@ -6484,7 +6481,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof146
 		}
 	st_case_146:
-		// line internal/scanner/scanner.go:5349
+		// line internal/scanner/scanner.go:5346
 		switch lex.data[(lex.p)] {
 		case 46:
 			goto tr281
@@ -6507,7 +6504,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:167
+		// line internal/scanner/scanner.rl:164
 		lex.act = 10
 		goto st147
 	st147:
@@ -6515,7 +6512,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof147
 		}
 	st_case_147:
-		// line internal/scanner/scanner.go:5380
+		// line internal/scanner/scanner.go:5377
 		switch lex.data[(lex.p)] {
 		case 69:
 			goto st68
@@ -6530,7 +6527,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:178
+		// line internal/scanner/scanner.rl:175
 		lex.act = 12
 		goto st148
 	st148:
@@ -6538,7 +6535,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof148
 		}
 	st_case_148:
-		// line internal/scanner/scanner.go:5403
+		// line internal/scanner/scanner.go:5400
 		switch lex.data[(lex.p)] {
 		case 46:
 			goto tr281
@@ -6575,7 +6572,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:168
+		// line internal/scanner/scanner.rl:165
 		lex.act = 11
 		goto st149
 	st149:
@@ -6583,7 +6580,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof149
 		}
 	st_case_149:
-		// line internal/scanner/scanner.go:5448
+		// line internal/scanner/scanner.go:5445
 		if lex.data[(lex.p)] == 95 {
 			goto st75
 		}
@@ -6613,7 +6610,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:193
+		// line internal/scanner/scanner.rl:190
 		lex.act = 13
 		goto st150
 	st150:
@@ -6621,7 +6618,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof150
 		}
 	st_case_150:
-		// line internal/scanner/scanner.go:5486
+		// line internal/scanner/scanner.go:5483
 		if lex.data[(lex.p)] == 95 {
 			goto st76
 		}
@@ -6657,7 +6654,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof152
 		}
 	st_case_152:
-		// line internal/scanner/scanner.go:5522
+		// line internal/scanner/scanner.go:5519
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr104
@@ -6673,7 +6670,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr248
 	tr107:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
 		goto st77
 	st77:
@@ -6681,7 +6678,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof77
 		}
 	st_case_77:
-		// line internal/scanner/scanner.go:5546
+		// line internal/scanner/scanner.go:5543
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr104
@@ -6697,7 +6694,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr23
 	tr104:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -6709,9 +6706,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st78
 	tr108:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -6727,7 +6724,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof78
 		}
 	st_case_78:
-		// line internal/scanner/scanner.go:5592
+		// line internal/scanner/scanner.go:5589
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr108
@@ -6743,7 +6740,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr23
 	tr105:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -6755,9 +6752,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st79
 	tr109:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -6773,13 +6770,13 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof79
 		}
 	st_case_79:
-		// line internal/scanner/scanner.go:5638
+		// line internal/scanner/scanner.go:5635
 		if lex.data[(lex.p)] == 10 {
 			goto tr104
 		}
 		goto tr23
 	tr110:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
 		goto st80
 	st80:
@@ -6787,7 +6784,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof80
 		}
 	st_case_80:
-		// line internal/scanner/scanner.go:5652
+		// line internal/scanner/scanner.go:5649
 		if lex.data[(lex.p)] == 62 {
 			goto tr111
 		}
@@ -6802,7 +6799,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof153
 		}
 	st_case_153:
-		// line internal/scanner/scanner.go:5667
+		// line internal/scanner/scanner.go:5664
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr113
@@ -6811,7 +6808,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr288
 	tr113:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -6827,10 +6824,10 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof154
 		}
 	st_case_154:
-		// line internal/scanner/scanner.go:5692
+		// line internal/scanner/scanner.go:5689
 		goto tr290
 	tr289:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -6846,7 +6843,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof81
 		}
 	st_case_81:
-		// line internal/scanner/scanner.go:5711
+		// line internal/scanner/scanner.go:5708
 		if lex.data[(lex.p)] == 10 {
 			goto tr113
 		}
@@ -6869,7 +6866,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:308
+		// line internal/scanner/scanner.rl:305
 		lex.act = 118
 		goto st156
 	st156:
@@ -6877,7 +6874,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof156
 		}
 	st_case_156:
-		// line internal/scanner/scanner.go:5742
+		// line internal/scanner/scanner.go:5739
 		switch lex.data[(lex.p)] {
 		case 60:
 			goto st82
@@ -6937,7 +6934,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr118
 	tr118:
-		// line internal/scanner/scanner.rl:38
+		// line internal/scanner/scanner.rl:35
 		lblStart = lex.p
 		goto st84
 	st84:
@@ -6945,7 +6942,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof84
 		}
 	st_case_84:
-		// line internal/scanner/scanner.go:5810
+		// line internal/scanner/scanner.go:5807
 		switch lex.data[(lex.p)] {
 		case 34:
 			goto tr119
@@ -6971,7 +6968,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st84
 	tr119:
-		// line internal/scanner/scanner.rl:39
+		// line internal/scanner/scanner.rl:36
 		lblEnd = lex.p
 		goto st85
 	st85:
@@ -6979,7 +6976,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof85
 		}
 	st_case_85:
-		// line internal/scanner/scanner.go:5844
+		// line internal/scanner/scanner.go:5841
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr121
@@ -6988,7 +6985,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr12
 	tr121:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -7000,9 +6997,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st157
 	tr125:
-		// line internal/scanner/scanner.rl:39
+		// line internal/scanner/scanner.rl:36
 		lblEnd = lex.p
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -7018,10 +7015,10 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof157
 		}
 	st_case_157:
-		// line internal/scanner/scanner.go:5883
+		// line internal/scanner/scanner.go:5880
 		goto tr296
 	tr122:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -7033,9 +7030,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st86
 	tr126:
-		// line internal/scanner/scanner.rl:39
+		// line internal/scanner/scanner.rl:36
 		lblEnd = lex.p
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -7051,7 +7048,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof86
 		}
 	st_case_86:
-		// line internal/scanner/scanner.go:5916
+		// line internal/scanner/scanner.go:5913
 		if lex.data[(lex.p)] == 10 {
 			goto tr121
 		}
@@ -7078,7 +7075,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr123
 	tr123:
-		// line internal/scanner/scanner.rl:38
+		// line internal/scanner/scanner.rl:35
 		lblStart = lex.p
 		goto st88
 	st88:
@@ -7086,7 +7083,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof88
 		}
 	st_case_88:
-		// line internal/scanner/scanner.go:5951
+		// line internal/scanner/scanner.go:5948
 		switch lex.data[(lex.p)] {
 		case 39:
 			goto tr119
@@ -7112,7 +7109,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st88
 	tr117:
-		// line internal/scanner/scanner.rl:38
+		// line internal/scanner/scanner.rl:35
 		lblStart = lex.p
 		goto st89
 	st89:
@@ -7120,7 +7117,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof89
 		}
 	st_case_89:
-		// line internal/scanner/scanner.go:5985
+		// line internal/scanner/scanner.go:5982
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr125
@@ -7220,7 +7217,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof164
 		}
 	st_case_164:
-		// line internal/scanner/scanner.go:6085
+		// line internal/scanner/scanner.go:6082
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr129
@@ -7229,7 +7226,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr309
 	tr129:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -7245,10 +7242,10 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof165
 		}
 	st_case_165:
-		// line internal/scanner/scanner.go:6110
+		// line internal/scanner/scanner.go:6107
 		goto tr311
 	tr310:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -7264,7 +7261,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof90
 		}
 	st_case_90:
-		// line internal/scanner/scanner.go:6129
+		// line internal/scanner/scanner.go:6126
 		if lex.data[(lex.p)] == 10 {
 			goto tr129
 		}
@@ -7325,490 +7322,490 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:347
+		// line internal/scanner/scanner.rl:344
 		lex.act = 135
 		goto st168
 	tr318:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:206
+		// line internal/scanner/scanner.rl:203
 		lex.act = 16
 		goto st168
 	tr324:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:204
+		// line internal/scanner/scanner.rl:201
 		lex.act = 14
 		goto st168
 	tr325:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:277
+		// line internal/scanner/scanner.rl:274
 		lex.act = 87
 		goto st168
 	tr328:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:205
+		// line internal/scanner/scanner.rl:202
 		lex.act = 15
 		goto st168
 	tr333:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:207
+		// line internal/scanner/scanner.rl:204
 		lex.act = 17
 		goto st168
 	tr345:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:208
+		// line internal/scanner/scanner.rl:205
 		lex.act = 18
 		goto st168
 	tr346:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:209
+		// line internal/scanner/scanner.rl:206
 		lex.act = 19
 		goto st168
 	tr348:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:210
+		// line internal/scanner/scanner.rl:207
 		lex.act = 20
 		goto st168
 	tr355:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:235
+		// line internal/scanner/scanner.rl:232
 		lex.act = 45
 		goto st168
 	tr359:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:211
+		// line internal/scanner/scanner.rl:208
 		lex.act = 21
 		goto st168
 	tr361:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:212
+		// line internal/scanner/scanner.rl:209
 		lex.act = 22
 		goto st168
 	tr365:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:213
+		// line internal/scanner/scanner.rl:210
 		lex.act = 23
 		goto st168
 	tr369:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:214
+		// line internal/scanner/scanner.rl:211
 		lex.act = 24
 		goto st168
 	tr372:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:217
+		// line internal/scanner/scanner.rl:214
 		lex.act = 27
 		goto st168
 	tr378:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:215
+		// line internal/scanner/scanner.rl:212
 		lex.act = 25
 		goto st168
 	tr382:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:216
+		// line internal/scanner/scanner.rl:213
 		lex.act = 26
 		goto st168
 	tr383:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:229
+		// line internal/scanner/scanner.rl:226
 		lex.act = 39
 		goto st168
 	tr391:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:218
+		// line internal/scanner/scanner.rl:215
 		lex.act = 28
 		goto st168
 	tr396:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:220
+		// line internal/scanner/scanner.rl:217
 		lex.act = 30
 		goto st168
 	tr399:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:221
+		// line internal/scanner/scanner.rl:218
 		lex.act = 31
 		goto st168
 	tr411:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:222
+		// line internal/scanner/scanner.rl:219
 		lex.act = 32
 		goto st168
 	tr418:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:224
+		// line internal/scanner/scanner.rl:221
 		lex.act = 34
 		goto st168
 	tr419:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:225
+		// line internal/scanner/scanner.rl:222
 		lex.act = 35
 		goto st168
 	tr424:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:226
+		// line internal/scanner/scanner.rl:223
 		lex.act = 36
 		goto st168
 	tr428:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:227
+		// line internal/scanner/scanner.rl:224
 		lex.act = 37
 		goto st168
 	tr430:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:228
+		// line internal/scanner/scanner.rl:225
 		lex.act = 38
 		goto st168
 	tr436:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:230
+		// line internal/scanner/scanner.rl:227
 		lex.act = 40
 		goto st168
 	tr438:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:236
+		// line internal/scanner/scanner.rl:233
 		lex.act = 46
 		goto st168
 	tr445:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:232
+		// line internal/scanner/scanner.rl:229
 		lex.act = 42
 		goto st168
 	tr451:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:234
+		// line internal/scanner/scanner.rl:231
 		lex.act = 44
 		goto st168
 	tr457:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:237
+		// line internal/scanner/scanner.rl:234
 		lex.act = 47
 		goto st168
 	tr459:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:238
+		// line internal/scanner/scanner.rl:235
 		lex.act = 48
 		goto st168
 	tr460:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:239
+		// line internal/scanner/scanner.rl:236
 		lex.act = 49
 		goto st168
 	tr471:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:241
+		// line internal/scanner/scanner.rl:238
 		lex.act = 51
 		goto st168
 	tr484:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:264
+		// line internal/scanner/scanner.rl:261
 		lex.act = 74
 		goto st168
 	tr492:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:242
+		// line internal/scanner/scanner.rl:239
 		lex.act = 52
 		goto st168
 	tr496:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:243
+		// line internal/scanner/scanner.rl:240
 		lex.act = 53
 		goto st168
 	tr502:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:244
+		// line internal/scanner/scanner.rl:241
 		lex.act = 54
 		goto st168
 	tr505:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:240
+		// line internal/scanner/scanner.rl:237
 		lex.act = 50
 		goto st168
 	tr508:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:245
+		// line internal/scanner/scanner.rl:242
 		lex.act = 55
 		goto st168
 	tr517:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:246
+		// line internal/scanner/scanner.rl:243
 		lex.act = 56
 		goto st168
 	tr518:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:276
+		// line internal/scanner/scanner.rl:273
 		lex.act = 86
 		goto st168
 	tr519:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:278
+		// line internal/scanner/scanner.rl:275
 		lex.act = 88
 		goto st168
 	tr526:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:249
+		// line internal/scanner/scanner.rl:246
 		lex.act = 59
 		goto st168
 	tr529:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:247
+		// line internal/scanner/scanner.rl:244
 		lex.act = 57
 		goto st168
 	tr535:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:250
+		// line internal/scanner/scanner.rl:247
 		lex.act = 60
 		goto st168
 	tr539:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:248
+		// line internal/scanner/scanner.rl:245
 		lex.act = 58
 		goto st168
 	tr552:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:266
+		// line internal/scanner/scanner.rl:263
 		lex.act = 76
 		goto st168
 	tr555:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:251
+		// line internal/scanner/scanner.rl:248
 		lex.act = 61
 		goto st168
 	tr561:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:252
+		// line internal/scanner/scanner.rl:249
 		lex.act = 62
 		goto st168
 	tr565:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:253
+		// line internal/scanner/scanner.rl:250
 		lex.act = 63
 		goto st168
 	tr570:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:254
+		// line internal/scanner/scanner.rl:251
 		lex.act = 64
 		goto st168
 	tr572:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:256
+		// line internal/scanner/scanner.rl:253
 		lex.act = 66
 		goto st168
 	tr574:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:255
+		// line internal/scanner/scanner.rl:252
 		lex.act = 65
 		goto st168
 	tr579:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:257
+		// line internal/scanner/scanner.rl:254
 		lex.act = 67
 		goto st168
 	tr580:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:258
+		// line internal/scanner/scanner.rl:255
 		lex.act = 68
 		goto st168
 	tr582:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:259
+		// line internal/scanner/scanner.rl:256
 		lex.act = 69
 		goto st168
 	tr586:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:260
+		// line internal/scanner/scanner.rl:257
 		lex.act = 70
 		goto st168
 	tr588:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:279
+		// line internal/scanner/scanner.rl:276
 		lex.act = 89
 		goto st168
 	tr597:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:261
+		// line internal/scanner/scanner.rl:258
 		lex.act = 71
 		goto st168
 	tr613:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:267
+		// line internal/scanner/scanner.rl:264
 		lex.act = 77
 		goto st168
 	tr617:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:268
+		// line internal/scanner/scanner.rl:265
 		lex.act = 78
 		goto st168
 	tr623:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:269
+		// line internal/scanner/scanner.rl:266
 		lex.act = 79
 		goto st168
 	tr631:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:270
+		// line internal/scanner/scanner.rl:267
 		lex.act = 80
 		goto st168
 	tr643:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:275
+		// line internal/scanner/scanner.rl:272
 		lex.act = 85
 		goto st168
 	tr648:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:271
+		// line internal/scanner/scanner.rl:268
 		lex.act = 81
 		goto st168
 	tr655:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:273
+		// line internal/scanner/scanner.rl:270
 		lex.act = 83
 		goto st168
 	tr665:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:272
+		// line internal/scanner/scanner.rl:269
 		lex.act = 82
 		goto st168
 	tr671:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:274
+		// line internal/scanner/scanner.rl:271
 		lex.act = 84
 		goto st168
 	st168:
@@ -7816,7 +7813,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof168
 		}
 	st_case_168:
-		// line internal/scanner/scanner.go:6681
+		// line internal/scanner/scanner.go:6678
 		if lex.data[(lex.p)] == 96 {
 			goto tr12
 		}
@@ -8152,7 +8149,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:347
+		// line internal/scanner/scanner.rl:344
 		lex.act = 135
 		goto st179
 	st179:
@@ -8160,7 +8157,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof179
 		}
 	st_case_179:
-		// line internal/scanner/scanner.go:7025
+		// line internal/scanner/scanner.go:7022
 		switch lex.data[(lex.p)] {
 		case 34:
 			goto st7
@@ -15154,7 +15151,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof399
 		}
 	st_case_399:
-		// line internal/scanner/scanner.go:14019
+		// line internal/scanner/scanner.go:14016
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr134
@@ -15197,7 +15194,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr220
 	tr137:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
 		goto st93
 	st93:
@@ -15205,7 +15202,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof93
 		}
 	st_case_93:
-		// line internal/scanner/scanner.go:14070
+		// line internal/scanner/scanner.go:14067
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr134
@@ -15223,7 +15220,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr132
 	tr134:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -15235,9 +15232,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st94
 	tr138:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -15253,7 +15250,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof94
 		}
 	st_case_94:
-		// line internal/scanner/scanner.go:14118
+		// line internal/scanner/scanner.go:14115
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr138
@@ -15271,7 +15268,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr132
 	tr135:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -15283,9 +15280,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st95
 	tr139:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -15301,13 +15298,13 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof95
 		}
 	st_case_95:
-		// line internal/scanner/scanner.go:14166
+		// line internal/scanner/scanner.go:14163
 		if lex.data[(lex.p)] == 10 {
 			goto tr134
 		}
 		goto tr132
 	tr140:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
 		goto st96
 	st96:
@@ -15315,7 +15312,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof96
 		}
 	st_case_96:
-		// line internal/scanner/scanner.go:14180
+		// line internal/scanner/scanner.go:14177
 		switch lex.data[(lex.p)] {
 		case 82:
 			goto st97
@@ -17419,14 +17416,14 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr248
 	tr144:
-		// line internal/scanner/scanner.rl:381
+		// line internal/scanner/scanner.rl:378
 		(lex.p) = (lex.te) - 1
 		{
-			lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
 		}
 		goto st470
 	tr674:
-		// line internal/scanner/scanner.rl:384
+		// line internal/scanner/scanner.rl:381
 		lex.te = (lex.p) + 1
 		{
 			lex.ungetCnt(1)
@@ -17436,25 +17433,25 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st470
 	tr679:
-		// line internal/scanner/scanner.rl:381
+		// line internal/scanner/scanner.rl:378
 		lex.te = (lex.p)
 		(lex.p)--
 		{
-			lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
 		}
 		goto st470
 	tr681:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:381
+		// line internal/scanner/scanner.rl:378
 		lex.te = (lex.p)
 		(lex.p)--
 		{
-			lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
 		}
 		goto st470
 	tr685:
-		// line internal/scanner/scanner.rl:384
+		// line internal/scanner/scanner.rl:381
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -17465,7 +17462,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st470
 	tr686:
-		// line internal/scanner/scanner.rl:382
+		// line internal/scanner/scanner.rl:379
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -17479,7 +17476,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto st470
 	tr687:
 		lex.cs = 470
-		// line internal/scanner/scanner.rl:383
+		// line internal/scanner/scanner.rl:380
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -17503,7 +17500,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.ts = (lex.p)
 
-		// line internal/scanner/scanner.go:16336
+		// line internal/scanner/scanner.go:16333
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr145
@@ -17548,7 +17545,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
 		goto st471
 	st471:
@@ -17556,7 +17553,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof471
 		}
 	st_case_471:
-		// line internal/scanner/scanner.go:16389
+		// line internal/scanner/scanner.go:16386
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr145
@@ -17573,7 +17570,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -17588,9 +17585,9 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -17606,7 +17603,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof472
 		}
 	st_case_472:
-		// line internal/scanner/scanner.go:16439
+		// line internal/scanner/scanner.go:16436
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr683
@@ -17620,7 +17617,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr681
 	tr680:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -17632,9 +17629,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st99
 	tr684:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -17650,13 +17647,13 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof99
 		}
 	st_case_99:
-		// line internal/scanner/scanner.go:16483
+		// line internal/scanner/scanner.go:16480
 		if lex.data[(lex.p)] == 10 {
 			goto tr145
 		}
 		goto tr144
 	tr676:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -17672,7 +17669,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof473
 		}
 	st_case_473:
-		// line internal/scanner/scanner.go:16505
+		// line internal/scanner/scanner.go:16502
 		if lex.data[(lex.p)] == 10 {
 			goto tr145
 		}
@@ -17739,9 +17736,9 @@ func (lex *Lexer) Lex() *token.Token {
 		goto _again
 	tr692:
 		lex.cs = 476
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:388
+		// line internal/scanner/scanner.rl:385
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -17756,7 +17753,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto _again
 	tr696:
 		lex.cs = 476
-		// line internal/scanner/scanner.rl:388
+		// line internal/scanner/scanner.rl:385
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -17783,7 +17780,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.ts = (lex.p)
 
-		// line internal/scanner/scanner.go:16602
+		// line internal/scanner/scanner.go:16599
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -17840,16 +17837,16 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:388
+		// line internal/scanner/scanner.rl:385
 		lex.act = 146
 		goto st477
 	tr693:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:388
+		// line internal/scanner/scanner.rl:385
 		lex.act = 146
 		goto st477
 	st477:
@@ -17857,7 +17854,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof477
 		}
 	st_case_477:
-		// line internal/scanner/scanner.go:16676
+		// line internal/scanner/scanner.go:16673
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -17907,7 +17904,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr691
 	tr689:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -17919,9 +17916,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st478
 	tr694:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -17937,7 +17934,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof478
 		}
 	st_case_478:
-		// line internal/scanner/scanner.go:16756
+		// line internal/scanner/scanner.go:16753
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -17987,7 +17984,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr692
 	tr690:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -17999,9 +17996,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st479
 	tr695:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -18017,7 +18014,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof479
 		}
 	st_case_479:
-		// line internal/scanner/scanner.go:16836
+		// line internal/scanner/scanner.go:16833
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -18067,7 +18064,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr696
 	tr146:
-		// line internal/scanner/scanner.rl:397
+		// line internal/scanner/scanner.rl:394
 		lex.te = (lex.p) + 1
 		{
 			lex.ungetCnt(1)
@@ -18078,7 +18075,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st480
 	tr704:
-		// line internal/scanner/scanner.rl:399
+		// line internal/scanner/scanner.rl:396
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -18094,7 +18091,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st480
 	tr705:
-		// line internal/scanner/scanner.rl:398
+		// line internal/scanner/scanner.rl:395
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -18144,9 +18141,9 @@ func (lex *Lexer) Lex() *token.Token {
 		goto _again
 	tr707:
 		lex.cs = 480
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:400
+		// line internal/scanner/scanner.rl:397
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -18164,7 +18161,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto _again
 	tr711:
 		lex.cs = 480
-		// line internal/scanner/scanner.rl:400
+		// line internal/scanner/scanner.rl:397
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -18191,7 +18188,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.ts = (lex.p)
 
-		// line internal/scanner/scanner.go:16968
+		// line internal/scanner/scanner.go:16965
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -18270,30 +18267,30 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:400
+		// line internal/scanner/scanner.rl:397
 		lex.act = 150
 		goto st482
 	tr708:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:400
+		// line internal/scanner/scanner.rl:397
 		lex.act = 150
 		goto st482
 	tr712:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:398
+		// line internal/scanner/scanner.rl:395
 		lex.act = 148
 		goto st482
 	tr713:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:397
+		// line internal/scanner/scanner.rl:394
 		lex.act = 147
 		goto st482
 	st482:
@@ -18301,7 +18298,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof482
 		}
 	st_case_482:
-		// line internal/scanner/scanner.go:17078
+		// line internal/scanner/scanner.go:17075
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -18351,7 +18348,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr706
 	tr700:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -18363,9 +18360,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st483
 	tr709:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -18381,7 +18378,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof483
 		}
 	st_case_483:
-		// line internal/scanner/scanner.go:17158
+		// line internal/scanner/scanner.go:17155
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -18431,7 +18428,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr707
 	tr701:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -18443,9 +18440,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st484
 	tr710:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -18461,7 +18458,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof484
 		}
 	st_case_484:
-		// line internal/scanner/scanner.go:17238
+		// line internal/scanner/scanner.go:17235
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -18625,7 +18622,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr711
 	tr148:
-		// line internal/scanner/scanner.rl:414
+		// line internal/scanner/scanner.rl:411
 		lex.te = (lex.p) + 1
 		{
 			lex.ungetCnt(2)
@@ -18640,7 +18637,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st487
 	tr149:
-		// line internal/scanner/scanner.rl:413
+		// line internal/scanner/scanner.rl:410
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -18650,7 +18647,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st487
 	tr150:
-		// line internal/scanner/scanner.rl:412
+		// line internal/scanner/scanner.rl:409
 		lex.te = (lex.p) + 1
 		{
 			lex.ungetCnt(1)
@@ -18662,7 +18659,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto st487
 	tr715:
 		lex.cs = 487
-		// line internal/scanner/scanner.rl:415
+		// line internal/scanner/scanner.rl:412
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -18734,9 +18731,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto _again
 	tr724:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:416
+		// line internal/scanner/scanner.rl:413
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -18750,7 +18747,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st487
 	tr728:
-		// line internal/scanner/scanner.rl:416
+		// line internal/scanner/scanner.rl:413
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -18774,7 +18771,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.ts = (lex.p)
 
-		// line internal/scanner/scanner.go:17481
+		// line internal/scanner/scanner.go:17478
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -18872,44 +18869,44 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:416
+		// line internal/scanner/scanner.rl:413
 		lex.act = 155
 		goto st488
 	tr721:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:415
+		// line internal/scanner/scanner.rl:412
 		lex.act = 154
 		goto st488
 	tr725:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:416
+		// line internal/scanner/scanner.rl:413
 		lex.act = 155
 		goto st488
 	tr729:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:414
+		// line internal/scanner/scanner.rl:411
 		lex.act = 153
 		goto st488
 	tr730:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:413
+		// line internal/scanner/scanner.rl:410
 		lex.act = 152
 		goto st488
 	tr731:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:412
+		// line internal/scanner/scanner.rl:409
 		lex.act = 151
 		goto st488
 	st488:
@@ -18917,7 +18914,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof488
 		}
 	st_case_488:
-		// line internal/scanner/scanner.go:17624
+		// line internal/scanner/scanner.go:17621
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -18967,7 +18964,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr723
 	tr718:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -18979,9 +18976,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st489
 	tr726:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -18997,7 +18994,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof489
 		}
 	st_case_489:
-		// line internal/scanner/scanner.go:17704
+		// line internal/scanner/scanner.go:17701
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -19047,7 +19044,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr724
 	tr719:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -19059,9 +19056,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st490
 	tr727:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -19077,7 +19074,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof490
 		}
 	st_case_490:
-		// line internal/scanner/scanner.go:17784
+		// line internal/scanner/scanner.go:17781
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -19282,7 +19279,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr728
 	tr151:
-		// line internal/scanner/scanner.rl:426
+		// line internal/scanner/scanner.rl:423
 		lex.te = (lex.p) + 1
 		{
 			lex.ungetCnt(2)
@@ -19297,7 +19294,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st493
 	tr152:
-		// line internal/scanner/scanner.rl:425
+		// line internal/scanner/scanner.rl:422
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -19307,7 +19304,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st493
 	tr153:
-		// line internal/scanner/scanner.rl:424
+		// line internal/scanner/scanner.rl:421
 		lex.te = (lex.p) + 1
 		{
 			lex.ungetCnt(1)
@@ -19319,7 +19316,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto st493
 	tr732:
 		lex.cs = 493
-		// line internal/scanner/scanner.rl:427
+		// line internal/scanner/scanner.rl:424
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -19391,9 +19388,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto _again
 	tr742:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:428
+		// line internal/scanner/scanner.rl:425
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -19407,7 +19404,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st493
 	tr746:
-		// line internal/scanner/scanner.rl:428
+		// line internal/scanner/scanner.rl:425
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -19431,7 +19428,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.ts = (lex.p)
 
-		// line internal/scanner/scanner.go:18068
+		// line internal/scanner/scanner.go:18065
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -19529,44 +19526,44 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:428
+		// line internal/scanner/scanner.rl:425
 		lex.act = 160
 		goto st494
 	tr738:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:427
+		// line internal/scanner/scanner.rl:424
 		lex.act = 159
 		goto st494
 	tr743:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:428
+		// line internal/scanner/scanner.rl:425
 		lex.act = 160
 		goto st494
 	tr747:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:426
+		// line internal/scanner/scanner.rl:423
 		lex.act = 158
 		goto st494
 	tr748:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:425
+		// line internal/scanner/scanner.rl:422
 		lex.act = 157
 		goto st494
 	tr749:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:424
+		// line internal/scanner/scanner.rl:421
 		lex.act = 156
 		goto st494
 	st494:
@@ -19574,7 +19571,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof494
 		}
 	st_case_494:
-		// line internal/scanner/scanner.go:18211
+		// line internal/scanner/scanner.go:18208
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -19624,7 +19621,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr741
 	tr736:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -19636,9 +19633,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st495
 	tr744:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -19654,7 +19651,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof495
 		}
 	st_case_495:
-		// line internal/scanner/scanner.go:18291
+		// line internal/scanner/scanner.go:18288
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -19704,7 +19701,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr742
 	tr737:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -19716,9 +19713,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st496
 	tr745:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -19734,7 +19731,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof496
 		}
 	st_case_496:
-		// line internal/scanner/scanner.go:18371
+		// line internal/scanner/scanner.go:18368
 		_widec = int16(lex.data[(lex.p)])
 		switch {
 		case lex.data[(lex.p)] < 11:
@@ -19940,7 +19937,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto tr746
 	tr751:
 		lex.cs = 499
-		// line internal/scanner/scanner.rl:436
+		// line internal/scanner/scanner.rl:433
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -19964,7 +19961,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.ts = (lex.p)
 
-		// line internal/scanner/scanner.go:18598
+		// line internal/scanner/scanner.go:18595
 		if lex.data[(lex.p)] == 96 {
 			goto st0
 		}
@@ -20008,7 +20005,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st500
 	tr154:
-		// line internal/scanner/scanner.rl:455
+		// line internal/scanner/scanner.rl:452
 		(lex.p) = (lex.te) - 1
 		{
 			lex.ungetCnt(1)
@@ -20020,7 +20017,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st501
 	tr155:
-		// line internal/scanner/scanner.rl:452
+		// line internal/scanner/scanner.rl:449
 		lex.te = (lex.p) + 1
 		{
 			lex.ungetCnt(1)
@@ -20034,7 +20031,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st501
 	tr752:
-		// line internal/scanner/scanner.rl:455
+		// line internal/scanner/scanner.rl:452
 		lex.te = (lex.p) + 1
 		{
 			lex.ungetCnt(1)
@@ -20046,7 +20043,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st501
 	tr756:
-		// line internal/scanner/scanner.rl:454
+		// line internal/scanner/scanner.rl:451
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -20056,7 +20053,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st501
 	tr757:
-		// line internal/scanner/scanner.rl:455
+		// line internal/scanner/scanner.rl:452
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -20069,7 +20066,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st501
 	tr759:
-		// line internal/scanner/scanner.rl:451
+		// line internal/scanner/scanner.rl:448
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -20083,7 +20080,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st501
 	tr761:
-		// line internal/scanner/scanner.rl:453
+		// line internal/scanner/scanner.rl:450
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -20107,7 +20104,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.ts = (lex.p)
 
-		// line internal/scanner/scanner.go:18690
+		// line internal/scanner/scanner.go:18687
 		switch lex.data[(lex.p)] {
 		case 36:
 			goto st502
@@ -20188,7 +20185,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof504
 		}
 	st_case_504:
-		// line internal/scanner/scanner.go:18771
+		// line internal/scanner/scanner.go:18768
 		if lex.data[(lex.p)] == 62 {
 			goto st105
 		}
@@ -20241,7 +20238,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st505
 	tr156:
-		// line internal/scanner/scanner.rl:459
+		// line internal/scanner/scanner.rl:456
 		(lex.p) = (lex.te) - 1
 		{
 			lex.setTokenPosition(tkn)
@@ -20254,7 +20251,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st506
 	tr762:
-		// line internal/scanner/scanner.rl:465
+		// line internal/scanner/scanner.rl:462
 		lex.te = (lex.p) + 1
 		{
 			c := lex.data[lex.p]
@@ -20262,7 +20259,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st506
 	tr763:
-		// line internal/scanner/scanner.rl:462
+		// line internal/scanner/scanner.rl:459
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -20272,7 +20269,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st506
 	tr766:
-		// line internal/scanner/scanner.rl:463
+		// line internal/scanner/scanner.rl:460
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -20285,7 +20282,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st506
 	tr770:
-		// line internal/scanner/scanner.rl:464
+		// line internal/scanner/scanner.rl:461
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -20295,9 +20292,9 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st506
 	tr771:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:462
+		// line internal/scanner/scanner.rl:459
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -20308,7 +20305,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st506
 	tr772:
-		// line internal/scanner/scanner.rl:465
+		// line internal/scanner/scanner.rl:462
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -20317,7 +20314,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st506
 	tr773:
-		// line internal/scanner/scanner.rl:463
+		// line internal/scanner/scanner.rl:460
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -20331,7 +20328,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st506
 	tr775:
-		// line internal/scanner/scanner.rl:460
+		// line internal/scanner/scanner.rl:457
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -20345,7 +20342,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st506
 	tr776:
-		// line internal/scanner/scanner.rl:459
+		// line internal/scanner/scanner.rl:456
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -20359,7 +20356,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st506
 	tr780:
-		// line internal/scanner/scanner.rl:461
+		// line internal/scanner/scanner.rl:458
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -20383,7 +20380,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.ts = (lex.p)
 
-		// line internal/scanner/scanner.go:18903
+		// line internal/scanner/scanner.go:18900
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr764
@@ -20449,7 +20446,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st515
 	tr764:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -20465,10 +20462,10 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof507
 		}
 	st_case_507:
-		// line internal/scanner/scanner.go:18985
+		// line internal/scanner/scanner.go:18982
 		goto tr771
 	tr765:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -20484,7 +20481,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof508
 		}
 	st_case_508:
-		// line internal/scanner/scanner.go:19004
+		// line internal/scanner/scanner.go:19001
 		if lex.data[(lex.p)] == 10 {
 			goto tr764
 		}
@@ -20546,7 +20543,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof511
 		}
 	st_case_511:
-		// line internal/scanner/scanner.go:19066
+		// line internal/scanner/scanner.go:19063
 		switch lex.data[(lex.p)] {
 		case 95:
 			goto st106
@@ -20569,7 +20566,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof512
 		}
 	st_case_512:
-		// line internal/scanner/scanner.go:19089
+		// line internal/scanner/scanner.go:19086
 		if lex.data[(lex.p)] == 95 {
 			goto st106
 		}
@@ -20605,7 +20602,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof513
 		}
 	st_case_513:
-		// line internal/scanner/scanner.go:19125
+		// line internal/scanner/scanner.go:19122
 		if lex.data[(lex.p)] == 95 {
 			goto st107
 		}
@@ -20641,7 +20638,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof514
 		}
 	st_case_514:
-		// line internal/scanner/scanner.go:19161
+		// line internal/scanner/scanner.go:19158
 		if lex.data[(lex.p)] == 95 {
 			goto st108
 		}
@@ -20686,7 +20683,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto st515
 	tr160:
 		lex.cs = 516
-		// line internal/scanner/scanner.rl:473
+		// line internal/scanner/scanner.rl:470
 		(lex.p) = (lex.te) - 1
 		{
 			lex.ungetCnt(1)
@@ -20695,7 +20692,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto _again
 	tr162:
 		lex.cs = 516
-		// line internal/scanner/scanner.rl:472
+		// line internal/scanner/scanner.rl:469
 		lex.te = (lex.p) + 1
 		{
 			lex.ungetCnt(1)
@@ -20710,7 +20707,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto _again
 	tr781:
 		lex.cs = 516
-		// line internal/scanner/scanner.rl:473
+		// line internal/scanner/scanner.rl:470
 		lex.te = (lex.p) + 1
 		{
 			lex.ungetCnt(1)
@@ -20719,7 +20716,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto _again
 	tr783:
 		lex.cs = 516
-		// line internal/scanner/scanner.rl:473
+		// line internal/scanner/scanner.rl:470
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -20738,7 +20735,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.ts = (lex.p)
 
-		// line internal/scanner/scanner.go:19240
+		// line internal/scanner/scanner.go:19237
 		if lex.data[(lex.p)] == 96 {
 			goto tr781
 		}
@@ -20765,7 +20762,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof517
 		}
 	st_case_517:
-		// line internal/scanner/scanner.go:19267
+		// line internal/scanner/scanner.go:19264
 		switch lex.data[(lex.p)] {
 		case 91:
 			goto tr162
@@ -20824,15 +20821,15 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto st109
 	tr163:
-		// line internal/scanner/scanner.rl:477
+		// line internal/scanner/scanner.rl:474
 		(lex.p) = (lex.te) - 1
 		{
-			lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
 		}
 		goto st518
 	tr784:
 		lex.cs = 518
-		// line internal/scanner/scanner.rl:479
+		// line internal/scanner/scanner.rl:476
 		lex.te = (lex.p) + 1
 		{
 			lex.ungetCnt(1)
@@ -20841,7 +20838,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto _again
 	tr787:
 		lex.cs = 518
-		// line internal/scanner/scanner.rl:478
+		// line internal/scanner/scanner.rl:475
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -20854,26 +20851,26 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto _again
 	tr788:
-		// line internal/scanner/scanner.rl:477
+		// line internal/scanner/scanner.rl:474
 		lex.te = (lex.p)
 		(lex.p)--
 		{
-			lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
 		}
 		goto st518
 	tr790:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:477
+		// line internal/scanner/scanner.rl:474
 		lex.te = (lex.p)
 		(lex.p)--
 		{
-			lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
 		}
 		goto st518
 	tr794:
 		lex.cs = 518
-		// line internal/scanner/scanner.rl:479
+		// line internal/scanner/scanner.rl:476
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -20892,7 +20889,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.ts = (lex.p)
 
-		// line internal/scanner/scanner.go:19374
+		// line internal/scanner/scanner.go:19371
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr164
@@ -20916,7 +20913,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
 		goto st519
 	st519:
@@ -20924,7 +20921,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof519
 		}
 	st_case_519:
-		// line internal/scanner/scanner.go:19406
+		// line internal/scanner/scanner.go:19403
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr164
@@ -20941,7 +20938,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -20956,9 +20953,9 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -20974,7 +20971,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof520
 		}
 	st_case_520:
-		// line internal/scanner/scanner.go:19456
+		// line internal/scanner/scanner.go:19453
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr792
@@ -20988,7 +20985,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr790
 	tr789:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21000,9 +20997,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st110
 	tr793:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21018,13 +21015,13 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof110
 		}
 	st_case_110:
-		// line internal/scanner/scanner.go:19500
+		// line internal/scanner/scanner.go:19497
 		if lex.data[(lex.p)] == 10 {
 			goto tr164
 		}
 		goto tr163
 	tr786:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21040,21 +21037,21 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof521
 		}
 	st_case_521:
-		// line internal/scanner/scanner.go:19522
+		// line internal/scanner/scanner.go:19519
 		if lex.data[(lex.p)] == 10 {
 			goto tr164
 		}
 		goto tr794
 	tr165:
-		// line internal/scanner/scanner.rl:483
+		// line internal/scanner/scanner.rl:480
 		(lex.p) = (lex.te) - 1
 		{
-			lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
 		}
 		goto st522
 	tr795:
 		lex.cs = 522
-		// line internal/scanner/scanner.rl:485
+		// line internal/scanner/scanner.rl:482
 		lex.te = (lex.p) + 1
 		{
 			lex.ungetCnt(1)
@@ -21063,7 +21060,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto _again
 	tr798:
 		lex.cs = 522
-		// line internal/scanner/scanner.rl:484
+		// line internal/scanner/scanner.rl:481
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -21076,26 +21073,26 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto _again
 	tr799:
-		// line internal/scanner/scanner.rl:483
+		// line internal/scanner/scanner.rl:480
 		lex.te = (lex.p)
 		(lex.p)--
 		{
-			lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
 		}
 		goto st522
 	tr801:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:483
+		// line internal/scanner/scanner.rl:480
 		lex.te = (lex.p)
 		(lex.p)--
 		{
-			lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
 		}
 		goto st522
 	tr805:
 		lex.cs = 522
-		// line internal/scanner/scanner.rl:485
+		// line internal/scanner/scanner.rl:482
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -21114,7 +21111,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.ts = (lex.p)
 
-		// line internal/scanner/scanner.go:19576
+		// line internal/scanner/scanner.go:19573
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr166
@@ -21138,7 +21135,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
 		goto st523
 	st523:
@@ -21146,7 +21143,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof523
 		}
 	st_case_523:
-		// line internal/scanner/scanner.go:19608
+		// line internal/scanner/scanner.go:19605
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr166
@@ -21163,7 +21160,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21178,9 +21175,9 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21196,7 +21193,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof524
 		}
 	st_case_524:
-		// line internal/scanner/scanner.go:19658
+		// line internal/scanner/scanner.go:19655
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr803
@@ -21210,7 +21207,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr801
 	tr800:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21222,9 +21219,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st111
 	tr804:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21240,13 +21237,13 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof111
 		}
 	st_case_111:
-		// line internal/scanner/scanner.go:19702
+		// line internal/scanner/scanner.go:19699
 		if lex.data[(lex.p)] == 10 {
 			goto tr166
 		}
 		goto tr165
 	tr797:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21262,21 +21259,21 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof525
 		}
 	st_case_525:
-		// line internal/scanner/scanner.go:19724
+		// line internal/scanner/scanner.go:19721
 		if lex.data[(lex.p)] == 10 {
 			goto tr166
 		}
 		goto tr805
 	tr167:
-		// line internal/scanner/scanner.rl:489
+		// line internal/scanner/scanner.rl:486
 		(lex.p) = (lex.te) - 1
 		{
-			lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
 		}
 		goto st526
 	tr806:
 		lex.cs = 526
-		// line internal/scanner/scanner.rl:491
+		// line internal/scanner/scanner.rl:488
 		lex.te = (lex.p) + 1
 		{
 			lex.ungetCnt(1)
@@ -21285,7 +21282,7 @@ func (lex *Lexer) Lex() *token.Token {
 		goto _again
 	tr809:
 		lex.cs = 526
-		// line internal/scanner/scanner.rl:490
+		// line internal/scanner/scanner.rl:487
 		lex.te = (lex.p) + 1
 		{
 			lex.setTokenPosition(tkn)
@@ -21298,26 +21295,26 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto _again
 	tr810:
-		// line internal/scanner/scanner.rl:489
+		// line internal/scanner/scanner.rl:486
 		lex.te = (lex.p)
 		(lex.p)--
 		{
-			lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
 		}
 		goto st526
 	tr812:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:489
+		// line internal/scanner/scanner.rl:486
 		lex.te = (lex.p)
 		(lex.p)--
 		{
-			lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)
 		}
 		goto st526
 	tr816:
 		lex.cs = 526
-		// line internal/scanner/scanner.rl:491
+		// line internal/scanner/scanner.rl:488
 		lex.te = (lex.p)
 		(lex.p)--
 		{
@@ -21336,7 +21333,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.ts = (lex.p)
 
-		// line internal/scanner/scanner.go:19778
+		// line internal/scanner/scanner.go:19775
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr168
@@ -21360,7 +21357,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
 		goto st527
 	st527:
@@ -21368,7 +21365,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof527
 		}
 	st_case_527:
-		// line internal/scanner/scanner.go:19810
+		// line internal/scanner/scanner.go:19807
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr168
@@ -21385,7 +21382,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21400,9 +21397,9 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21418,7 +21415,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof528
 		}
 	st_case_528:
-		// line internal/scanner/scanner.go:19860
+		// line internal/scanner/scanner.go:19857
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr814
@@ -21432,7 +21429,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr812
 	tr811:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21444,9 +21441,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st112
 	tr815:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21462,13 +21459,13 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof112
 		}
 	st_case_112:
-		// line internal/scanner/scanner.go:19904
+		// line internal/scanner/scanner.go:19901
 		if lex.data[(lex.p)] == 10 {
 			goto tr168
 		}
 		goto tr167
 	tr808:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21484,7 +21481,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof529
 		}
 	st_case_529:
-		// line internal/scanner/scanner.go:19926
+		// line internal/scanner/scanner.go:19923
 		if lex.data[(lex.p)] == 10 {
 			goto tr168
 		}
@@ -21501,27 +21498,27 @@ func (lex *Lexer) Lex() *token.Token {
 		case 186:
 			{
 				(lex.p) = (lex.te) - 1
-				lex.addSkippedToken(tkn, token.T_HALT_COMPILER, lex.ts, lex.te)
+				lex.addFreeFloatingToken(tkn, token.T_HALT_COMPILER, lex.ts, lex.te)
 			}
 		}
 
 		goto st530
 	tr821:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:495
+		// line internal/scanner/scanner.rl:492
 		lex.te = (lex.p)
 		(lex.p)--
 		{
-			lex.addSkippedToken(tkn, token.T_HALT_COMPILER, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_HALT_COMPILER, lex.ts, lex.te)
 		}
 		goto st530
 	tr825:
-		// line internal/scanner/scanner.rl:495
+		// line internal/scanner/scanner.rl:492
 		lex.te = (lex.p)
 		(lex.p)--
 		{
-			lex.addSkippedToken(tkn, token.T_HALT_COMPILER, lex.ts, lex.te)
+			lex.addFreeFloatingToken(tkn, token.T_HALT_COMPILER, lex.ts, lex.te)
 		}
 		goto st530
 	st530:
@@ -21538,7 +21535,7 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.ts = (lex.p)
 
-		// line internal/scanner/scanner.go:19970
+		// line internal/scanner/scanner.go:19967
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr818
@@ -21550,16 +21547,16 @@ func (lex *Lexer) Lex() *token.Token {
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:495
+		// line internal/scanner/scanner.rl:492
 		lex.act = 186
 		goto st531
 	tr822:
 		// line NONE:1
 		lex.te = (lex.p) + 1
 
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:495
+		// line internal/scanner/scanner.rl:492
 		lex.act = 186
 		goto st531
 	st531:
@@ -21567,7 +21564,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof531
 		}
 	st_case_531:
-		// line internal/scanner/scanner.go:19999
+		// line internal/scanner/scanner.go:19996
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr818
@@ -21576,7 +21573,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr817
 	tr818:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21588,9 +21585,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st532
 	tr823:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21606,7 +21603,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof532
 		}
 	st_case_532:
-		// line internal/scanner/scanner.go:20038
+		// line internal/scanner/scanner.go:20035
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr823
@@ -21615,7 +21612,7 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 		goto tr822
 	tr819:
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21627,9 +21624,9 @@ func (lex *Lexer) Lex() *token.Token {
 
 		goto st533
 	tr824:
-		// line internal/scanner/scanner.rl:57
+		// line internal/scanner/scanner.rl:54
 
-		// line internal/scanner/scanner.rl:41
+		// line internal/scanner/scanner.rl:38
 
 		if lex.data[lex.p] == '\n' {
 			lex.newLines.Append(lex.p + 1)
@@ -21645,7 +21642,7 @@ func (lex *Lexer) Lex() *token.Token {
 			goto _test_eof533
 		}
 	st_case_533:
-		// line internal/scanner/scanner.go:20077
+		// line internal/scanner/scanner.go:20074
 		switch lex.data[(lex.p)] {
 		case 10:
 			goto tr818
@@ -24291,16 +24288,10 @@ func (lex *Lexer) Lex() *token.Token {
 		}
 	}
 
-	// line internal/scanner/scanner.rl:499
-
-	if lex.sts == -1 {
-		lex.sts = 0
-	}
+	// line internal/scanner/scanner.rl:496
 
 	tkn.Value = lex.data[lex.ts:lex.te]
 	tkn.ID = token.ID(tok)
-	tkn.Skipped = lex.data[lex.sts:lex.ste]
-	lex.addSkippedToken(tkn, tok, lex.ts, lex.te)
 
 	return tkn
 }
diff --git a/internal/scanner/scanner.rl b/internal/scanner/scanner.rl
index b3a0015..e7d1179 100644
--- a/internal/scanner/scanner.rl
+++ b/internal/scanner/scanner.rl
@@ -26,9 +26,6 @@ func (lex *Lexer) Lex() *token.Token {
 
     tkn := lex.tokenPool.Get()
 
-    lex.sts = -1
-    lex.ste = 0
-
     lblStart := 0
     lblEnd   := 0
 
@@ -127,7 +124,7 @@ func (lex *Lexer) Lex() *token.Token {
 
         main := |*
             "#!" any* :>> newline => {
-                lex.addSkippedToken(tkn, token.T_COMMENT, lex.ts, lex.te)
+                lex.addFreeFloatingToken(tkn, token.T_COMMENT, lex.ts, lex.te)
             };
             any => {
                 fnext html;
@@ -143,12 +140,12 @@ func (lex *Lexer) Lex() *token.Token {
                 fbreak;
             };
             '<?' => {
-                lex.addSkippedToken(tkn, token.T_OPEN_TAG, lex.ts, lex.te)
+                lex.addFreeFloatingToken(tkn, token.T_OPEN_TAG, lex.ts, lex.te)
                 fnext php;
             };
             '<?php'i ( [ \t] | newline ) => {
                 lex.ungetCnt(lex.te - lex.ts - 5)
-                lex.addSkippedToken(tkn, token.T_OPEN_TAG, lex.ts, lex.ts+5)
+                lex.addFreeFloatingToken(tkn, token.T_OPEN_TAG, lex.ts, lex.ts+5)
                 fnext php;
             };
             '<?='i => {
@@ -160,7 +157,7 @@ func (lex *Lexer) Lex() *token.Token {
         *|;
 
         php := |*
-            whitespace_line*                   => {lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)};
+            whitespace_line*                   => {lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)};
             '?>' newline?                      => {lex.setTokenPosition(tkn); tok = token.ID(int(';')); fnext html; fbreak;};
             ';' whitespace_line* '?>' newline? => {lex.setTokenPosition(tkn); tok = token.ID(int(';')); fnext html; fbreak;};
 
@@ -320,7 +317,7 @@ func (lex *Lexer) Lex() *token.Token {
 
             ('#' | '//') any_line* when is_not_comment_end => {
                 lex.ungetStr("?>")
-                lex.addSkippedToken(tkn, token.T_COMMENT, lex.ts, lex.te)
+                lex.addFreeFloatingToken(tkn, token.T_COMMENT, lex.ts, lex.te)
             };
             '/*' any_line* :>> '*/' {
                 isDocComment := false;
@@ -329,9 +326,9 @@ func (lex *Lexer) Lex() *token.Token {
                 }
 
                 if isDocComment {
-                    lex.addSkippedToken(tkn, token.T_DOC_COMMENT, lex.ts, lex.te)
+                    lex.addFreeFloatingToken(tkn, token.T_DOC_COMMENT, lex.ts, lex.te)
                 } else {
-                    lex.addSkippedToken(tkn, token.T_COMMENT, lex.ts, lex.te)
+                    lex.addFreeFloatingToken(tkn, token.T_COMMENT, lex.ts, lex.te)
                 }
             };
 
@@ -378,7 +375,7 @@ func (lex *Lexer) Lex() *token.Token {
         *|;
 
         property := |*
-            whitespace_line* => {lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)};
+            whitespace_line* => {lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)};
             "->"             => {lex.setTokenPosition(tkn); tok = token.T_OBJECT_OPERATOR; fbreak;};
             varname          => {lex.setTokenPosition(tkn); tok = token.T_STRING; fnext php; fbreak;};
             any              => {lex.ungetCnt(1); fgoto php;};
@@ -474,38 +471,32 @@ func (lex *Lexer) Lex() *token.Token {
         *|;
 
         halt_compiller_open_parenthesis := |*
-            whitespace_line* => {lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)};
+            whitespace_line* => {lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)};
             "("              => {lex.setTokenPosition(tkn); tok = token.ID(int('(')); fnext halt_compiller_close_parenthesis; fbreak;};
             any              => {lex.ungetCnt(1); fnext php;};
         *|;
 
         halt_compiller_close_parenthesis := |*
-            whitespace_line* => {lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)};
+            whitespace_line* => {lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)};
             ")"              => {lex.setTokenPosition(tkn); tok = token.ID(int(')')); fnext halt_compiller_close_semicolon; fbreak;};
             any              => {lex.ungetCnt(1); fnext php;};
         *|;
 
         halt_compiller_close_semicolon := |*
-            whitespace_line* => {lex.addSkippedToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)};
+            whitespace_line* => {lex.addFreeFloatingToken(tkn, token.T_WHITESPACE, lex.ts, lex.te)};
             ";"              => {lex.setTokenPosition(tkn); tok = token.ID(int(';')); fnext halt_compiller_end; fbreak;};
             any              => {lex.ungetCnt(1); fnext php;};
         *|;
 
         halt_compiller_end := |*
-            any_line* => { lex.addSkippedToken(tkn, token.T_HALT_COMPILER, lex.ts, lex.te); };
+            any_line* => { lex.addFreeFloatingToken(tkn, token.T_HALT_COMPILER, lex.ts, lex.te); };
         *|;
 
         write exec;
     }%%
 
-    if lex.sts == -1 {
-        lex.sts = 0
-    }
-
     tkn.Value = lex.data[lex.ts:lex.te]
     tkn.ID = token.ID(tok)
-    tkn.Skipped = lex.data[lex.sts:lex.ste]
-    lex.addSkippedToken(tkn, tok, lex.ts, lex.te);
 
     return tkn
 }
\ No newline at end of file
diff --git a/internal/scanner/scanner_test.go b/internal/scanner/scanner_test.go
index 465c40a..c49b785 100644
--- a/internal/scanner/scanner_test.go
+++ b/internal/scanner/scanner_test.go
@@ -386,8 +386,8 @@ func TestShebang(t *testing.T) {
 	tkn := lexer.Lex()
 	assert.Equal(t, tkn.ID, token.T_DNUMBER)
 
-	l := len(tkn.SkippedTokens)
-	for _, tt := range tkn.SkippedTokens[:l-1] {
+	l := len(tkn.FreeFloating)
+	for _, tt := range tkn.FreeFloating[:l-1] {
 		actual = append(actual, string(tt.Value))
 	}
 
@@ -404,7 +404,7 @@ func TestShebangHtml(t *testing.T) {
 
 	tkn := lexer.Lex()
 	assert.Equal(t, tkn.ID, token.T_INLINE_HTML)
-	assert.Equal(t, string(tkn.SkippedTokens[0].Value), "#!/usr/bin/env php\n")
+	assert.Equal(t, string(tkn.FreeFloating[0].Value), "#!/usr/bin/env php\n")
 
 	tkn = lexer.Lex()
 	assert.Equal(t, tkn.ID, token.T_DNUMBER)
@@ -1137,8 +1137,8 @@ func TestCommentEnd(t *testing.T) {
 
 	tkn := lexer.Lex()
 
-	l := len(tkn.SkippedTokens)
-	actual := tkn.SkippedTokens[:l-1]
+	l := len(tkn.FreeFloating)
+	actual := tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1169,8 +1169,8 @@ func TestCommentNewLine(t *testing.T) {
 
 	tkn := lexer.Lex()
 
-	l := len(tkn.SkippedTokens)
-	actual := tkn.SkippedTokens[:l-1]
+	l := len(tkn.FreeFloating)
+	actual := tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1201,8 +1201,8 @@ func TestCommentNewLine1(t *testing.T) {
 
 	tkn := lexer.Lex()
 
-	l := len(tkn.SkippedTokens)
-	actual := tkn.SkippedTokens[:l-1]
+	l := len(tkn.FreeFloating)
+	actual := tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1233,8 +1233,8 @@ func TestCommentNewLine2(t *testing.T) {
 
 	tkn := lexer.Lex()
 
-	l := len(tkn.SkippedTokens)
-	actual := tkn.SkippedTokens[:l-1]
+	l := len(tkn.FreeFloating)
+	actual := tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1266,8 +1266,8 @@ func TestCommentWithPhpEndTag(t *testing.T) {
 
 	tkn := lexer.Lex()
 
-	l := len(tkn.SkippedTokens)
-	actual := tkn.SkippedTokens[:l-1]
+	l := len(tkn.FreeFloating)
+	actual := tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1299,8 +1299,8 @@ func TestInlineComment(t *testing.T) {
 
 	tkn := lexer.Lex()
 
-	l := len(tkn.SkippedTokens)
-	actual := tkn.SkippedTokens[:l-1]
+	l := len(tkn.FreeFloating)
+	actual := tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1332,8 +1332,8 @@ func TestInlineComment2(t *testing.T) {
 
 	tkn := lexer.Lex()
 
-	l := len(tkn.SkippedTokens)
-	actual := tkn.SkippedTokens[:l-1]
+	l := len(tkn.FreeFloating)
+	actual := tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1369,8 +1369,8 @@ func TestEmptyInlineComment(t *testing.T) {
 
 	tkn := lexer.Lex()
 
-	l := len(tkn.SkippedTokens)
-	actual := tkn.SkippedTokens[:l-1]
+	l := len(tkn.FreeFloating)
+	actual := tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1402,8 +1402,8 @@ func TestEmptyInlineComment2(t *testing.T) {
 
 	tkn := lexer.Lex()
 
-	l := len(tkn.SkippedTokens)
-	actual := tkn.SkippedTokens[:l-1]
+	l := len(tkn.FreeFloating)
+	actual := tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1428,8 +1428,8 @@ func TestMethodCallTokens(t *testing.T) {
 		},
 	}
 	tkn := lexer.Lex()
-	l := len(tkn.SkippedTokens)
-	actual := tkn.SkippedTokens[:l-1]
+	l := len(tkn.FreeFloating)
+	actual := tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1442,8 +1442,8 @@ func TestMethodCallTokens(t *testing.T) {
 		},
 	}
 	tkn = lexer.Lex()
-	l = len(tkn.SkippedTokens)
-	actual = tkn.SkippedTokens[:l-1]
+	l = len(tkn.FreeFloating)
+	actual = tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1456,8 +1456,8 @@ func TestMethodCallTokens(t *testing.T) {
 		},
 	}
 	tkn = lexer.Lex()
-	l = len(tkn.SkippedTokens)
-	actual = tkn.SkippedTokens[:l-1]
+	l = len(tkn.FreeFloating)
+	actual = tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1470,8 +1470,8 @@ func TestMethodCallTokens(t *testing.T) {
 		},
 	}
 	tkn = lexer.Lex()
-	l = len(tkn.SkippedTokens)
-	actual = tkn.SkippedTokens[:l-1]
+	l = len(tkn.FreeFloating)
+	actual = tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1484,8 +1484,8 @@ func TestMethodCallTokens(t *testing.T) {
 		},
 	}
 	tkn = lexer.Lex()
-	l = len(tkn.SkippedTokens)
-	actual = tkn.SkippedTokens[:l-1]
+	l = len(tkn.FreeFloating)
+	actual = tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1498,8 +1498,8 @@ func TestMethodCallTokens(t *testing.T) {
 		},
 	}
 	tkn = lexer.Lex()
-	l = len(tkn.SkippedTokens)
-	actual = tkn.SkippedTokens[:l-1]
+	l = len(tkn.FreeFloating)
+	actual = tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1512,8 +1512,8 @@ func TestMethodCallTokens(t *testing.T) {
 		},
 	}
 	tkn = lexer.Lex()
-	l = len(tkn.SkippedTokens)
-	actual = tkn.SkippedTokens[:l-1]
+	l = len(tkn.FreeFloating)
+	actual = tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1537,8 +1537,8 @@ func TestYieldFromTokens(t *testing.T) {
 		},
 	}
 	tkn := lexer.Lex()
-	l := len(tkn.SkippedTokens)
-	actual := tkn.SkippedTokens[:l-1]
+	l := len(tkn.FreeFloating)
+	actual := tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
@@ -1551,8 +1551,8 @@ func TestYieldFromTokens(t *testing.T) {
 		},
 	}
 	tkn = lexer.Lex()
-	l = len(tkn.SkippedTokens)
-	actual = tkn.SkippedTokens[:l-1]
+	l = len(tkn.FreeFloating)
+	actual = tkn.FreeFloating[:l-1]
 	for _, v := range actual {
 		v.Position = nil
 	}
diff --git a/pkg/ast/visitor/dump.go b/pkg/ast/visitor/dump.go
index 771ac0c..af4a87a 100644
--- a/pkg/ast/visitor/dump.go
+++ b/pkg/ast/visitor/dump.go
@@ -113,9 +113,6 @@ func (v *Dump) printToken(key string, t *token.Token) {
 	v.printIndent(v.indent + 1)
 	v.print("Value:   []byte(" + strconv.Quote(string(t.Value)) + "),\n")
 
-	v.printIndent(v.indent + 1)
-	v.print("Skipped: []byte(" + strconv.Quote(string(t.Skipped)) + "),\n")
-
 	v.printIndent(v.indent)
 	v.print("},\n")
 }
diff --git a/pkg/token/token.go b/pkg/token/token.go
index b36c85f..406a577 100644
--- a/pkg/token/token.go
+++ b/pkg/token/token.go
@@ -147,11 +147,10 @@ const (
 )
 
 type Token struct {
-	ID            ID
-	Value         []byte
-	Position      *position.Position
-	SkippedTokens []*Token
-	Skipped       []byte
+	ID           ID
+	Value        []byte
+	Position     *position.Position
+	FreeFloating []*Token
 }
 
 func (t *Token) GetPosition() *position.Position {