From 7995d41139f76b8459dd55a18670002b1a82445a Mon Sep 17 00:00:00 2001
From: z7zmey <z7zmey@gmail.com>
Date: Fri, 26 Oct 2018 12:11:37 +0300
Subject: [PATCH] replace meta.DecToken and meta.IncToken

---
 php5/php5.go            | 4 ++--
 php5/php5.y             | 4 ++--
 php7/php7.go            | 4 ++--
 php7/php7.y             | 4 ++--
 printer/printer.go      | 2 --
 printer/printer_test.go | 4 ++--
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/php5/php5.go b/php5/php5.go
index c2d8692..cb1d454 100644
--- a/php5/php5.go
+++ b/php5/php5.go
@@ -5843,7 +5843,7 @@ yydefault:
 			yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node))
 
 			// save comments
-			yyDollar[1].token.Meta.SetTokenName(meta.IncToken).AppendTo(yyVAL.node.GetMeta())
+			yyDollar[1].token.Meta.SetTokenName(meta.NodeStart).AppendTo(yyVAL.node.GetMeta())
 
 			yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
 		}
@@ -5871,7 +5871,7 @@ yydefault:
 			yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node))
 
 			// save comments
-			yyDollar[1].token.Meta.SetTokenName(meta.DecToken).AppendTo(yyVAL.node.GetMeta())
+			yyDollar[1].token.Meta.SetTokenName(meta.NodeStart).AppendTo(yyVAL.node.GetMeta())
 
 			yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
 		}
diff --git a/php5/php5.y b/php5/php5.y
index b92ea68..7bbfead 100644
--- a/php5/php5.y
+++ b/php5/php5.y
@@ -3580,7 +3580,7 @@ expr_without_variable:
                 $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2))
 
                 // save comments
-                $1.Meta.SetTokenName(meta.IncToken).AppendTo($$.GetMeta())
+                $1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta())
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3604,7 +3604,7 @@ expr_without_variable:
                 $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2))
 
                 // save comments
-                $1.Meta.SetTokenName(meta.DecToken).AppendTo($$.GetMeta())
+                $1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta())
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
diff --git a/php7/php7.go b/php7/php7.go
index aae19a2..d6824cd 100644
--- a/php7/php7.go
+++ b/php7/php7.go
@@ -5776,7 +5776,7 @@ yydefault:
 			yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node))
 
 			// save comments
-			yyDollar[1].token.Meta.SetTokenName(meta.IncToken).AppendTo(yyVAL.node.GetMeta())
+			yyDollar[1].token.Meta.SetTokenName(meta.NodeStart).AppendTo(yyVAL.node.GetMeta())
 
 			yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
 		}
@@ -5804,7 +5804,7 @@ yydefault:
 			yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node))
 
 			// save comments
-			yyDollar[1].token.Meta.SetTokenName(meta.DecToken).AppendTo(yyVAL.node.GetMeta())
+			yyDollar[1].token.Meta.SetTokenName(meta.NodeStart).AppendTo(yyVAL.node.GetMeta())
 
 			yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
 		}
diff --git a/php7/php7.y b/php7/php7.y
index 83f6fc6..40abcf3 100644
--- a/php7/php7.y
+++ b/php7/php7.y
@@ -3317,7 +3317,7 @@ expr_without_variable:
                 $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2))
 
                 // save comments
-                $1.Meta.SetTokenName(meta.IncToken).AppendTo($$.GetMeta())
+                $1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta())
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
@@ -3341,7 +3341,7 @@ expr_without_variable:
                 $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2))
 
                 // save comments
-                $1.Meta.SetTokenName(meta.DecToken).AppendTo($$.GetMeta())
+                $1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta())
 
                 yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
             }
diff --git a/printer/printer.go b/printer/printer.go
index aebcecf..594259b 100644
--- a/printer/printer.go
+++ b/printer/printer.go
@@ -1473,7 +1473,6 @@ func (p *Printer) printExprPreDec(n node.Node) {
 	nn := n.(*expr.PreDec)
 	p.printMeta(nn, meta.NodeStart)
 
-	p.printMeta(nn, meta.DecToken)
 	io.WriteString(p.w, "--")
 	p.Print(nn.Variable)
 
@@ -1484,7 +1483,6 @@ func (p *Printer) printExprPreInc(n node.Node) {
 	nn := n.(*expr.PreInc)
 	p.printMeta(nn, meta.NodeStart)
 
-	p.printMeta(nn, meta.IncToken)
 	io.WriteString(p.w, "++")
 	p.Print(nn.Variable)
 
diff --git a/printer/printer_test.go b/printer/printer_test.go
index e755fec..8e469b7 100644
--- a/printer/printer_test.go
+++ b/printer/printer_test.go
@@ -3963,7 +3963,7 @@ func TestPrinterPrintPreDec(t *testing.T) {
 			&meta.Data{
 				Type:      meta.WhiteSpaceType,
 				Value:     " ",
-				TokenName: meta.DecToken,
+				TokenName: meta.NodeStart,
 			},
 		},
 		Variable: &expr.Variable{
@@ -3995,7 +3995,7 @@ func TestPrinterPrintPreInc(t *testing.T) {
 			&meta.Data{
 				Type:      meta.WhiteSpaceType,
 				Value:     " ",
-				TokenName: meta.IncToken,
+				TokenName: meta.NodeStart,
 			},
 		},
 		Variable: &expr.Variable{