From 8b4d65ac4d55b2b71cede0a4b3d42f4ad21aaeaf Mon Sep 17 00:00:00 2001
From: Vadym Slizov <vadym.slizov@miacar.ch>
Date: Mon, 14 Sep 2020 16:36:01 +0300
Subject: [PATCH] [refactoring] update ast structure of "InlinHtml" node

---
 internal/php5/php5.go            | Bin 291345 -> 291269 bytes
 internal/php5/php5.y             |  14 +++++++-------
 internal/php7/php7.go            | Bin 243865 -> 243789 bytes
 internal/php7/php7.y             |  14 +++++++-------
 pkg/ast/node.go                  |   3 ++-
 pkg/ast/visitor/filter_tokens.go |   4 ++++
 pkg/printer/printer.go           |   9 ++-------
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/internal/php5/php5.go b/internal/php5/php5.go
index 5392ff0446928a6a8795c72598e5956f085ce441..e87357e92158cf68c2af31449675a699e984a979 100644
GIT binary patch
delta 88
zcmbREMDXZi!G<l2Tusv_SumPT517U%JzdX`iEVnl9wR%KXI@TbUaCh)ZqD?2MMjzF
rGRlnn)3b{iIj8#<GjdFCNM&MU)8XRe<g9IHZDs^wrtPfF%slS_{PY@1

delta 40
vcmX^5Sa9MK!G<l2Tusv_KV*`aZeYgDJG~%{`C<E!CPpA;+J2;onejaUVki+2

diff --git a/internal/php5/php5.y b/internal/php5/php5.y
index 343df17..fb42de1 100644
--- a/internal/php5/php5.y
+++ b/internal/php5/php5.y
@@ -1062,13 +1062,13 @@ unticked_statement:
             }
     |   T_INLINE_HTML
             {
-                $$ = &ast.StmtInlineHtml{ast.Node{}, $1.Value}
-
-                // save position
-                $$.GetNode().Position = position.NewTokenPosition($1)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
+                $$ = &ast.StmtInlineHtml{
+                    Node: ast.Node{
+                        Position: position.NewTokenPosition($1),
+                    },
+                    InlineHtmlTkn: $1,
+                    Value:         $1.Value,
+                }
             }
     |   expr ';'
             {
diff --git a/internal/php7/php7.go b/internal/php7/php7.go
index 4734582a7493eaa72f99118a4072352d22ff6208..ab2cdc4804ea1b62e7cb13ebc9aca4774b4938bb 100644
GIT binary patch
delta 87
zcmbRFk?-sWzJ@J~A1kISIWn3~Z;)h?o*tjX#5VoB2NOG&XI@TbUaCh)ZqD?F28=S(
rqjVYhr%M+ya!yaU$;dH1;UyD0D;FmxXKnkNN=6`N+Ww}Jd957)bW9%t

delta 35
qcmX^6fp6wVzJ@J~A1kH{^D|3KPcUG9*S@-v5r~<#udZZXWCs8o+Ybc*

diff --git a/internal/php7/php7.y b/internal/php7/php7.y
index 6f37de7..613408f 100644
--- a/internal/php7/php7.y
+++ b/internal/php7/php7.y
@@ -976,13 +976,13 @@ statement:
             }
     |   T_INLINE_HTML
             {
-                $$ = &ast.StmtInlineHtml{ast.Node{}, $1.Value}
-
-                // save position
-                $$.GetNode().Position = position.NewTokenPosition($1)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
+                $$ = &ast.StmtInlineHtml{
+                    Node: ast.Node{
+                        Position: position.NewTokenPosition($1),
+                    },
+                    InlineHtmlTkn: $1,
+                    Value:         $1.Value,
+                }
             }
     |   expr ';'
             {
diff --git a/pkg/ast/node.go b/pkg/ast/node.go
index 16aa214..e83b438 100644
--- a/pkg/ast/node.go
+++ b/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) {
diff --git a/pkg/ast/visitor/filter_tokens.go b/pkg/ast/visitor/filter_tokens.go
index ef9f1b3..f3c440e 100644
--- a/pkg/ast/visitor/filter_tokens.go
+++ b/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
+}
diff --git a/pkg/printer/printer.go b/pkg/printer/printer.go
index 20df694..b35840d 100644
--- a/pkg/printer/printer.go
+++ b/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) {
-	nn := n.(*ast.StmtInlineHtml)
-	p.printFreeFloating(nn, token.Start)
-
+func (p *Printer) printStmtInlineHTML(n *ast.StmtInlineHtml) {
 	if p.s == PhpState && !bytes.Contains(p.lastWrite, []byte("?>")) {
 		p.write([]byte("?>"))
 	}
 	p.SetState(HtmlState)
 
-	p.write(nn.Value)
-
-	p.printFreeFloating(nn, token.End)
+	p.printToken(n.InlineHtmlTkn, string(n.Value))
 }
 
 func (p *Printer) printStmtInterface(n ast.Vertex) {