From 94897d8c6682ad30f43eb09db680b73ab0526bf5 Mon Sep 17 00:00:00 2001
From: Vadym Slizov <z7zmey@gmail.com>
Date: Fri, 4 Dec 2020 13:10:12 +0200
Subject: [PATCH] [refactoring] remove *FreeFloating* functions

---
 internal/php5/parser.go | 109 ----------------------------------------
 internal/php5/php5.go   | Bin 265977 -> 262882 bytes
 internal/php5/php5.y    |  34 -------------
 internal/php7/parser.go | 109 ----------------------------------------
 internal/php7/php7.go   | Bin 219796 -> 218067 bytes
 internal/php7/php7.y    |  14 ------
 6 files changed, 266 deletions(-)

diff --git a/internal/php5/parser.go b/internal/php5/parser.go
index 5b06343..ee75429 100644
--- a/internal/php5/parser.go
+++ b/internal/php5/parser.go
@@ -1,8 +1,6 @@
 package php5
 
 import (
-	"bytes"
-
 	"github.com/z7zmey/php-parser/internal/scanner"
 	"github.com/z7zmey/php-parser/pkg/ast"
 	"github.com/z7zmey/php-parser/pkg/errors"
@@ -62,110 +60,3 @@ func lastNode(nn []ast.Vertex) ast.Vertex {
 	}
 	return nn[len(nn)-1]
 }
-
-func (p *Parser) MoveFreeFloating(src ast.Vertex, dst ast.Vertex) {
-	if _, ok := src.GetNode().Tokens[token.Start]; !ok {
-		return
-	}
-
-	if src.GetNode().Tokens == nil {
-		return
-	}
-
-	dstCollection := &dst.GetNode().Tokens
-	if *dstCollection == nil {
-		*dstCollection = make(token.Collection)
-	}
-
-	(*dstCollection)[token.Start] = src.GetNode().Tokens[token.Start]
-	delete(src.GetNode().Tokens, token.Start)
-}
-
-func (p *Parser) setFreeFloating(dst ast.Vertex, pos token.Position, tokens []*token.Token) {
-	if len(tokens) == 0 {
-		return
-	}
-
-	dstCollection := &dst.GetNode().Tokens
-	if *dstCollection == nil {
-		*dstCollection = make(token.Collection)
-	}
-
-	l := len(tokens)
-	for _, v := range tokens[0 : l-1] {
-		(*dstCollection)[pos] = append((*dstCollection)[pos], v)
-	}
-}
-
-func (p *Parser) setFreeFloatingTokens(dst ast.Vertex, pos token.Position, tokens []*token.Token) {
-	if len(tokens) == 0 {
-		return
-	}
-
-	dstCollection := &dst.GetNode().Tokens
-	if *dstCollection == nil {
-		*dstCollection = make(token.Collection)
-	}
-
-	(*dstCollection)[pos] = make([]*token.Token, 0)
-
-	for _, v := range tokens {
-		(*dstCollection)[pos] = append((*dstCollection)[pos], v)
-	}
-}
-
-func (p *Parser) setToken(dst ast.Vertex, pos token.Position, tokens []*token.Token) {
-	if len(tokens) == 0 {
-		return
-	}
-
-	dstCollection := &dst.GetNode().Tokens
-	if *dstCollection == nil {
-		*dstCollection = make(token.Collection)
-	}
-
-	l := len(tokens)
-	(*dstCollection)[pos] = append((*dstCollection)[pos], tokens[l-1])
-}
-
-func (p *Parser) splitSemiColonAndPhpCloseTag(htmlNode ast.Vertex, prevNode ast.Vertex) {
-	if _, ok := prevNode.GetNode().Tokens[token.SemiColon]; !ok {
-		return
-	}
-
-	semiColon := prevNode.GetNode().Tokens[token.SemiColon]
-	delete(prevNode.GetNode().Tokens, token.SemiColon)
-	if len(semiColon) == 0 {
-		return
-	}
-
-	if semiColon[0].Value[0] == ';' {
-		p.setFreeFloatingTokens(prevNode, token.SemiColon, []*token.Token{
-			{
-				ID:    token.ID(';'),
-				Value: semiColon[0].Value[0:1],
-			},
-		})
-	}
-
-	vlen := len(semiColon[0].Value)
-	tlen := 2
-	if bytes.HasSuffix(semiColon[0].Value, []byte("?>\n")) {
-		tlen = 3
-	}
-
-	phpCloseTag := []*token.Token{}
-	if vlen-tlen > 1 {
-		phpCloseTag = append(phpCloseTag, &token.Token{
-			ID:    token.T_WHITESPACE,
-			Value: semiColon[0].Value[1 : vlen-tlen],
-		})
-	}
-
-	phpCloseTag = append(phpCloseTag, &token.Token{
-		ID:    T_CLOSE_TAG,
-		Value: semiColon[0].Value[vlen-tlen:],
-	})
-
-	p.setFreeFloatingTokens(htmlNode, token.Start, append(phpCloseTag, htmlNode.GetNode().Tokens[token.Start]...))
-}
diff --git a/internal/php5/php5.go b/internal/php5/php5.go
index 626fc16ccbf360ff1988ca8972dc6a6a12f02b40..bff63f66f0d496776932345fd98e5ebfcf1777ac 100644
GIT binary patch
delta 9661
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

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

