From 5620697cabe93508eefcde5a5b083b7a275f0da3 Mon Sep 17 00:00:00 2001
From: Vadym Slizov <vadym.slizov@miacar.ch>
Date: Mon, 18 May 2020 00:04:04 +0300
Subject: [PATCH] [refactoring] rename struct field scanner.Token.Hidden

---
 internal/php5/parser.go          |   12 +-
 internal/php5/php5.go            |  Bin 353481 -> 353481 bytes
 internal/php5/php5.y             | 1194 +++++++++++++++---------------
 internal/php7/parser.go          |   12 +-
 internal/php7/php7.go            |  Bin 289200 -> 289200 bytes
 internal/php7/php7.y             | 1012 ++++++++++++-------------
 internal/scanner/lexer.go        |   32 +-
 internal/scanner/scanner.go      |  Bin 384850 -> 384855 bytes
 internal/scanner/scanner.rl      |    6 +-
 internal/scanner/scanner_test.go |   88 +--
 internal/scanner/token.go        |    2 +-
 11 files changed, 1179 insertions(+), 1179 deletions(-)

diff --git a/internal/php5/parser.go b/internal/php5/parser.go
index e3b2dc9..8ceb195 100644
--- a/internal/php5/parser.go
+++ b/internal/php5/parser.go
@@ -50,7 +50,7 @@ func (l *Parser) Error(msg string) {
 }
 
 func (l *Parser) WithTokens() {
-	l.Lexer.SetWithTokens(true)
+	l.Lexer.SetWithHiddenTokens(true)
 }
 
 // Parse the php7 Parser entrypoint
