[refactoring] update ast structure of "InlinHtml" node

internal/php5/php5.y

@@ -1062,13 +1062,13 @@ unticked_statement:
             }
     |   T_INLINE_HTML
             {
-                $$ = &ast.StmtInlineHtml{ast.Node{}, $1.Value}
+                $$ = &ast.StmtInlineHtml{
-
+                    Node: ast.Node{
-                // save position
+                        Position: position.NewTokenPosition($1),
-                $$.GetNode().Position = position.NewTokenPosition($1)
+                    },
-
+                    InlineHtmlTkn: $1,
-                // save comments
+                    Value:         $1.Value,
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
+                }
             }
     |   expr ';'
             {

internal/php7/php7.y

@@ -976,13 +976,13 @@ statement:
             }
     |   T_INLINE_HTML
             {
-                $$ = &ast.StmtInlineHtml{ast.Node{}, $1.Value}
+                $$ = &ast.StmtInlineHtml{
-
+                    Node: ast.Node{
-                // save position
+                        Position: position.NewTokenPosition($1),
-                $$.GetNode().Position = position.NewTokenPosition($1)
+                    },
-
+                    InlineHtmlTkn: $1,
-                // save comments
+                    Value:         $1.Value,
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
+                }
             }
     |   expr ';'
             {

pkg/ast/node.go

@@ -535,7 +535,8 @@ func (n *StmtIf) Accept(v NodeVisitor) {
 // StmtInlineHtml node
 type StmtInlineHtml struct {
 	Node
-	Value []byte
+	InlineHtmlTkn *token.Token
+	Value         []byte
 }
 
 func (n *StmtInlineHtml) Accept(v NodeVisitor) {

pkg/ast/visitor/filter_tokens.go

@@ -200,3 +200,7 @@ func (v *FilterTokens) StmtEcho(n *ast.StmtEcho) {
 	n.SeparatorTkns = nil
 	n.SemiColonTkn = nil
 }
+
+func (v *FilterTokens) StmtInlineHtml(n *ast.StmtInlineHtml) {
+	n.InlineHtmlTkn = nil
+}

pkg/printer/printer.go

@@ -2555,18 +2555,13 @@ func (p *Printer) printStmtAltIf(n *ast.StmtIf) {
 	p.printToken(n.SemiColonTkn, ";")
 }
 
-func (p *Printer) printStmtInlineHTML(n ast.Vertex) {
+func (p *Printer) printStmtInlineHTML(n *ast.StmtInlineHtml) {
-	nn := n.(*ast.StmtInlineHtml)
-	p.printFreeFloating(nn, token.Start)
-
 	if p.s == PhpState && !bytes.Contains(p.lastWrite, []byte("?>")) {
 		p.write([]byte("?>"))
 	}
 	p.SetState(HtmlState)
 
-	p.write(nn.Value)
+	p.printToken(n.InlineHtmlTkn, string(n.Value))
-
-	p.printFreeFloating(nn, token.End)
 }
 
 func (p *Printer) printStmtInterface(n ast.Vertex) {