diff --git a/internal/php5/php5.y b/internal/php5/php5.y
index 48045f0..2a24915 100644
--- a/internal/php5/php5.y
+++ b/internal/php5/php5.y
@@ -280,11 +280,6 @@ start:
 top_statement_list:
         top_statement_list top_statement
             {
-                if inlineHtmlNode, ok := $2.(*ast.StmtInlineHtml); ok && len($1) > 0 {
-                    prevNode := lastNode($1)
-                    yylex.(*Parser).splitSemiColonAndPhpCloseTag(inlineHtmlNode, prevNode)
-                }
-
                 if $2 != nil {
                     $$ = append($1, $2)
                 }
@@ -744,8 +739,6 @@ constant_declaration:
                 })
 
                 $$ = $1
-
-                yylex.(*Parser).setFreeFloating(lastNode($$.(*ast.StmtConstList).Consts).(*ast.StmtConstant).Name, token.Start, $3.SkippedTokens)
             }
     |   T_CONST T_STRING '=' static_scalar
             {
@@ -771,19 +764,12 @@ constant_declaration:
                         },
                     },
                 }
-
-                yylex.(*Parser).setFreeFloating(lastNode($$.(*ast.StmtConstList).Consts).(*ast.StmtConstant).Name, token.Start, $2.SkippedTokens)
             }
 ;
 
 inner_statement_list:
         inner_statement_list inner_statement
             {
-                if inlineHtmlNode, ok := $2.(*ast.StmtInlineHtml); ok && len($1) > 0 {
-                    prevNode := lastNode($1)
-                    yylex.(*Parser).splitSemiColonAndPhpCloseTag(inlineHtmlNode, prevNode)
-                }
-
                 if $2 != nil {
                     $$ = append($1, $2)
                 }
@@ -1752,8 +1738,6 @@ declare_list:
                         },
                     },
                 }
-
-                yylex.(*Parser).setFreeFloating(lastNode($$.(*ast.ParserSeparatedList).Items).(*ast.StmtConstant).Name, token.Start, $1.SkippedTokens)
             }
     |   declare_list ',' T_STRING '=' static_scalar
             {
@@ -1777,8 +1761,6 @@ declare_list:
                 )
 
                 $$ = $1
-
-                yylex.(*Parser).setFreeFloating(lastNode($$.(*ast.ParserSeparatedList).Items).(*ast.StmtConstant).Name, token.Start, $3.SkippedTokens)
             }
 ;
 
@@ -2923,8 +2905,6 @@ class_constant_declaration:
                 })
 
                 $$ = $1
-
-                yylex.(*Parser).setFreeFloating(lastNode($$.(*ast.StmtClassConstList).Consts).(*ast.StmtConstant).Name, token.Start, $3.SkippedTokens)
             }
     |   T_CONST T_STRING '=' static_scalar
             {
@@ -2950,8 +2930,6 @@ class_constant_declaration:
                         },
                     },
                 }
-
-                yylex.(*Parser).setFreeFloating(lastNode($$.(*ast.StmtClassConstList).Consts).(*ast.StmtConstant).Name, token.Start, $2.SkippedTokens)
             }
 ;
 