@@ -93,7 +93,7 @@ func isDollar(r rune) bool {
 }
 
 func (l *Parser) MoveFreeFloating(src ast.Vertex, dst ast.Vertex) {
-	if l.Lexer.GetWithFreeFloating() == false {
+	if l.Lexer.GetWithHiddenTokens() == false {
 		return
 	}
 
@@ -106,7 +106,7 @@ func (l *Parser) MoveFreeFloating(src ast.Vertex, dst ast.Vertex) {
 }
 
 func (l *Parser) setFreeFloating(dst ast.Vertex, p token.Position, strings []token.Token) {
-	if l.Lexer.GetWithFreeFloating() == false {
+	if l.Lexer.GetWithHiddenTokens() == false {
 		return
 	}
 
@@ -123,7 +123,7 @@ func (l *Parser) setFreeFloating(dst ast.Vertex, p token.Position, strings []tok
 }
 
 func (l *Parser) GetFreeFloatingToken(t *scanner.Token) []token.Token {
-	if l.Lexer.GetWithFreeFloating() == false {
+	if l.Lexer.GetWithHiddenTokens() == false {
 		return []token.Token{}
 	}
 
@@ -136,7 +136,7 @@ func (l *Parser) GetFreeFloatingToken(t *scanner.Token) []token.Token {
 }
 
 func (l *Parser) addDollarToken(v ast.Vertex) {
-	if l.Lexer.GetWithFreeFloating() == false {
+	if l.Lexer.GetWithHiddenTokens() == false {
 		return
 	}
 
@@ -149,7 +149,7 @@ func (l *Parser) addDollarToken(v ast.Vertex) {
 }
 
 func (l *Parser) splitSemiColonAndPhpCloseTag(htmlNode ast.Vertex, prevNode ast.Vertex) {
-	if l.Lexer.GetWithFreeFloating() == false {
+	if l.Lexer.GetWithHiddenTokens() == false {
 		return
 	}
 
diff --git a/internal/php5/php5.go b/internal/php5/php5.go
index c822f382c48cfe6e2733cae244a389469472bf4d..a087602c1c796d9be2c5162e8bb4bb707e8d53b3 100644
GIT binary patch
delta 11384
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
GoBsh0F&SF`

delta 11041
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
YrZ74or?Sxn!+v8_wOf*e7-_Zr4_?Kh#sB~S

diff --git a/internal/php5/php5.y b/internal/php5/php5.y
index 082430d..cb70cfe 100644
--- a/internal/php5/php5.y
+++ b/internal/php5/php5.y
@@ -277,7 +277,7 @@ start:
                 yylex.(*Parser).rootNode = &ast.Root{ast.Node{}, $1}
                 yylex.(*Parser).rootNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1)
 
-                yylex.(*Parser).setFreeFloating(yylex.(*Parser).rootNode, token.End, yylex.(*Parser).currentToken.Tokens)
+                yylex.(*Parser).setFreeFloating(yylex.(*Parser).rootNode, token.End, yylex.(*Parser).currentToken.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -315,7 +315,7 @@ namespace_name:
                 namePart.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(namePart, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating(namePart, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -328,8 +328,8 @@ namespace_name:
                 namePart.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(namePart, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(namePart, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -369,10 +369,10 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.HaltCompiller, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.OpenParenthesisToken, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.CloseParenthesisToken, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.HaltCompiller, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.OpenParenthesisToken, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.CloseParenthesisToken, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -387,9 +387,9 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).MoveFreeFloating($2[0], name)
-                yylex.(*Parser).setFreeFloating(name, token.End, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(name, token.End, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -404,10 +404,10 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).MoveFreeFloating($2[0], name)
-                yylex.(*Parser).setFreeFloating(name, token.End, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $5.Tokens)
+                yylex.(*Parser).setFreeFloating(name, token.End, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $5.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -419,9 +419,9 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -433,8 +433,8 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -449,9 +449,9 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(useType, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(useType, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -466,9 +466,9 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(useType, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(useType, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -481,7 +481,7 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $2.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -494,7 +494,7 @@ use_declarations:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -534,8 +534,8 @@ use_declaration:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1[0], $$)
-                yylex.(*Parser).setFreeFloating(name, token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(name, token.End, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -549,7 +549,7 @@ use_declaration:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Slash, yylex.(*Parser).GetFreeFloatingToken($1))
                 yylex.(*Parser).MoveFreeFloating($2[0], name)
 
@@ -567,11 +567,11 @@ use_declaration:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($2, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Slash, yylex.(*Parser).GetFreeFloatingToken($1))
                 yylex.(*Parser).MoveFreeFloating($2[0], name)
-                yylex.(*Parser).setFreeFloating(name, token.End, $3.Tokens)
-                yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(name, token.End, $3.Hidden)
+                yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -583,7 +583,7 @@ use_function_declarations:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -623,8 +623,8 @@ use_function_declaration:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1[0], $$)
-                yylex.(*Parser).setFreeFloating(name, token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(name, token.End, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -638,7 +638,7 @@ use_function_declaration:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Slash, yylex.(*Parser).GetFreeFloatingToken($1))
                 yylex.(*Parser).MoveFreeFloating($2[0], name)
 
@@ -656,11 +656,11 @@ use_function_declaration:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($2, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Slash, yylex.(*Parser).GetFreeFloatingToken($1))
                 yylex.(*Parser).MoveFreeFloating($2[0], name)
-                yylex.(*Parser).setFreeFloating(name, token.End, $3.Tokens)
-                yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(name, token.End, $3.Hidden)
+                yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -672,7 +672,7 @@ use_const_declarations:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -712,8 +712,8 @@ use_const_declaration:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1[0], $$)
-                yylex.(*Parser).setFreeFloating(name, token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(name, token.End, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -727,7 +727,7 @@ use_const_declaration:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Slash, yylex.(*Parser).GetFreeFloatingToken($1))
                 yylex.(*Parser).MoveFreeFloating($2[0], name)
 
@@ -745,11 +745,11 @@ use_const_declaration:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListTokenPosition($2, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Slash, yylex.(*Parser).GetFreeFloatingToken($1))
                 yylex.(*Parser).MoveFreeFloating($2[0], name)
-                yylex.(*Parser).setFreeFloating(name, token.End, $3.Tokens)
-                yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(name, token.End, $3.Hidden)
+                yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -771,9 +771,9 @@ constant_declaration:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeNodeListPosition($1, constList.Consts)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastConst, token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(constant, token.Start, $3.Tokens)
-                yylex.(*Parser).setFreeFloating(constant, token.Name, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(lastConst, token.End, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(constant, token.Start, $3.Hidden)
+                yylex.(*Parser).setFreeFloating(constant, token.Name, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -790,9 +790,9 @@ constant_declaration:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, constList)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(constant, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(constant, token.Name, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(constant, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(constant, token.Name, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -855,10 +855,10 @@ inner_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.HaltCompiller, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.OpenParenthesisToken, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.CloseParenthesisToken, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.HaltCompiller, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.OpenParenthesisToken, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.CloseParenthesisToken, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -883,8 +883,8 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Label, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Label, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -899,8 +899,8 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -918,7 +918,7 @@ unticked_statement:
                 }
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 if len($2.GetNode().Tokens[token.OpenParenthesisToken]) > 0 {
                     yylex.(*Parser).setFreeFloating($$, token.If, $2.GetNode().Tokens[token.OpenParenthesisToken][:len($2.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($2.GetNode().Tokens, token.OpenParenthesisToken)
                 }
@@ -938,16 +938,16 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $8)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 if len($2.GetNode().Tokens[token.OpenParenthesisToken]) > 0 {
                     yylex.(*Parser).setFreeFloating($$, token.If, $2.GetNode().Tokens[token.OpenParenthesisToken][:len($2.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($2.GetNode().Tokens, token.OpenParenthesisToken)
                 }
                 if len($2.GetNode().Tokens[token.CloseParenthesisToken]) > 0 {
                     yylex.(*Parser).setFreeFloating($$, token.Expr, $2.GetNode().Tokens[token.CloseParenthesisToken][:len($2.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($2.GetNode().Tokens, token.CloseParenthesisToken)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $7.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $8.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $7.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $8.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($8))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -967,7 +967,7 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 if len($2.GetNode().Tokens[token.OpenParenthesisToken]) > 0 {
                     yylex.(*Parser).setFreeFloating($$, token.While, $2.GetNode().Tokens[token.OpenParenthesisToken][:len($2.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($2.GetNode().Tokens, token.OpenParenthesisToken)
                 }
@@ -985,15 +985,15 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden)
                 if len($4.GetNode().Tokens[token.OpenParenthesisToken]) > 0 {
                     yylex.(*Parser).setFreeFloating($$, token.While, $4.GetNode().Tokens[token.OpenParenthesisToken][:len($4.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($4.GetNode().Tokens, token.OpenParenthesisToken)
                 }
                 if len($4.GetNode().Tokens[token.CloseParenthesisToken]) > 0 {
                     yylex.(*Parser).setFreeFloating($$, token.Expr, $4.GetNode().Tokens[token.CloseParenthesisToken][:len($4.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($4.GetNode().Tokens, token.CloseParenthesisToken)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $5.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $5.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($5))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1017,11 +1017,11 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $9)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.For, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.InitExpr, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.CondExpr, $6.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.IncExpr, $8.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.For, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.InitExpr, $4.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.CondExpr, $6.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.IncExpr, $8.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1042,7 +1042,7 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 if len($2.GetNode().Tokens[token.OpenParenthesisToken]) > 0 {
                     yylex.(*Parser).setFreeFloating($$, token.Switch, $2.GetNode().Tokens[token.OpenParenthesisToken][:len($2.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($2.GetNode().Tokens, token.OpenParenthesisToken)
                 }
@@ -1060,8 +1060,8 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1074,8 +1074,8 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1088,8 +1088,8 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1102,8 +1102,8 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1116,8 +1116,8 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1130,8 +1130,8 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1144,8 +1144,8 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1159,7 +1159,7 @@ unticked_statement:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1172,8 +1172,8 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.VarList, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.VarList, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1186,8 +1186,8 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.VarList, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.VarList, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1200,9 +1200,9 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Echo, yylex.(*Parser).GetFreeFloatingToken($1))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1215,7 +1215,7 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1228,7 +1228,7 @@ unticked_statement:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1241,10 +1241,10 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Unset, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.VarList, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.CloseParenthesisToken, $5.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Unset, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.VarList, $4.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.CloseParenthesisToken, $5.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($5))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1279,13 +1279,13 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $8)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Foreach, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Foreach, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden)
                 if $6 != nil {
                     yylex.(*Parser).setFreeFloating($$, token.Key, $6.GetNode().Tokens[token.Key]); delete($6.GetNode().Tokens, token.Key)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.Var, $7.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $7.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1319,13 +1319,13 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $8)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Foreach, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Foreach, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden)
                 if $6 != nil {
                     yylex.(*Parser).setFreeFloating($$, token.Key, $6.GetNode().Tokens[token.Key]); delete($6.GetNode().Tokens, token.Key)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.Var, $7.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $7.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1338,9 +1338,9 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Declare, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ConstList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Declare, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ConstList, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1352,7 +1352,7 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1369,9 +1369,9 @@ unticked_statement:
                 }
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Try, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Try, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1383,8 +1383,8 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1399,9 +1399,9 @@ unticked_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(label, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Label, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(label, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Label, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1428,13 +1428,13 @@ catch_statement:
                 catchNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $8)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(catchNode, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(catchNode, token.Catch, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(variable, token.Start, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(catchNode, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(catchNode, token.Catch, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(variable, token.Start, $4.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating(catchNode, token.Var, $5.Tokens)
-                yylex.(*Parser).setFreeFloating(catchNode, token.Cond, $6.Tokens)
-                yylex.(*Parser).setFreeFloating(catchNode, token.Stmts, $8.Tokens)
+                yylex.(*Parser).setFreeFloating(catchNode, token.Var, $5.Hidden)
+                yylex.(*Parser).setFreeFloating(catchNode, token.Cond, $6.Hidden)
+                yylex.(*Parser).setFreeFloating(catchNode, token.Stmts, $8.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1455,9 +1455,9 @@ finally_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Finally, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Finally, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1506,13 +1506,13 @@ additional_catch:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $8)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Catch, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(variable, token.Start, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Catch, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(variable, token.Start, $4.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $5.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $6.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $8.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $5.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $6.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $8.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1530,7 +1530,7 @@ unset_variables:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1596,17 +1596,17 @@ unticked_function_declaration_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $9)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 if $2 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Function, $2.Tokens)
-                    yylex.(*Parser).setFreeFloating(name, token.Start, $3.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Function, $2.Hidden)
+                    yylex.(*Parser).setFreeFloating(name, token.Start, $3.Hidden)
                 } else {
-                    yylex.(*Parser).setFreeFloating(name, token.Start, $3.Tokens)
+                    yylex.(*Parser).setFreeFloating(name, token.Start, $3.Hidden)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.Name, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ParamList, $6.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Params, $7.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $9.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $4.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ParamList, $6.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Params, $7.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $9.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1635,9 +1635,9 @@ unticked_class_declaration_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $7)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(name, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $5.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $7.Tokens)
+                yylex.(*Parser).setFreeFloating(name, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $5.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $7.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1651,10 +1651,10 @@ unticked_class_declaration_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $6)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(name, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $6.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(name, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $4.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $6.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1670,7 +1670,7 @@ class_entry_type:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1684,8 +1684,8 @@ class_entry_type:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1697,7 +1697,7 @@ class_entry_type:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1711,8 +1711,8 @@ class_entry_type:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1733,7 +1733,7 @@ extends_from:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1761,7 +1761,7 @@ interface_extends_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1782,7 +1782,7 @@ implements_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1800,7 +1800,7 @@ interface_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1818,7 +1818,7 @@ foreach_optional_arg:
                 $$ = $2
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Key, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Key, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1839,7 +1839,7 @@ foreach_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1851,9 +1851,9 @@ foreach_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.List, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.List, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1879,9 +1879,9 @@ for_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1908,9 +1908,9 @@ foreach_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1938,9 +1938,9 @@ declare_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1960,8 +1960,8 @@ declare_list:
                 constant.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(constant, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(constant, token.Name, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(constant, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(constant, token.Name, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1976,9 +1976,9 @@ declare_list:
                 constant.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($3, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(constant, token.Start, $3.Tokens)
-                yylex.(*Parser).setFreeFloating(constant, token.Name, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(constant, token.Start, $3.Hidden)
+                yylex.(*Parser).setFreeFloating(constant, token.Name, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1996,8 +1996,8 @@ switch_case_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2011,9 +2011,9 @@ switch_case_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListStart, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(caseList, token.CaseListStart, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2027,9 +2027,9 @@ switch_case_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2045,10 +2045,10 @@ switch_case_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListStart, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $5.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(caseList, token.CaseListStart, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $4.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $5.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($5))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2072,8 +2072,8 @@ case_list:
                 _case.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($2, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(_case, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(_case, token.Expr, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(_case, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(_case, token.Expr, $4.Hidden)
                 yylex.(*Parser).setFreeFloating(_case, token.CaseSeparator, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2087,8 +2087,8 @@ case_list:
                 _default.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($2, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(_default, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(_default, token.Default, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(_default, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(_default, token.Default, $3.Hidden)
                 yylex.(*Parser).setFreeFloating(_default, token.CaseSeparator, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2128,9 +2128,9 @@ while_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2155,7 +2155,7 @@ elseif_list:
                 _elseIf.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($2, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(_elseIf, token.Start, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(_elseIf, token.Start, $2.Hidden)
                 if len($3.GetNode().Tokens[token.OpenParenthesisToken]) > 0 {
                     yylex.(*Parser).setFreeFloating(_elseIf, token.ElseIf, $3.GetNode().Tokens[token.OpenParenthesisToken][:len($3.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($3.GetNode().Tokens, token.OpenParenthesisToken)
                 }
@@ -2186,14 +2186,14 @@ new_elseif_list:
                 _elseIf.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($2, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(_elseIf, token.Start, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(_elseIf, token.Start, $2.Hidden)
                 if len($3.GetNode().Tokens[token.OpenParenthesisToken]) > 0 {
                     yylex.(*Parser).setFreeFloating(_elseIf, token.ElseIf, $3.GetNode().Tokens[token.OpenParenthesisToken][:len($3.GetNode().Tokens[token.OpenParenthesisToken])-1]); delete($3.GetNode().Tokens, token.OpenParenthesisToken)
                 }
                 if len($3.GetNode().Tokens[token.CloseParenthesisToken]) > 0 {
                     yylex.(*Parser).setFreeFloating(_elseIf, token.Expr, $3.GetNode().Tokens[token.CloseParenthesisToken][:len($3.GetNode().Tokens[token.CloseParenthesisToken])-1]); delete($3.GetNode().Tokens, token.CloseParenthesisToken)
                 }
-                yylex.(*Parser).setFreeFloating(_elseIf, token.Cond, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(_elseIf, token.Cond, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2215,7 +2215,7 @@ else_single:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2239,8 +2239,8 @@ new_else_single:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Else, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Else, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2274,7 +2274,7 @@ non_empty_parameter_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2305,12 +2305,12 @@ parameter:
                     yylex.(*Parser).MoveFreeFloating($1, $$)
                 }
                 if $2 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.OptionalType, $2.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.OptionalType, $2.Hidden)
                 }
                 if $3 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Hidden)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.Variadic, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Variadic, $4.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
 
                 // normalize
@@ -2350,13 +2350,13 @@ parameter:
                     yylex.(*Parser).MoveFreeFloating($1, $$)
                 }
                 if $2 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.OptionalType, $2.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.OptionalType, $2.Hidden)
                 }
                 if $3 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Hidden)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.Variadic, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $5.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Variadic, $4.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $5.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
 
                 // normalize
@@ -2390,7 +2390,7 @@ optional_class_type:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2402,7 +2402,7 @@ optional_class_type:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2424,8 +2424,8 @@ function_call_parameter_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ArgumentList, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ArgumentList, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2437,8 +2437,8 @@ function_call_parameter_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ArgumentList, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ArgumentList, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2452,8 +2452,8 @@ function_call_parameter_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ArgumentList, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ArgumentList, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2472,7 +2472,7 @@ non_empty_function_call_parameter_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2511,7 +2511,7 @@ function_call_parameter:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2523,7 +2523,7 @@ function_call_parameter:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2535,7 +2535,7 @@ global_var_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2559,7 +2559,7 @@ global_var:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).addDollarToken($$)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2572,7 +2572,7 @@ global_var:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Dollar, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2585,10 +2585,10 @@ global_var:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Dollar, yylex.(*Parser).GetFreeFloatingToken($1))
-                yylex.(*Parser).setFreeFloating($3, token.Start, append($2.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($2), $3.GetNode().Tokens[token.Start]...)...))
-                yylex.(*Parser).setFreeFloating($3, token.End, append($3.GetNode().Tokens[token.End], append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...)...))
+                yylex.(*Parser).setFreeFloating($3, token.Start, append($2.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($2), $3.GetNode().Tokens[token.Start]...)...))
+                yylex.(*Parser).setFreeFloating($3, token.End, append($3.GetNode().Tokens[token.End], append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2609,9 +2609,9 @@ static_var_list:
                 staticVar.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating(staticVar, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(staticVar, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2628,10 +2628,10 @@ static_var_list:
                 staticVar.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($3, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating(staticVar, token.Start, $3.Tokens)
-                yylex.(*Parser).setFreeFloating(staticVar, token.Var, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(staticVar, token.Start, $3.Hidden)
+                yylex.(*Parser).setFreeFloating(staticVar, token.Var, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2649,7 +2649,7 @@ static_var_list:
 
                 // save comments
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating(staticVar, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating(staticVar, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2667,8 +2667,8 @@ static_var_list:
 
                 // save comments
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating(staticVar, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(staticVar, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(staticVar, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(staticVar, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2701,7 +2701,7 @@ class_statement:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1[0], $$)
-                yylex.(*Parser).setFreeFloating($$, token.PropertyList, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.PropertyList, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2714,7 +2714,7 @@ class_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.ConstList, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.ConstList, $2.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2741,18 +2741,18 @@ class_statement:
                 // save comments
                 if len($1) > 0 {
                     yylex.(*Parser).MoveFreeFloating($1[0], $$)
-                    yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Hidden)
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Start, $2.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Start, $2.Hidden)
                 }
                 if $3 == nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Function, $4.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Function, $4.Hidden)
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Function, $3.Tokens)
-                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $4.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Function, $3.Hidden)
+                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $4.Hidden)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.Name, $5.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ParameterList, $7.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $5.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ParameterList, $7.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2767,7 +2767,7 @@ trait_use_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2785,7 +2785,7 @@ trait_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2799,7 +2799,7 @@ trait_adaptations:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2811,8 +2811,8 @@ trait_adaptations:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AdaptationList, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AdaptationList, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2854,7 +2854,7 @@ trait_adaptation_statement:
                 $$ = $1;
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.NameList, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.NameList, $2.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2864,7 +2864,7 @@ trait_adaptation_statement:
                 $$ = $1;
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Alias, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Alias, $2.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2881,7 +2881,7 @@ trait_precedence:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2899,7 +2899,7 @@ trait_reference_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2916,7 +2916,7 @@ trait_method_reference:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2940,8 +2940,8 @@ trait_method_reference_fully_qualified:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(target, token.Start, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(target, token.Start, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2959,8 +2959,8 @@ trait_alias:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2973,7 +2973,7 @@ trait_alias:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3003,7 +3003,7 @@ method_body:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -3016,8 +3016,8 @@ method_body:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3039,7 +3039,7 @@ variable_modifiers:
                 modifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(modifier, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating(modifier, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3084,7 +3084,7 @@ member_modifier:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3096,7 +3096,7 @@ member_modifier:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3108,7 +3108,7 @@ member_modifier:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3120,7 +3120,7 @@ member_modifier:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3132,7 +3132,7 @@ member_modifier:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3144,7 +3144,7 @@ member_modifier:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3165,8 +3165,8 @@ class_variable_declaration:
 
                 // save comments
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(property, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(property, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3183,10 +3183,10 @@ class_variable_declaration:
                 property.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($3, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating(property, token.Start, $3.Tokens)
-                yylex.(*Parser).setFreeFloating(property, token.Var, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(property, token.Start, $3.Hidden)
+                yylex.(*Parser).setFreeFloating(property, token.Var, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3204,7 +3204,7 @@ class_variable_declaration:
 
                 // save comments
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating(property, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating(property, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3222,8 +3222,8 @@ class_variable_declaration:
 
                 // save comments
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating(property, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(property, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(property, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(property, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3245,9 +3245,9 @@ class_constant_declaration:
                 $1.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastConst, token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(constant, token.Start, $3.Tokens)
-                yylex.(*Parser).setFreeFloating(constant, token.Name, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(lastConst, token.End, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(constant, token.Start, $3.Hidden)
+                yylex.(*Parser).setFreeFloating(constant, token.Name, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3263,9 +3263,9 @@ class_constant_declaration:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(constant, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(constant, token.Name, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(constant, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(constant, token.Name, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3277,7 +3277,7 @@ echo_expr_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3311,7 +3311,7 @@ non_empty_for_expr:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3348,8 +3348,8 @@ chaining_dereference:
                 fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3362,8 +3362,8 @@ chaining_dereference:
                 fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(fetch, token.Var, append($1.Tokens, yylex.(*Parser).GetFreeFloatingToken($1)...))
-                yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...))
+                yylex.(*Parser).setFreeFloating(fetch, token.Var, append($1.Hidden, yylex.(*Parser).GetFreeFloatingToken($1)...))
+                yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3418,7 +3418,7 @@ new_expr:
                 }
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3435,10 +3435,10 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $6)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(listNode, token.List, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $5.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(listNode, token.List, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $4.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $5.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3451,7 +3451,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3464,8 +3464,8 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Equal, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Equal, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3490,9 +3490,9 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Equal, $3.Tokens)
-                yylex.(*Parser).setFreeFloating(_new, token.Start, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Equal, $3.Hidden)
+                yylex.(*Parser).setFreeFloating(_new, token.Start, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3504,7 +3504,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3516,7 +3516,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3)
 
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3529,7 +3529,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3542,7 +3542,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3555,7 +3555,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3568,7 +3568,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3581,7 +3581,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3594,7 +3594,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3607,7 +3607,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3620,7 +3620,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3633,7 +3633,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3646,7 +3646,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3659,7 +3659,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3672,7 +3672,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3684,7 +3684,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3697,7 +3697,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3709,7 +3709,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3722,7 +3722,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3735,7 +3735,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3748,7 +3748,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3761,7 +3761,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3774,7 +3774,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3787,7 +3787,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3800,7 +3800,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3813,7 +3813,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3826,7 +3826,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3839,7 +3839,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3852,7 +3852,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3865,7 +3865,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3878,7 +3878,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3891,7 +3891,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3904,7 +3904,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3917,7 +3917,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3930,7 +3930,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3942,7 +3942,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3954,7 +3954,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3966,7 +3966,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3978,7 +3978,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3991,7 +3991,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4004,7 +4004,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4017,7 +4017,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4030,7 +4030,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Equal, yylex.(*Parser).GetFreeFloatingToken($2))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4044,7 +4044,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4057,7 +4057,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4070,7 +4070,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4083,7 +4083,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4096,7 +4096,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4120,8 +4120,8 @@ expr_without_variable:
                 $$ = $2
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...))
-                yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...)...))
+                yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...))
+                yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)...))
 
                 for _, n := range($4) {
                     switch nn := n.(type) {
@@ -4156,8 +4156,8 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.True, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.True, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4170,8 +4170,8 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.True, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.True, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4189,7 +4189,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4202,7 +4202,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4215,7 +4215,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4228,7 +4228,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4241,7 +4241,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4254,7 +4254,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4267,7 +4267,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4289,7 +4289,7 @@ expr_without_variable:
                 }
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4301,7 +4301,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4331,7 +4331,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4343,7 +4343,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4355,7 +4355,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4367,16 +4367,16 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $9)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 if $2 == nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Function, $3.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Function, $3.Hidden)
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Function, $2.Tokens)
-                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Function, $2.Hidden)
+                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Hidden)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.ParameterList, $5.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.LexicalVars, $7.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $9.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.ParameterList, $5.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.LexicalVars, $7.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $9.Hidden)
 
                 // normalize
                 if $6 == nil {
@@ -4393,17 +4393,17 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $10)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Static, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Static, $2.Hidden)
                 if $3 == nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Function, $4.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Function, $4.Hidden)
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Function, $3.Tokens)
-                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $4.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Function, $3.Hidden)
+                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $4.Hidden)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.ParameterList, $6.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.LexicalVars, $8.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $10.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.ParameterList, $6.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.LexicalVars, $8.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $10.Hidden)
 
                 // normalize
                 if $7 == nil {
@@ -4423,7 +4423,7 @@ yield_expr:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4435,7 +4435,7 @@ yield_expr:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4447,8 +4447,8 @@ yield_expr:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4460,8 +4460,8 @@ yield_expr:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4477,8 +4477,8 @@ combined_scalar_offset:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4491,8 +4491,8 @@ combined_scalar_offset:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4506,9 +4506,9 @@ combined_scalar_offset:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition(str, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4521,8 +4521,8 @@ combined_scalar_offset:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4537,9 +4537,9 @@ combined_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Array, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Array, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4551,8 +4551,8 @@ combined_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4580,9 +4580,9 @@ lexical_vars:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Use, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.LexicalVarList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Use, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.LexicalVarList, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4600,8 +4600,8 @@ lexical_var_list:
                 variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(variable, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(variable, token.Start, $3.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4619,9 +4619,9 @@ lexical_var_list:
                 reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($3, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(reference, token.Start, $3.Tokens)
-                yylex.(*Parser).setFreeFloating(variable, token.Start, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(reference, token.Start, $3.Hidden)
+                yylex.(*Parser).setFreeFloating(variable, token.Start, $4.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4637,7 +4637,7 @@ lexical_var_list:
                 variable.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(variable, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating(variable, token.Start, $1.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4655,8 +4655,8 @@ lexical_var_list:
                 reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(reference, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(variable, token.Start, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(reference, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(variable, token.Start, $2.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4688,8 +4688,8 @@ function_call:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(funcName, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(funcName, token.Namespace, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(funcName, token.Namespace, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4703,7 +4703,7 @@ function_call:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition(funcName, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4716,7 +4716,7 @@ function_call:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4729,7 +4729,7 @@ function_call:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4742,7 +4742,7 @@ function_call:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4755,7 +4755,7 @@ function_call:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4782,7 +4782,7 @@ class_name:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4806,8 +4806,8 @@ class_name:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4819,7 +4819,7 @@ class_name:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4846,8 +4846,8 @@ fully_qualified_class_name:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4859,7 +4859,7 @@ fully_qualified_class_name:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4886,7 +4886,7 @@ dynamic_class_name_reference:
                 $$ = $1
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($3[0], token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($3[0], token.Var, $2.Hidden)
 
                 for _, n := range($3) {
                     switch nn := n.(type) {
@@ -4953,7 +4953,7 @@ dynamic_class_name_variable_property:
                 $$ = $2
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($2[0], token.Var, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($2[0], token.Var, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4974,8 +4974,8 @@ exit_expr:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Exit, append($1.Tokens, yylex.(*Parser).GetFreeFloatingToken($1)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Exit, append($1.Hidden, yylex.(*Parser).GetFreeFloatingToken($1)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5047,7 +5047,7 @@ common_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5059,7 +5059,7 @@ common_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5071,7 +5071,7 @@ common_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5083,7 +5083,7 @@ common_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5095,7 +5095,7 @@ common_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5107,7 +5107,7 @@ common_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5119,7 +5119,7 @@ common_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5131,7 +5131,7 @@ common_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5143,7 +5143,7 @@ common_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5155,7 +5155,7 @@ common_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5169,7 +5169,7 @@ common_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5181,7 +5181,7 @@ common_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5199,8 +5199,8 @@ static_class_constant:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(target, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(target, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5252,8 +5252,8 @@ static_scalar_value:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5267,7 +5267,7 @@ static_scalar_value:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5279,9 +5279,9 @@ static_scalar_value:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Array, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Array, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5293,8 +5293,8 @@ static_scalar_value:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5312,7 +5312,7 @@ static_scalar_value:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5334,8 +5334,8 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5348,7 +5348,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5361,7 +5361,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5374,7 +5374,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5387,7 +5387,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5400,7 +5400,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5413,7 +5413,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5425,7 +5425,7 @@ static_operation:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5437,7 +5437,7 @@ static_operation:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5450,7 +5450,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5463,7 +5463,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5476,7 +5476,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5489,7 +5489,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5502,7 +5502,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5515,7 +5515,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5528,7 +5528,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5541,7 +5541,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5554,7 +5554,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5567,7 +5567,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5580,7 +5580,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5593,7 +5593,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5606,7 +5606,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5619,7 +5619,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5632,7 +5632,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Equal, yylex.(*Parser).GetFreeFloatingToken($2))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -5646,7 +5646,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5659,7 +5659,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5672,7 +5672,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5685,7 +5685,7 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5698,8 +5698,8 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.True, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.True, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5712,8 +5712,8 @@ static_operation:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.True, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.True, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5725,7 +5725,7 @@ static_operation:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5737,7 +5737,7 @@ static_operation:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5746,8 +5746,8 @@ static_operation:
                 $$ = $2
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...))
-                yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...)...))
+                yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...))
+                yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5784,8 +5784,8 @@ general_constant:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(name)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(name, token.Namespace, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(name, token.Namespace, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5799,7 +5799,7 @@ general_constant:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(name)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5816,7 +5816,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5846,7 +5846,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5858,7 +5858,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5870,7 +5870,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5889,7 +5889,7 @@ static_array_pair_list:
 
                 // save comments
                 if $2 != nil {
-                    yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                    yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
                 }
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -5917,9 +5917,9 @@ non_empty_static_array_pair_list:
                 arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($3, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
                 yylex.(*Parser).MoveFreeFloating($3, arrayItem)
-                yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5932,7 +5932,7 @@ non_empty_static_array_pair_list:
                 arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
                 yylex.(*Parser).MoveFreeFloating($3, arrayItem)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -5947,7 +5947,7 @@ non_empty_static_array_pair_list:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, arrayItem)
-                yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5993,8 +5993,8 @@ parenthesis_expr:
                 if len($2.GetNode().Tokens[token.CloseParenthesisToken]) > 0 {
                     yylex.(*Parser).setFreeFloating($2, token.End, append($2.GetNode().Tokens[token.End], $2.GetNode().Tokens[token.CloseParenthesisToken]...))
                 }
-                yylex.(*Parser).setFreeFloating($2, token.OpenParenthesisToken, append($1.Tokens, yylex.(*Parser).GetFreeFloatingToken($1)...))
-                yylex.(*Parser).setFreeFloating($2, token.CloseParenthesisToken, append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...))
+                yylex.(*Parser).setFreeFloating($2, token.OpenParenthesisToken, append($1.Hidden, yylex.(*Parser).GetFreeFloatingToken($1)...))
+                yylex.(*Parser).setFreeFloating($2, token.CloseParenthesisToken, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6009,8 +6009,8 @@ parenthesis_expr:
                 if len($2.GetNode().Tokens[token.CloseParenthesisToken]) > 0 {
                     yylex.(*Parser).setFreeFloating($2, token.End, append($2.GetNode().Tokens[token.End], $2.GetNode().Tokens[token.CloseParenthesisToken]...))
                 }
-                yylex.(*Parser).setFreeFloating($2, token.OpenParenthesisToken, append($1.Tokens, yylex.(*Parser).GetFreeFloatingToken($1)...))
-                yylex.(*Parser).setFreeFloating($2, token.CloseParenthesisToken, append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...))
+                yylex.(*Parser).setFreeFloating($2, token.OpenParenthesisToken, append($1.Hidden, yylex.(*Parser).GetFreeFloatingToken($1)...))
+                yylex.(*Parser).setFreeFloating($2, token.CloseParenthesisToken, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6056,7 +6056,7 @@ variable:
                 }
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($3[0], token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($3[0], token.Var, $2.Hidden)
 
                 for _, n := range($3) {
                     switch nn := n.(type) {
@@ -6139,7 +6139,7 @@ variable_property:
                 $$ = $2
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($2[0], token.Var, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($2[0], token.Var, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6155,8 +6155,8 @@ array_method_dereference:
                 fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6169,8 +6169,8 @@ array_method_dereference:
                 fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6240,7 +6240,7 @@ static_member:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6253,7 +6253,7 @@ static_member:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6278,8 +6278,8 @@ array_function_dereference:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6292,8 +6292,8 @@ array_function_dereference:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6358,8 +6358,8 @@ reference_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6372,8 +6372,8 @@ reference_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6397,7 +6397,7 @@ compound_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).addDollarToken($$)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -6410,10 +6410,10 @@ compound_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Dollar, yylex.(*Parser).GetFreeFloatingToken($1))
-                yylex.(*Parser).setFreeFloating($3, token.Start, append($2.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($2), $3.GetNode().Tokens[token.Start]...)...))
-                yylex.(*Parser).setFreeFloating($3, token.End, append($3.GetNode().Tokens[token.End], append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...)...))
+                yylex.(*Parser).setFreeFloating($3, token.Start, append($2.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($2), $3.GetNode().Tokens[token.Start]...)...))
+                yylex.(*Parser).setFreeFloating($3, token.End, append($3.GetNode().Tokens[token.End], append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6464,8 +6464,8 @@ object_dim_list:
                 fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6478,8 +6478,8 @@ object_dim_list:
                 fetch.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating(fetch, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating(fetch, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6504,7 +6504,7 @@ variable_name:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6516,8 +6516,8 @@ variable_name:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...))
-                yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...)...))
+                yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...))
+                yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6533,7 +6533,7 @@ simple_indirect_reference:
                 n.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(n, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating(n, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating(n, token.Dollar, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -6551,7 +6551,7 @@ simple_indirect_reference:
                 n.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(n, token.Start, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(n, token.Start, $2.Hidden)
                 yylex.(*Parser).setFreeFloating(n, token.Dollar, yylex.(*Parser).GetFreeFloatingToken($2))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -6568,7 +6568,7 @@ assignment_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6608,9 +6608,9 @@ assignment_list_element:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition(listNode)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(listNode, token.List, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(listNode, token.List, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6640,7 +6640,7 @@ array_pair_list:
 
                 // save comments
                 if $2 != nil {
-                    yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                    yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
                 }
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -6657,9 +6657,9 @@ non_empty_array_pair_list:
                 arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($3, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
                 yylex.(*Parser).MoveFreeFloating($3, arrayItem)
-                yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6672,7 +6672,7 @@ non_empty_array_pair_list:
                 arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodePosition($3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
                 yylex.(*Parser).MoveFreeFloating($3, arrayItem)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -6687,7 +6687,7 @@ non_empty_array_pair_list:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, arrayItem)
-                yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6715,10 +6715,10 @@ non_empty_array_pair_list:
                 arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($3, $6)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
                 yylex.(*Parser).MoveFreeFloating($3, arrayItem)
-                yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $4.Tokens)
-                yylex.(*Parser).setFreeFloating(reference, token.Start, $5.Tokens)
+                yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $4.Hidden)
+                yylex.(*Parser).setFreeFloating(reference, token.Start, $5.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6733,8 +6733,8 @@ non_empty_array_pair_list:
                 arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($3, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(arrayItem, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(arrayItem, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6750,8 +6750,8 @@ non_empty_array_pair_list:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, arrayItem)
-                yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(reference, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(arrayItem, token.Expr, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(reference, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6766,7 +6766,7 @@ non_empty_array_pair_list:
                 arrayItem.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(arrayItem, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating(arrayItem, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6788,7 +6788,7 @@ encaps_list:
                 encapsed.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(encapsed, token.Start, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(encapsed, token.Start, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6807,7 +6807,7 @@ encaps_list:
                 encapsed.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(encapsed, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating(encapsed, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6824,7 +6824,7 @@ encaps_var:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).addDollarToken($$)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -6842,8 +6842,8 @@ encaps_var:
 
                 // save comments
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6862,8 +6862,8 @@ encaps_var:
 
                 // save comments
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(fetch, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(fetch, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6878,7 +6878,7 @@ encaps_var:
 
                 // save comments
                 yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1))
-                yylex.(*Parser).setFreeFloating($$, token.End, append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...))
+                yylex.(*Parser).setFreeFloating($$, token.End, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6895,7 +6895,7 @@ encaps_var:
 
                 // save comments
                 yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1))
-                yylex.(*Parser).setFreeFloating($$, token.End, append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...))
+                yylex.(*Parser).setFreeFloating($$, token.End, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6912,9 +6912,9 @@ encaps_var:
 
                 // save comments
                 yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1))
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($5.Tokens, yylex.(*Parser).GetFreeFloatingToken($5)...))
-                yylex.(*Parser).setFreeFloating($$, token.End, append($6.Tokens, yylex.(*Parser).GetFreeFloatingToken($6)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($5.Hidden, yylex.(*Parser).GetFreeFloatingToken($5)...))
+                yylex.(*Parser).setFreeFloating($$, token.End, append($6.Hidden, yylex.(*Parser).GetFreeFloatingToken($6)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6924,7 +6924,7 @@ encaps_var:
 
                 // save comments
                 yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1))
-                yylex.(*Parser).setFreeFloating($$, token.End, append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...))
+                yylex.(*Parser).setFreeFloating($$, token.End, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6939,7 +6939,7 @@ encaps_var_offset:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6956,7 +6956,7 @@ encaps_var_offset:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -6970,7 +6970,7 @@ encaps_var_offset:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).addDollarToken($$)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -6986,9 +6986,9 @@ internal_functions_in_yacc:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Isset, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.VarList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Isset, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.VarList, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -7000,9 +7000,9 @@ internal_functions_in_yacc:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Empty, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Empty, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -7014,9 +7014,9 @@ internal_functions_in_yacc:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Empty, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Empty, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -7028,7 +7028,7 @@ internal_functions_in_yacc:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -7040,7 +7040,7 @@ internal_functions_in_yacc:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -7052,9 +7052,9 @@ internal_functions_in_yacc:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Eval, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Eval, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -7066,7 +7066,7 @@ internal_functions_in_yacc:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -7078,7 +7078,7 @@ internal_functions_in_yacc:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -7096,7 +7096,7 @@ isset_variables:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -7129,8 +7129,8 @@ class_constant:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(target, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(target, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -7145,8 +7145,8 @@ class_constant:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(target, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(target, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -7164,8 +7164,8 @@ static_class_name_scalar:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(target, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(target, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -7183,8 +7183,8 @@ class_name_scalar:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(target, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(target, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
diff --git a/internal/php7/parser.go b/internal/php7/parser.go
index 918c795..b2f106b 100644
--- a/internal/php7/parser.go
+++ b/internal/php7/parser.go
@@ -48,7 +48,7 @@ func (l *Parser) Error(msg string) {
 }
 
 func (l *Parser) WithTokens() {
-	l.Lexer.SetWithTokens(true)
+	l.Lexer.SetWithHiddenTokens(true)
 }
 
 // Parse the php7 Parser entrypoint
@@ -91,7 +91,7 @@ func isDollar(r rune) bool {
 }
 
 func (l *Parser) MoveFreeFloating(src ast.Vertex, dst ast.Vertex) {
-	if l.Lexer.GetWithFreeFloating() == false {
+	if l.Lexer.GetWithHiddenTokens() == false {
 		return
 	}
 
@@ -104,7 +104,7 @@ func (l *Parser) MoveFreeFloating(src ast.Vertex, dst ast.Vertex) {
 }
 
 func (l *Parser) setFreeFloating(dst ast.Vertex, p token.Position, strings []token.Token) {
-	if l.Lexer.GetWithFreeFloating() == false {
+	if l.Lexer.GetWithHiddenTokens() == false {
 		return
 	}
 
@@ -121,7 +121,7 @@ func (l *Parser) setFreeFloating(dst ast.Vertex, p token.Position, strings []tok
 }
 
 func (l *Parser) GetFreeFloatingToken(t *scanner.Token) []token.Token {
-	if l.Lexer.GetWithFreeFloating() == false {
+	if l.Lexer.GetWithHiddenTokens() == false {
 		return []token.Token{}
 	}
 
@@ -134,7 +134,7 @@ func (l *Parser) GetFreeFloatingToken(t *scanner.Token) []token.Token {
 }
 
 func (l *Parser) addDollarToken(v ast.Vertex) {
-	if l.Lexer.GetWithFreeFloating() == false {
+	if l.Lexer.GetWithHiddenTokens() == false {
 		return
 	}
 
@@ -147,7 +147,7 @@ func (l *Parser) addDollarToken(v ast.Vertex) {
 }
 
 func (l *Parser) splitSemiColonAndPhpCloseTag(htmlNode ast.Vertex, prevNode ast.Vertex) {
-	if l.Lexer.GetWithFreeFloating() == false {
+	if l.Lexer.GetWithHiddenTokens() == false {
 		return
 	}
 
diff --git a/internal/php7/php7.go b/internal/php7/php7.go
index 0900ad3bc4f50b2d782f8519e24d3155b18efd06..b26e86405145207dc3a1d4f2fb16940de9374be1 100644
GIT binary patch
delta 9534
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
D!ZHgJ

delta 9553
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

diff --git a/internal/php7/php7.y b/internal/php7/php7.y
index cd147ff..7515ba9 100644
--- a/internal/php7/php7.y
+++ b/internal/php7/php7.y
@@ -299,7 +299,7 @@ start:
                 // save position
                 yylex.(*Parser).rootNode.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeListPosition($1)
 
-                yylex.(*Parser).setFreeFloating(yylex.(*Parser).rootNode, token.End, yylex.(*Parser).currentToken.Tokens)
+                yylex.(*Parser).setFreeFloating(yylex.(*Parser).rootNode, token.End, yylex.(*Parser).currentToken.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -366,7 +366,7 @@ namespace_name:
                 namePart.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(namePart, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating(namePart, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -379,8 +379,8 @@ namespace_name:
                 namePart.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(namePart, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(namePart, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -407,8 +407,8 @@ name:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -420,7 +420,7 @@ name:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -472,10 +472,10 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.HaltCompiller, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.OpenParenthesisToken, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.CloseParenthesisToken, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.HaltCompiller, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.OpenParenthesisToken, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.CloseParenthesisToken, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -490,9 +490,9 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).MoveFreeFloating($2[0], name)
-                yylex.(*Parser).setFreeFloating(name, token.End, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(name, token.End, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -507,10 +507,10 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).MoveFreeFloating($2[0], name)
-                yylex.(*Parser).setFreeFloating(name, token.End, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $5.Tokens)
+                yylex.(*Parser).setFreeFloating(name, token.End, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $5.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -522,9 +522,9 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Namespace, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -536,8 +536,8 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -551,8 +551,8 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -565,8 +565,8 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -579,8 +579,8 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.UseDeclarationList, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -593,8 +593,8 @@ top_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -610,7 +610,7 @@ use_type:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -622,7 +622,7 @@ use_type:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -640,12 +640,12 @@ group_use_declaration:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1[0], name)
-                yylex.(*Parser).setFreeFloating(name, token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Slash, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(name, token.End, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Slash, $3.Hidden)
                 if $5 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Stmts, append($5.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($5), $6.Tokens...)...))
+                    yylex.(*Parser).setFreeFloating($$, token.Stmts, append($5.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($5), $6.Hidden...)...))
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Stmts, $6.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Stmts, $6.Hidden)
                 }
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -660,14 +660,14 @@ group_use_declaration:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $7)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.UseType, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.UseType, $1.Hidden)
                 yylex.(*Parser).MoveFreeFloating($2[0], name)
-                yylex.(*Parser).setFreeFloating(name, token.End, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Slash, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(name, token.End, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Slash, $4.Hidden)
                 if $6 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Stmts, append($6.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($6), $7.Tokens...)...))
+                    yylex.(*Parser).setFreeFloating($$, token.Stmts, append($6.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($6), $7.Hidden...)...))
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Stmts, $7.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Stmts, $7.Hidden)
                 }
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -686,12 +686,12 @@ mixed_group_use_declaration:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1[0], name)
-                yylex.(*Parser).setFreeFloating(name, token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Slash, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(name, token.End, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Slash, $3.Hidden)
                 if $5 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Stmts, append($5.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($5), $6.Tokens...)...))
+                    yylex.(*Parser).setFreeFloating($$, token.Stmts, append($5.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($5), $6.Hidden...)...))
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Stmts, $6.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Stmts, $6.Hidden)
                 }
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -706,14 +706,14 @@ mixed_group_use_declaration:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $7)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Use, append($1.Tokens, yylex.(*Parser).GetFreeFloatingToken($1)...))
+                yylex.(*Parser).setFreeFloating($$, token.Use, append($1.Hidden, yylex.(*Parser).GetFreeFloatingToken($1)...))
                 yylex.(*Parser).MoveFreeFloating($2[0], name)
-                yylex.(*Parser).setFreeFloating(name, token.End, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Slash, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(name, token.End, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Slash, $4.Hidden)
                 if $6 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Stmts, append($6.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($6), $7.Tokens...)...))
+                    yylex.(*Parser).setFreeFloating($$, token.Stmts, append($6.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($6), $7.Hidden...)...))
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Stmts, $7.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Stmts, $7.Hidden)
                 }
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -737,7 +737,7 @@ inline_use_declarations:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -755,7 +755,7 @@ unprefixed_use_declarations:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -773,7 +773,7 @@ use_declarations:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -829,8 +829,8 @@ unprefixed_use_declaration:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1[0], name)
-                yylex.(*Parser).setFreeFloating(name, token.End, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(name, token.End, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -851,10 +851,10 @@ use_declaration:
                 $$ = $2;
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Slash, yylex.(*Parser).GetFreeFloatingToken($1))
 
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Slash, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -867,7 +867,7 @@ const_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -947,10 +947,10 @@ inner_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.HaltCompiller, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.OpenParenthesisToken, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.CloseParenthesisToken, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.HaltCompiller, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.OpenParenthesisToken, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.CloseParenthesisToken, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -965,8 +965,8 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -997,9 +997,9 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.While, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.While, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1011,11 +1011,11 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $7)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.While, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $6.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $7.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.While, $4.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $6.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $7.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($7))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1039,11 +1039,11 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $9)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.For, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.InitExpr, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.CondExpr, $6.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.IncExpr, $8.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.For, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.InitExpr, $4.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.CondExpr, $6.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.IncExpr, $8.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1064,9 +1064,9 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Switch, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Switch, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1078,8 +1078,8 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1092,8 +1092,8 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1106,8 +1106,8 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1120,8 +1120,8 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.VarList, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.VarList, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1134,8 +1134,8 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.VarList, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.VarList, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1148,9 +1148,9 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Echo, yylex.(*Parser).GetFreeFloatingToken($1))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1163,7 +1163,7 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1176,7 +1176,7 @@ statement:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1189,14 +1189,14 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $6)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Unset, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Unset, $2.Hidden)
                 if $4 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.VarList, append($4.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($4), $5.Tokens...)...))
+                    yylex.(*Parser).setFreeFloating($$, token.VarList, append($4.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($4), $5.Hidden...)...))
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.VarList, $5.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.VarList, $5.Hidden)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.CloseParenthesisToken, $6.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.CloseParenthesisToken, $6.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($6))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1218,10 +1218,10 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $7)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Foreach, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $6.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Foreach, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $6.Hidden)
 
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1245,11 +1245,11 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $9)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Foreach, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Key, $6.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $8.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Foreach, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Key, $6.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $8.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1262,9 +1262,9 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Declare, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ConstList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Declare, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ConstList, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1276,7 +1276,7 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1292,9 +1292,9 @@ statement:
                 }
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Try, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Try, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1306,8 +1306,8 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1322,9 +1322,9 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(label, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Label, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(label, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Label, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1339,8 +1339,8 @@ statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Label, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Label, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1365,13 +1365,13 @@ catch_list:
                 catch.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($2, $9)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(catch, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(catch, token.Catch, $3.Tokens)
-                yylex.(*Parser).setFreeFloating(variable, token.Start, $5.Tokens)
+                yylex.(*Parser).setFreeFloating(catch, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(catch, token.Catch, $3.Hidden)
+                yylex.(*Parser).setFreeFloating(variable, token.Start, $5.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating(catch, token.Var, $6.Tokens)
-                yylex.(*Parser).setFreeFloating(catch, token.Cond, $7.Tokens)
-                yylex.(*Parser).setFreeFloating(catch, token.Stmts, $9.Tokens)
+                yylex.(*Parser).setFreeFloating(catch, token.Var, $6.Hidden)
+                yylex.(*Parser).setFreeFloating(catch, token.Cond, $7.Hidden)
+                yylex.(*Parser).setFreeFloating(catch, token.Stmts, $9.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1388,7 +1388,7 @@ catch_name_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1409,9 +1409,9 @@ finally_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Finally, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Finally, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1429,7 +1429,7 @@ unset_variables:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1456,20 +1456,20 @@ function_declaration_statement:
 
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 if $2 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Function, $2.Tokens)
-                    yylex.(*Parser).setFreeFloating(name, token.Start, $3.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Function, $2.Hidden)
+                    yylex.(*Parser).setFreeFloating(name, token.Start, $3.Hidden)
                 } else {
-                    yylex.(*Parser).setFreeFloating(name, token.Start, $3.Tokens)
+                    yylex.(*Parser).setFreeFloating(name, token.Start, $3.Hidden)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.Name, $5.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ParamList, $7.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $5.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ParamList, $7.Hidden)
                 if $8 != nil {
                     yylex.(*Parser).setFreeFloating($$, token.Params, $8.GetNode().Tokens[token.Colon]); delete($8.GetNode().Tokens, token.Colon)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.ReturnType, $9.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $11.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.ReturnType, $9.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $11.Hidden)
 
                 // normalize
                 if $8 == nil {
@@ -1514,10 +1514,10 @@ class_declaration_statement:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1[0], $$)
-                yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(name, token.Start, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $7.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $9.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(name, token.Start, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $7.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $9.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1531,10 +1531,10 @@ class_declaration_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $8)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(name, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $6.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $8.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(name, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $6.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $8.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1564,7 +1564,7 @@ class_modifier:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1576,7 +1576,7 @@ class_modifier:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1593,10 +1593,10 @@ trait_declaration_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $6)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(name, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $6.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(name, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $4.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $6.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1613,10 +1613,10 @@ interface_declaration_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $7)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(name, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $5.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $7.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(name, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $5.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $7.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1637,7 +1637,7 @@ extends_from:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1658,7 +1658,7 @@ interface_extends_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1679,7 +1679,7 @@ implements_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1700,7 +1700,7 @@ foreach_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1712,9 +1712,9 @@ foreach_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.List, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.List, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1726,8 +1726,8 @@ foreach_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save commentsc
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1753,9 +1753,9 @@ for_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1782,9 +1782,9 @@ foreach_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1811,9 +1811,9 @@ declare_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1831,8 +1831,8 @@ switch_case_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1846,9 +1846,9 @@ switch_case_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListStart, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $4.Tokens)
+                yylex.(*Parser).setFreeFloating(caseList, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(caseList, token.CaseListStart, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1862,9 +1862,9 @@ switch_case_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1880,10 +1880,10 @@ switch_case_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListStart, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $5.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(caseList, token.CaseListStart, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating(caseList, token.CaseListEnd, $4.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $5.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($5))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1906,8 +1906,8 @@ case_list:
                 _case.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($2, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(_case, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(_case, token.Expr, append($4.Tokens))
+                yylex.(*Parser).setFreeFloating(_case, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(_case, token.Expr, append($4.Hidden))
                 yylex.(*Parser).setFreeFloating(_case, token.CaseSeparator, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1921,8 +1921,8 @@ case_list:
                 _default.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($2, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(_default, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(_default, token.Default, $3.Tokens)
+                yylex.(*Parser).setFreeFloating(_default, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(_default, token.Default, $3.Hidden)
                 yylex.(*Parser).setFreeFloating(_default, token.CaseSeparator, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1960,9 +1960,9 @@ while_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -1978,9 +1978,9 @@ if_stmt_without_else:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.If, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.If, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -1996,9 +1996,9 @@ if_stmt_without_else:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $6)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(_elseIf, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(_elseIf, token.ElseIf, $3.Tokens)
-                yylex.(*Parser).setFreeFloating(_elseIf, token.Expr, $5.Tokens)
+                yylex.(*Parser).setFreeFloating(_elseIf, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(_elseIf, token.ElseIf, $3.Hidden)
+                yylex.(*Parser).setFreeFloating(_elseIf, token.Expr, $5.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2023,7 +2023,7 @@ if_stmt:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(_else, token.Start, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(_else, token.Start, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2040,10 +2040,10 @@ alt_if_stmt_without_else:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $6)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.If, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $5.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.If, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $5.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2060,10 +2060,10 @@ alt_if_stmt_without_else:
                 _elseIf.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($2, $7)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(_elseIf, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(_elseIf, token.ElseIf, $3.Tokens)
-                yylex.(*Parser).setFreeFloating(_elseIf, token.Expr, $5.Tokens)
-                yylex.(*Parser).setFreeFloating(_elseIf, token.Cond, $6.Tokens)
+                yylex.(*Parser).setFreeFloating(_elseIf, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(_elseIf, token.ElseIf, $3.Hidden)
+                yylex.(*Parser).setFreeFloating(_elseIf, token.Expr, $5.Hidden)
+                yylex.(*Parser).setFreeFloating(_elseIf, token.Cond, $6.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2078,8 +2078,8 @@ alt_if_stmt:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $3.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($3))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2098,10 +2098,10 @@ alt_if_stmt:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $6)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(_else, token.Start, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(_else, token.Else, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $5.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $6.Tokens)
+                yylex.(*Parser).setFreeFloating(_else, token.Start, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(_else, token.Else, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $5.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AltEnd, $6.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($6))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2135,7 +2135,7 @@ non_empty_parameter_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2166,12 +2166,12 @@ parameter:
                     yylex.(*Parser).MoveFreeFloating($1, $$)
                 }
                 if $2 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.OptionalType, $2.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.OptionalType, $2.Hidden)
                 }
                 if $3 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Hidden)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.Variadic, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Variadic, $4.Hidden)
 
                 yylex.(*Parser).addDollarToken(variable)
 
@@ -2212,13 +2212,13 @@ parameter:
                     yylex.(*Parser).MoveFreeFloating($1, $$)
                 }
                 if $2 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.OptionalType, $2.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.OptionalType, $2.Hidden)
                 }
                 if $3 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Hidden)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.Variadic, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $5.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Variadic, $4.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $5.Hidden)
 
                 yylex.(*Parser).addDollarToken(variable)
 
@@ -2267,7 +2267,7 @@ type_expr:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2282,7 +2282,7 @@ type:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2294,7 +2294,7 @@ type:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2318,7 +2318,7 @@ return_type:
                 $$ = $2;
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Colon, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Colon, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2333,8 +2333,8 @@ argument_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ArgumentList, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ArgumentList, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2346,11 +2346,11 @@ argument_list:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 if $3 != nil {
-                    yylex.(*Parser).setFreeFloating($$, token.ArgumentList, append($3.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($3), $4.Tokens...)...))
+                    yylex.(*Parser).setFreeFloating($$, token.ArgumentList, append($3.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($3), $4.Hidden...)...))
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.ArgumentList, $4.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.ArgumentList, $4.Hidden)
                 }
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2369,7 +2369,7 @@ non_empty_argument_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2396,7 +2396,7 @@ argument:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2408,7 +2408,7 @@ global_var_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2435,7 +2435,7 @@ static_var_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2460,7 +2460,7 @@ static_var:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2477,9 +2477,9 @@ static_var:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2510,7 +2510,7 @@ class_statement:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1[0], $$)
-                yylex.(*Parser).setFreeFloating($$, token.PropertyList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.PropertyList, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2525,11 +2525,11 @@ class_statement:
                 // save comments
                 if len($1) > 0 {
                     yylex.(*Parser).MoveFreeFloating($1[0], $$)
-                    yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Hidden)
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Start, $2.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Start, $2.Hidden)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.ConstList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.ConstList, $4.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($4))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2542,7 +2542,7 @@ class_statement:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2562,18 +2562,18 @@ class_statement:
                 // save comments
                 if len($1) > 0 {
                     yylex.(*Parser).MoveFreeFloating($1[0], $$)
-                    yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.ModifierList, $2.Hidden)
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Start, $2.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Start, $2.Hidden)
                 }
                 if $3 == nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Function, $4.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Function, $4.Hidden)
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Function, $3.Tokens)
-                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $4.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Function, $3.Hidden)
+                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $4.Hidden)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.Name, $6.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ParameterList, $8.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $6.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ParameterList, $8.Hidden)
                 if $9 != nil {
                     yylex.(*Parser).setFreeFloating($$, token.Params, $9.GetNode().Tokens[token.Colon]); delete($9.GetNode().Tokens, token.Colon)
                 }
@@ -2594,7 +2594,7 @@ name_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2608,7 +2608,7 @@ trait_adaptations:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($1))
 
 
@@ -2621,8 +2621,8 @@ trait_adaptations:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AdaptationList, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AdaptationList, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2633,8 +2633,8 @@ trait_adaptations:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.AdaptationList, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.AdaptationList, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2661,7 +2661,7 @@ trait_adaptation:
                 $$ = $1;
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.NameList, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.NameList, $2.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2671,7 +2671,7 @@ trait_adaptation:
                 $$ = $1;
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Alias, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Alias, $2.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($2))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2688,7 +2688,7 @@ trait_precedence:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2706,8 +2706,8 @@ trait_alias:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2722,8 +2722,8 @@ trait_alias:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(alias, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2738,8 +2738,8 @@ trait_alias:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(alias, token.Start, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2752,7 +2752,7 @@ trait_alias:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Ref, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2769,7 +2769,7 @@ trait_method_reference:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2793,8 +2793,8 @@ absolute_trait_method_reference:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(target, token.Start, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(target, token.Start, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2809,7 +2809,7 @@ method_body:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.SemiColon, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2822,8 +2822,8 @@ method_body:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2845,7 +2845,7 @@ variable_modifiers:
                 modifier.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(modifier, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating(modifier, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2890,7 +2890,7 @@ member_modifier:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2902,7 +2902,7 @@ member_modifier:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2914,7 +2914,7 @@ member_modifier:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2926,7 +2926,7 @@ member_modifier:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2938,7 +2938,7 @@ member_modifier:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2950,7 +2950,7 @@ member_modifier:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2962,7 +2962,7 @@ property_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -2987,7 +2987,7 @@ property:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -3004,9 +3004,9 @@ property:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3018,7 +3018,7 @@ class_const_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3041,8 +3041,8 @@ class_const_decl:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3059,8 +3059,8 @@ const_decl:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3072,7 +3072,7 @@ echo_expr_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3114,7 +3114,7 @@ non_empty_for_exprs:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3139,9 +3139,9 @@ anonymous_class:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $8)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $6.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $8.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $6.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $8.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3159,7 +3159,7 @@ new_expr:
                 }
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3171,7 +3171,7 @@ new_expr:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3188,10 +3188,10 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $6)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(listNode, token.List, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $4.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $5.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(listNode, token.List, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $4.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $5.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3205,9 +3205,9 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(shortList, token.ArrayPairList, $3.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(shortList, token.ArrayPairList, $3.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3220,7 +3220,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3233,8 +3233,8 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Equal, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Equal, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3246,7 +3246,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3259,7 +3259,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3272,7 +3272,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3285,7 +3285,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3298,7 +3298,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3311,7 +3311,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3324,7 +3324,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3337,7 +3337,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3350,7 +3350,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3363,7 +3363,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3376,7 +3376,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3389,7 +3389,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3402,7 +3402,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3415,7 +3415,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3428,7 +3428,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3440,7 +3440,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3453,7 +3453,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3465,7 +3465,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3478,7 +3478,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3491,7 +3491,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3504,7 +3504,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3517,7 +3517,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3530,7 +3530,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3543,7 +3543,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3556,7 +3556,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3569,7 +3569,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3582,7 +3582,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3595,7 +3595,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3608,7 +3608,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3621,7 +3621,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3634,7 +3634,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3647,7 +3647,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3660,7 +3660,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3673,7 +3673,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3686,7 +3686,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3698,7 +3698,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3710,7 +3710,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3722,7 +3722,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3734,7 +3734,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3747,7 +3747,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3760,7 +3760,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3773,7 +3773,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3786,7 +3786,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Equal, yylex.(*Parser).GetFreeFloatingToken($2))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -3800,7 +3800,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3813,7 +3813,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3826,7 +3826,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3839,7 +3839,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3852,7 +3852,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3865,7 +3865,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3874,8 +3874,8 @@ expr_without_variable:
                 $$ = $2;
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...))
-                yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...)...))
+                yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...))
+                yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3894,8 +3894,8 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.True, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.True, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3908,8 +3908,8 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.True, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Cond, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.True, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3922,7 +3922,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3940,7 +3940,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -3953,7 +3953,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -3966,7 +3966,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -3979,7 +3979,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -3992,7 +3992,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4005,7 +4005,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4018,7 +4018,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Cast, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4046,7 +4046,7 @@ expr_without_variable:
                 }
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4058,7 +4058,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4076,7 +4076,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4088,7 +4088,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4100,7 +4100,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4112,7 +4112,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4124,8 +4124,8 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4137,7 +4137,7 @@ expr_without_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4163,7 +4163,7 @@ expr_without_variable:
 
                 // save comments
                 yylex.(*Parser).setFreeFloating($$, token.Static, $$.GetNode().Tokens[token.Start]); delete($$.GetNode().Tokens, token.Start)
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens);
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden);
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4178,19 +4178,19 @@ inline_function:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $11)
                 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 if $2 == nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Function, $4.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Function, $4.Hidden)
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Function, $2.Tokens)
-                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $4.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Function, $2.Hidden)
+                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $4.Hidden)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.ParameterList, $6.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.ParameterList, $6.Hidden)
                 if $8 != nil {
                     yylex.(*Parser).setFreeFloating($$, token.LexicalVars, $8.GetNode().Tokens[token.Colon]); delete($8.GetNode().Tokens, token.Colon)
                 }
-                yylex.(*Parser).setFreeFloating($$, token.ReturnType, $9.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Stmts, $11.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.ReturnType, $9.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Stmts, $11.Hidden)
 
                 // normalize
                 if $8 == nil {
@@ -4210,18 +4210,18 @@ inline_function:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $9)
                 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 if $2 == nil {
-                    yylex.(*Parser).setFreeFloating($$, token.Function, $3.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Function, $3.Hidden)
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.Function, $2.Tokens)
-                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.Function, $2.Hidden)
+                    yylex.(*Parser).setFreeFloating($$, token.Ampersand, $3.Hidden)
                 };
-                yylex.(*Parser).setFreeFloating($$, token.ParameterList, $5.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.ParameterList, $5.Hidden)
                 if $6 != nil {
                     yylex.(*Parser).setFreeFloating($$, token.Params, $6.GetNode().Tokens[token.Colon]); delete($6.GetNode().Tokens, token.Colon)
                 };
-                yylex.(*Parser).setFreeFloating($$, token.ReturnType, $8.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.ReturnType, $8.Hidden)
 
                 // normalize
                 if $6 == nil {
@@ -4268,9 +4268,9 @@ lexical_vars:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Use, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.LexicalVarList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Use, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.LexicalVarList, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4282,7 +4282,7 @@ lexical_var_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4305,7 +4305,7 @@ lexical_var:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).addDollarToken($$)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4322,8 +4322,8 @@ lexical_var:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(variable, token.Start, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(variable, token.Start, $2.Hidden)
                 yylex.(*Parser).addDollarToken(variable)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4352,7 +4352,7 @@ function_call:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4365,7 +4365,7 @@ function_call:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4392,7 +4392,7 @@ class_name:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4434,8 +4434,8 @@ exit_expr:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Exit, append($1.Tokens, yylex.(*Parser).GetFreeFloatingToken($1)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...))
+                yylex.(*Parser).setFreeFloating($$, token.Exit, append($1.Hidden, yylex.(*Parser).GetFreeFloatingToken($1)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4490,9 +4490,9 @@ dereferencable_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Array, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Array, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4504,8 +4504,8 @@ dereferencable_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.ArrayPairList, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4517,7 +4517,7 @@ dereferencable_scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4532,7 +4532,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4544,7 +4544,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4556,7 +4556,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4568,7 +4568,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4580,7 +4580,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4592,7 +4592,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4604,7 +4604,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4616,7 +4616,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4628,7 +4628,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4640,7 +4640,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4654,7 +4654,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4666,7 +4666,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4678,7 +4678,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4690,7 +4690,7 @@ scalar:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4732,8 +4732,8 @@ constant:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(target, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(target, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4748,8 +4748,8 @@ constant:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(target, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(target, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4806,8 +4806,8 @@ dereferencable:
                 $$ = $2;
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...))
-                yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...)...))
+                yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...))
+                yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4831,8 +4831,8 @@ callable_expr:
                 $$ = $2;
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...))
-                yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...)...))
+                yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...))
+                yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4860,8 +4860,8 @@ callable_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4874,8 +4874,8 @@ callable_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4888,8 +4888,8 @@ callable_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4902,7 +4902,7 @@ callable_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4936,7 +4936,7 @@ variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4953,7 +4953,7 @@ simple_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).addDollarToken($$)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4966,10 +4966,10 @@ simple_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Dollar, yylex.(*Parser).GetFreeFloatingToken($1))
-                yylex.(*Parser).setFreeFloating($3, token.Start, append($2.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($2), $3.GetNode().Tokens[token.Start]...)...))
-                yylex.(*Parser).setFreeFloating($3, token.End, append($3.GetNode().Tokens[token.End], append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...)...))
+                yylex.(*Parser).setFreeFloating($3, token.Start, append($2.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($2), $3.GetNode().Tokens[token.Start]...)...))
+                yylex.(*Parser).setFreeFloating($3, token.End, append($3.GetNode().Tokens[token.End], append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -4981,7 +4981,7 @@ simple_variable:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).setFreeFloating($$, token.Dollar, yylex.(*Parser).GetFreeFloatingToken($1))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -4998,7 +4998,7 @@ static_member:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5011,7 +5011,7 @@ static_member:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Name, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5033,8 +5033,8 @@ new_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5047,8 +5047,8 @@ new_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5061,7 +5061,7 @@ new_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5074,7 +5074,7 @@ new_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5087,7 +5087,7 @@ new_variable:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5102,7 +5102,7 @@ member_name:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5111,8 +5111,8 @@ member_name:
                 $$ = $2;
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...))
-                yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...)...))
+                yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...))
+                yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5133,7 +5133,7 @@ property_name:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5142,8 +5142,8 @@ property_name:
                 $$ = $2;
                 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...))
-                yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...)...))
+                yylex.(*Parser).setFreeFloating($$, token.Start, append($1.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($1), $$.GetNode().Tokens[token.Start]...)...))
+                yylex.(*Parser).setFreeFloating($$, token.End, append($$.GetNode().Tokens[token.End], append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5189,7 +5189,7 @@ non_empty_array_pair_list:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5215,7 +5215,7 @@ array_pair:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5242,8 +5242,8 @@ array_pair:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(reference, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(reference, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5257,7 +5257,7 @@ array_pair:
                 reference.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5269,7 +5269,7 @@ array_pair:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5285,10 +5285,10 @@ array_pair:
 
                 // save comments
                 yylex.(*Parser).MoveFreeFloating($1, $$)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(listNode, token.Start, $3.Tokens)
-                yylex.(*Parser).setFreeFloating(listNode, token.List, $4.Tokens)
-                yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $6.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(listNode, token.Start, $3.Hidden)
+                yylex.(*Parser).setFreeFloating(listNode, token.List, $4.Hidden)
+                yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $6.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5303,9 +5303,9 @@ array_pair:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
                 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating(listNode, token.List, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating(listNode, token.List, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(listNode, token.ArrayPairList, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5327,7 +5327,7 @@ encaps_list:
                 encapsed.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(encapsed, token.Start, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(encapsed, token.Start, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5346,7 +5346,7 @@ encaps_list:
                 encapsed.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(encapsed, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating(encapsed, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5363,7 +5363,7 @@ encaps_var:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).addDollarToken($$)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -5381,8 +5381,8 @@ encaps_var:
 
                 // save comments
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Tokens, yylex.(*Parser).GetFreeFloatingToken($2)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Tokens, yylex.(*Parser).GetFreeFloatingToken($4)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($2.Hidden, yylex.(*Parser).GetFreeFloatingToken($2)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($4.Hidden, yylex.(*Parser).GetFreeFloatingToken($4)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5401,8 +5401,8 @@ encaps_var:
 
                 // save comments
                 yylex.(*Parser).addDollarToken(variable)
-                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Tokens)
-                yylex.(*Parser).setFreeFloating(fetch, token.Start, $3.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Var, $2.Hidden)
+                yylex.(*Parser).setFreeFloating(fetch, token.Start, $3.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5417,7 +5417,7 @@ encaps_var:
 
                 // save comments
                 yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1))
-                yylex.(*Parser).setFreeFloating($$, token.End, append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...))
+                yylex.(*Parser).setFreeFloating($$, token.End, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5434,7 +5434,7 @@ encaps_var:
 
                 // save comments
                 yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1))
-                yylex.(*Parser).setFreeFloating($$, token.End, append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...))
+                yylex.(*Parser).setFreeFloating($$, token.End, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5451,9 +5451,9 @@ encaps_var:
 
                 // save comments
                 yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1))
-                yylex.(*Parser).setFreeFloating($$, token.Var, append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...))
-                yylex.(*Parser).setFreeFloating($$, token.Expr, append($5.Tokens, yylex.(*Parser).GetFreeFloatingToken($5)...))
-                yylex.(*Parser).setFreeFloating($$, token.End, append($6.Tokens, yylex.(*Parser).GetFreeFloatingToken($6)...))
+                yylex.(*Parser).setFreeFloating($$, token.Var, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...))
+                yylex.(*Parser).setFreeFloating($$, token.Expr, append($5.Hidden, yylex.(*Parser).GetFreeFloatingToken($5)...))
+                yylex.(*Parser).setFreeFloating($$, token.End, append($6.Hidden, yylex.(*Parser).GetFreeFloatingToken($6)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5463,7 +5463,7 @@ encaps_var:
 
                 // save comments
                 yylex.(*Parser).setFreeFloating($$, token.Start, yylex.(*Parser).GetFreeFloatingToken($1))
-                yylex.(*Parser).setFreeFloating($$, token.End, append($3.Tokens, yylex.(*Parser).GetFreeFloatingToken($3)...))
+                yylex.(*Parser).setFreeFloating($$, token.End, append($3.Hidden, yylex.(*Parser).GetFreeFloatingToken($3)...))
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5478,7 +5478,7 @@ encaps_var_offset:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5495,7 +5495,7 @@ encaps_var_offset:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5521,7 +5521,7 @@ encaps_var_offset:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5535,7 +5535,7 @@ encaps_var_offset:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenPosition($1)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
                 yylex.(*Parser).addDollarToken($$)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -5551,12 +5551,12 @@ internal_functions_in_yacc:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $5)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Isset, $2.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Isset, $2.Hidden)
                 if $4 == nil {
-                    yylex.(*Parser).setFreeFloating($$, token.VarList, $5.Tokens)
+                    yylex.(*Parser).setFreeFloating($$, token.VarList, $5.Hidden)
                 } else {
-                    yylex.(*Parser).setFreeFloating($$, token.VarList, append($4.Tokens, append(yylex.(*Parser).GetFreeFloatingToken($4), $5.Tokens...)...))
+                    yylex.(*Parser).setFreeFloating($$, token.VarList, append($4.Hidden, append(yylex.(*Parser).GetFreeFloatingToken($4), $5.Hidden...)...))
                 }
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -5569,9 +5569,9 @@ internal_functions_in_yacc:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Empty, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Empty, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5583,7 +5583,7 @@ internal_functions_in_yacc:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5595,7 +5595,7 @@ internal_functions_in_yacc:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5607,9 +5607,9 @@ internal_functions_in_yacc:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Eval, $2.Tokens)
-                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Eval, $2.Hidden)
+                yylex.(*Parser).setFreeFloating($$, token.Expr, $4.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5621,7 +5621,7 @@ internal_functions_in_yacc:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5633,7 +5633,7 @@ internal_functions_in_yacc:
                 $$.GetNode().Position = yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Tokens)
+                yylex.(*Parser).setFreeFloating($$, token.Start, $1.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -5651,7 +5651,7 @@ isset_variables:
                 $$ = append($1, $3)
 
                 // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Tokens)
+                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.Hidden)
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
diff --git a/internal/scanner/lexer.go b/internal/scanner/lexer.go
index 9dad9d0..2a24948 100644
--- a/internal/scanner/lexer.go
+++ b/internal/scanner/lexer.go
@@ -16,8 +16,8 @@ type Scanner interface {
 	GetPhpDocComment() string
 	SetPhpDocComment(string)
 	GetErrors() []*errors.Error
-	GetWithFreeFloating() bool
-	SetWithTokens(bool)
+	GetWithHiddenTokens() bool
+	SetWithHiddenTokens(bool)
 	AddError(e *errors.Error)
 	SetErrors(e []*errors.Error)
 }
@@ -35,14 +35,14 @@ type Lexer struct {
 	top          int
 	heredocLabel []byte
 
-	TokenPool     *TokenPool
-	Tokens        []token.Token
-	WithTokens    bool
-	PhpDocComment string
-	lastToken     *Token
-	Errors        []*errors.Error
-	NewLines      NewLines
-	PHPVersion    string
+	TokenPool        *TokenPool
+	HiddenTokens     []token.Token
+	WithHiddenTokens bool
+	PhpDocComment    string
+	lastToken        *Token
+	Errors           []*errors.Error
+	NewLines         NewLines
+	PHPVersion       string
 }
 
 func (l *Lexer) ReturnTokenToPool(t *Token) {
@@ -61,12 +61,12 @@ func (l *Lexer) GetErrors() []*errors.Error {
 	return l.Errors
 }
 
-func (l *Lexer) GetWithFreeFloating() bool {
-	return l.WithTokens
+func (l *Lexer) GetWithHiddenTokens() bool {
+	return l.WithHiddenTokens
 }
 
-func (l *Lexer) SetWithTokens(b bool) {
-	l.WithTokens = b
+func (l *Lexer) SetWithHiddenTokens(b bool) {
+	l.WithHiddenTokens = b
 }
 
 func (l *Lexer) AddError(e *errors.Error) {
@@ -85,11 +85,11 @@ func (lex *Lexer) setTokenPosition(token *Token) {
 }
 
 func (lex *Lexer) addToken(id TokenID, ps, pe int) {
-	if !lex.WithTokens {
+	if !lex.WithHiddenTokens {
 		return
 	}
 
-	lex.Tokens = append(lex.Tokens, token.Token{
+	lex.HiddenTokens = append(lex.HiddenTokens, token.Token{
 		ID:    token.ID(id),
 		Value: lex.data[ps:pe],
 	})
diff --git a/internal/scanner/scanner.go b/internal/scanner/scanner.go
index 0d411e1ec8e4ad8d6a07dc73564650959747d838..b1cf6d357285c1e1260ae109c2ebb4338a5edf21 100644
GIT binary patch
delta 87
zcmcb#PyG5m@eOjUY#x~@DXDpr<yeDxAWQ{Yg}lt1<`&lW7FI?eW&&bnAZFR#!pa(b
WQy8u)C$&Nks=JO=emeJkR(Aj%dmRb@

delta 76
zcmcb<PyEt8@eOjUlT}!Qc|-EEQ}c=yY!z}+EA*y+yvHivJcqS?4l5%NGXXI(5VLHb
M!^-M(6H{#(05w1x!2kdN

diff --git a/internal/scanner/scanner.rl b/internal/scanner/scanner.rl
index d9195f2..3379bef 100644
--- a/internal/scanner/scanner.rl
+++ b/internal/scanner/scanner.rl
@@ -28,12 +28,12 @@ func NewLexer(data []byte) *Lexer {
 }
 
 func (lex *Lexer) Lex(lval Lval) int {
-    lex.Tokens = nil
+    lex.HiddenTokens = nil
     eof := lex.pe
     var tok TokenID
 
     token := lex.TokenPool.Get()
-    token.Tokens = lex.Tokens
+    token.Hidden = nil
     token.Value = lex.data[0:0]
 
     lblStart := 0
@@ -508,7 +508,7 @@ func (lex *Lexer) Lex(lval Lval) int {
         write exec;
     }%%
 
-    token.Tokens = lex.Tokens
+    token.Hidden = lex.HiddenTokens
 	token.Value = lex.data[lex.ts:lex.te]
 	token.ID = tok
 
diff --git a/internal/scanner/scanner_test.go b/internal/scanner/scanner_test.go
index 71822c4..fecea9d 100644
--- a/internal/scanner/scanner_test.go
+++ b/internal/scanner/scanner_test.go
@@ -360,7 +360,7 @@ func TestTokens(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 	actual := []string{}
 
@@ -389,14 +389,14 @@ func TestShebang(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 	actual := []string{}
 
 	token := lexer.Lex(lv)
 	assert.Equal(t, token, int(T_DNUMBER))
 
-	for _, tt := range lv.Tkn.Tokens {
+	for _, tt := range lv.Tkn.Hidden {
 		actual = append(actual, string(tt.Value))
 	}
 
@@ -410,12 +410,12 @@ func TestShebangHtml(t *testing.T) {
 `
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 
 	token := lexer.Lex(lv)
 	assert.Equal(t, token, int(T_INLINE_HTML))
-	assert.Equal(t, string(lv.Tkn.Tokens[0].Value), "#!/usr/bin/env php\n")
+	assert.Equal(t, string(lv.Tkn.Hidden[0].Value), "#!/usr/bin/env php\n")
 
 	token = lexer.Lex(lv)
 	assert.Equal(t, token, int(T_DNUMBER))
@@ -461,7 +461,7 @@ func TestNumberTokens(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 	actual := []string{}
 
@@ -519,7 +519,7 @@ func TestConstantStrings(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 	actual := []string{}
 
@@ -655,7 +655,7 @@ func TestTeplateStringTokens(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 	actual := []string{}
 
@@ -741,7 +741,7 @@ func TestBackquoteStringTokens(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 	actual := []string{}
 
@@ -836,7 +836,7 @@ CAT;
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 	actual := []string{}
 
@@ -910,7 +910,7 @@ CAT
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 	actual := []string{}
 
@@ -950,7 +950,7 @@ CAT;
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 	actual := []string{}
 
@@ -982,7 +982,7 @@ func TestHereDocTokens73(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 	actual := []string{}
 
@@ -1014,7 +1014,7 @@ CAT;`
 
 	lexer := NewLexer([]byte(src))
 	lexer.PHPVersion = "7.2"
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 	actual := []string{}
 
@@ -1047,7 +1047,7 @@ func TestInlineHtmlNopTokens(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 	actual := []string{}
 
@@ -1155,12 +1155,12 @@ func TestCommentEnd(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 
 	lexer.Lex(lv)
 
-	actual := lexer.Tokens
+	actual := lexer.HiddenTokens
 
 	assert.DeepEqual(t, expected, actual)
 }
@@ -1185,12 +1185,12 @@ func TestCommentNewLine(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 
 	lexer.Lex(lv)
 
-	actual := lv.Tkn.Tokens
+	actual := lv.Tkn.Hidden
 
 	assert.DeepEqual(t, expected, actual)
 }
@@ -1215,12 +1215,12 @@ func TestCommentNewLine1(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 
 	lexer.Lex(lv)
 
-	actual := lv.Tkn.Tokens
+	actual := lv.Tkn.Hidden
 
 	assert.DeepEqual(t, expected, actual)
 }
@@ -1245,12 +1245,12 @@ func TestCommentNewLine2(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 
 	lexer.Lex(lv)
 
-	actual := lv.Tkn.Tokens
+	actual := lv.Tkn.Hidden
 
 	assert.DeepEqual(t, expected, actual)
 }
@@ -1276,12 +1276,12 @@ func TestCommentWithPhpEndTag(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 
 	lexer.Lex(lv)
 
-	actual := lv.Tkn.Tokens
+	actual := lv.Tkn.Hidden
 
 	assert.DeepEqual(t, expected, actual)
 }
@@ -1307,12 +1307,12 @@ func TestInlineComment(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 
 	lexer.Lex(lv)
 
-	actual := lv.Tkn.Tokens
+	actual := lv.Tkn.Hidden
 
 	assert.DeepEqual(t, expected, actual)
 }
@@ -1338,12 +1338,12 @@ func TestInlineComment2(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 
 	lexer.Lex(lv)
 
-	actual := lexer.Tokens
+	actual := lexer.HiddenTokens
 
 	assert.DeepEqual(t, expected, actual)
 }
@@ -1373,12 +1373,12 @@ func TestEmptyInlineComment(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 
 	lexer.Lex(lv)
 
-	actual := lexer.Tokens
+	actual := lexer.HiddenTokens
 
 	assert.DeepEqual(t, expected, actual)
 }
@@ -1404,12 +1404,12 @@ func TestEmptyInlineComment2(t *testing.T) {
 	}
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 
 	lexer.Lex(lv)
 
-	actual := lv.Tkn.Tokens
+	actual := lv.Tkn.Hidden
 
 	assert.DeepEqual(t, expected, actual)
 }
@@ -1419,7 +1419,7 @@ func TestMethodCallTokens(t *testing.T) {
 	$a -> bar ( '' ) ;`
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 
 	expected := []token.Token{
@@ -1433,7 +1433,7 @@ func TestMethodCallTokens(t *testing.T) {
 		},
 	}
 	lexer.Lex(lv)
-	actual := lv.Tkn.Tokens
+	actual := lv.Tkn.Hidden
 	assert.DeepEqual(t, expected, actual)
 
 	expected = []token.Token{
@@ -1443,7 +1443,7 @@ func TestMethodCallTokens(t *testing.T) {
 		},
 	}
 	lexer.Lex(lv)
-	actual = lv.Tkn.Tokens
+	actual = lv.Tkn.Hidden
 	assert.DeepEqual(t, expected, actual)
 
 	expected = []token.Token{
@@ -1453,7 +1453,7 @@ func TestMethodCallTokens(t *testing.T) {
 		},
 	}
 	lexer.Lex(lv)
-	actual = lv.Tkn.Tokens
+	actual = lv.Tkn.Hidden
 	assert.DeepEqual(t, expected, actual)
 
 	expected = []token.Token{
@@ -1463,7 +1463,7 @@ func TestMethodCallTokens(t *testing.T) {
 		},
 	}
 	lexer.Lex(lv)
-	actual = lv.Tkn.Tokens
+	actual = lv.Tkn.Hidden
 	assert.DeepEqual(t, expected, actual)
 
 	expected = []token.Token{
@@ -1473,7 +1473,7 @@ func TestMethodCallTokens(t *testing.T) {
 		},
 	}
 	lexer.Lex(lv)
-	actual = lv.Tkn.Tokens
+	actual = lv.Tkn.Hidden
 	assert.DeepEqual(t, expected, actual)
 
 	expected = []token.Token{
@@ -1483,7 +1483,7 @@ func TestMethodCallTokens(t *testing.T) {
 		},
 	}
 	lexer.Lex(lv)
-	actual = lv.Tkn.Tokens
+	actual = lv.Tkn.Hidden
 	assert.DeepEqual(t, expected, actual)
 
 	expected = []token.Token{
@@ -1493,7 +1493,7 @@ func TestMethodCallTokens(t *testing.T) {
 		},
 	}
 	lexer.Lex(lv)
-	actual = lv.Tkn.Tokens
+	actual = lv.Tkn.Hidden
 	assert.DeepEqual(t, expected, actual)
 }
 
@@ -1502,7 +1502,7 @@ func TestYieldFromTokens(t *testing.T) {
 	yield from $a`
 
 	lexer := NewLexer([]byte(src))
-	lexer.WithTokens = true
+	lexer.WithHiddenTokens = true
 	lv := &lval{}
 
 	expected := []token.Token{
@@ -1516,7 +1516,7 @@ func TestYieldFromTokens(t *testing.T) {
 		},
 	}
 	lexer.Lex(lv)
-	actual := lv.Tkn.Tokens
+	actual := lv.Tkn.Hidden
 	assert.DeepEqual(t, expected, actual)
 
 	expected = []token.Token{
@@ -1526,7 +1526,7 @@ func TestYieldFromTokens(t *testing.T) {
 		},
 	}
 	lexer.Lex(lv)
-	actual = lv.Tkn.Tokens
+	actual = lv.Tkn.Hidden
 	assert.DeepEqual(t, expected, actual)
 }
 
diff --git a/internal/scanner/token.go b/internal/scanner/token.go
index 793958c..b46b340 100644
--- a/internal/scanner/token.go
+++ b/internal/scanner/token.go
@@ -9,6 +9,6 @@ import (
 type Token struct {
 	ID       TokenID
 	Value    []byte
-	Tokens   []token.Token
+	Hidden   []token.Token
 	Position position.Position
 }