@@ -3624,7 +3602,6 @@ expr_without_variable:
                     OpTkn: $2,
                     Right: $3,
                 }
-                yylex.(*Parser).setToken($$, token.Equal, $2.SkippedTokens)
             }
     |   expr '<' expr
             {
@@ -4416,13 +4393,11 @@ dynamic_class_name_reference:
                             nn.Var = $$
                             $$.GetNode().Position = position.NewNodesPosition($$, nn)
                             $$ = nn
-                            yylex.(*Parser).MoveFreeFloating(nn.Var, $$)
 
                         case *ast.ExprPropertyFetch:
                             nn.Var = $$
                             $$.GetNode().Position = position.NewNodesPosition($$, nn)
                             $$ = nn
-                            yylex.(*Parser).MoveFreeFloating(nn.Var, $$)
                     }
                 }
 
@@ -4432,13 +4407,11 @@ dynamic_class_name_reference:
                             nn.Var = $$
                             $$.GetNode().Position = position.NewNodesPosition($$, nn)
                             $$ = nn
-                            yylex.(*Parser).MoveFreeFloating(nn.Var, $$)
 
                         case *ast.ExprPropertyFetch:
                             nn.Var = $$
                             $$.GetNode().Position = position.NewNodesPosition($$, nn)
                             $$ = nn
-                            yylex.(*Parser).MoveFreeFloating(nn.Var, $$)
                     }
                 }
             }
@@ -5046,7 +5019,6 @@ static_operation:
                     OpTkn: $2,
                     Right: $3,
                 }
-                yylex.(*Parser).setToken($$, token.Equal, $2.SkippedTokens)
             }
     |   static_scalar_value '<' static_scalar_value
             {
@@ -6333,12 +6305,6 @@ encaps_var_offset:
                         Value:     $1.Value,
                     }
                 }
-
-                // save position
-                $$.GetNode().Position = position.NewTokenPosition($1)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
             }
     |   T_VARIABLE
             {
diff --git a/internal/php7/parser.go b/internal/php7/parser.go
index 32f3fa5..f49ecd8 100644
--- a/internal/php7/parser.go
+++ b/internal/php7/parser.go
@@ -1,8 +1,6 @@
 package php7
 
 import (
-	"bytes"
-
 	"github.com/z7zmey/php-parser/internal/scanner"
 	"github.com/z7zmey/php-parser/pkg/ast"
 	"github.com/z7zmey/php-parser/pkg/errors"
@@ -62,110 +60,3 @@ func lastNode(nn []ast.Vertex) ast.Vertex {
 	}
 	return nn[len(nn)-1]
 }
-
-func (p *Parser) MoveFreeFloating(src ast.Vertex, dst ast.Vertex) {
-	if _, ok := src.GetNode().Tokens[token.Start]; !ok {
-		return
-	}
-
-	if src.GetNode().Tokens == nil {
-		return
-	}
-
-	dstCollection := &dst.GetNode().Tokens
-	if *dstCollection == nil {
-		*dstCollection = make(token.Collection)
-	}
-
-	(*dstCollection)[token.Start] = src.GetNode().Tokens[token.Start]
-	delete(src.GetNode().Tokens, token.Start)
-}
-
-func (p *Parser) setFreeFloating(dst ast.Vertex, pos token.Position, tokens []*token.Token) {
-	if len(tokens) == 0 {
-		return
-	}
-
-	dstCollection := &dst.GetNode().Tokens
-	if *dstCollection == nil {
-		*dstCollection = make(token.Collection)
-	}
-
-	l := len(tokens)
-	for _, v := range tokens[0 : l-1] {
-		(*dstCollection)[pos] = append((*dstCollection)[pos], v)
-	}
-}
-
-func (p *Parser) setFreeFloatingTokens(dst ast.Vertex, pos token.Position, tokens []*token.Token) {
-	if len(tokens) == 0 {
-		return
-	}
-
-	dstCollection := &dst.GetNode().Tokens
-	if *dstCollection == nil {
-		*dstCollection = make(token.Collection)
-	}
-
-	(*dstCollection)[pos] = make([]*token.Token, 0)
-
-	for _, v := range tokens {
-		(*dstCollection)[pos] = append((*dstCollection)[pos], v)
-	}
-}
-
-func (p *Parser) setToken(dst ast.Vertex, pos token.Position, tokens []*token.Token) {
-	if len(tokens) == 0 {
-		return
-	}
-
-	dstCollection := &dst.GetNode().Tokens
-	if *dstCollection == nil {
-		*dstCollection = make(token.Collection)
-	}
-
-	l := len(tokens)
-	(*dstCollection)[pos] = append((*dstCollection)[pos], tokens[l-1])
-}
-
-func (p *Parser) splitSemiColonAndPhpCloseTag(htmlNode ast.Vertex, prevNode ast.Vertex) {
-	if _, ok := prevNode.GetNode().Tokens[token.SemiColon]; !ok {
-		return
-	}
-
-	semiColon := prevNode.GetNode().Tokens[token.SemiColon]
-	delete(prevNode.GetNode().Tokens, token.SemiColon)
-	if len(semiColon) == 0 {
-		return
-	}
-
-	if semiColon[0].Value[0] == ';' {
-		p.setFreeFloatingTokens(prevNode, token.SemiColon, []*token.Token{
-			{
-				ID:    token.ID(';'),
-				Value: semiColon[0].Value[0:1],
-			},
-		})
-	}
-
-	vlen := len(semiColon[0].Value)
-	tlen := 2
-	if bytes.HasSuffix(semiColon[0].Value, []byte("?>\n")) {
-		tlen = 3
-	}
-
-	phpCloseTag := []*token.Token{}
-	if vlen-tlen > 1 {
-		phpCloseTag = append(phpCloseTag, &token.Token{
-			ID:    token.T_WHITESPACE,
-			Value: semiColon[0].Value[1 : vlen-tlen],
-		})
-	}
-
-	phpCloseTag = append(phpCloseTag, &token.Token{
-		ID:    T_CLOSE_TAG,
-		Value: semiColon[0].Value[vlen-tlen:],
-	})
-
-	p.setFreeFloatingTokens(htmlNode, token.Start, append(phpCloseTag, htmlNode.GetNode().Tokens[token.Start]...))
-}
diff --git a/internal/php7/php7.go b/internal/php7/php7.go
index 35f39c1cc9ba8bda32d70573fa4134f23d812f32..c592f8c04798e7589fac0f7c8c8baddd64fe49ac 100644
GIT binary patch
delta 7212
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

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

diff --git a/internal/php7/php7.y b/internal/php7/php7.y
index 338a084..bb74f7b 100644
--- a/internal/php7/php7.y
+++ b/internal/php7/php7.y
@@ -329,11 +329,6 @@ identifier:
 top_statement_list:
         top_statement_list top_statement
             {
-                if inlineHtmlNode, ok := $2.(*ast.StmtInlineHtml); ok && len($1) > 0 {
-                    prevNode := lastNode($1)
-                    yylex.(*Parser).splitSemiColonAndPhpCloseTag(inlineHtmlNode, prevNode)
-                }
-
                 if $2 != nil {
                     $$ = append($1, $2)
                 }
@@ -796,11 +791,6 @@ const_list:
 inner_statement_list:
         inner_statement_list inner_statement
             {
-                if inlineHtmlNode, ok := $2.(*ast.StmtInlineHtml); ok && len($1) > 0 {
-                    prevNode := lastNode($1)
-                    yylex.(*Parser).splitSemiColonAndPhpCloseTag(inlineHtmlNode, prevNode)
-                }
-
                 if $2 != nil {
                     $$ = append($1, $2)
                 }
@@ -2633,8 +2623,6 @@ class_const_decl:
                     EqualTkn: $2,
                     Expr:     $3,
                 }
-
-                yylex.(*Parser).setFreeFloating($$.(*ast.StmtConstant).Name, token.Start, $1.SkippedTokens)
             }
 ;
 
@@ -2655,8 +2643,6 @@ const_decl:
                     EqualTkn: $2,
                     Expr:     $3,
                 }
-
-                yylex.(*Parser).setFreeFloating($$.(*ast.StmtConstant).Name, token.Start, $1.SkippedTokens)
             }
 ;