From e19956b3034d0d6424a1e4d67a09df64d0a0a84f Mon Sep 17 00:00:00 2001 From: z7zmey Date: Mon, 29 Oct 2018 13:04:44 +0200 Subject: [PATCH] replace meta.WhileToken --- php5/php5.go | 2 +- php5/php5.y | 2 +- php7/php7.go | 2 +- php7/php7.y | 2 +- printer/printer.go | 2 -- printer/printer_test.go | 4 ++-- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/php5/php5.go b/php5/php5.go index 0faa207..e83a22b 100644 --- a/php5/php5.go +++ b/php5/php5.go @@ -3042,7 +3042,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node)) // save comments - yyDollar[1].token.Meta.SetTokenName(meta.WhileToken).AppendTo(yyVAL.node.GetMeta()) + yyDollar[1].token.Meta.SetTokenName(meta.NodeStart).AppendTo(yyVAL.node.GetMeta()) yyDollar[2].node.GetMeta().Cut(meta.TokenNameFilter(meta.OpenParenthesisToken)).Cut(meta.NotFilter(meta.TypeFilter(meta.TokenType))).AppendTo(yyVAL.node.GetMeta()) yyDollar[2].node.GetMeta().Cut(meta.TokenNameFilter(meta.CloseParenthesisToken)).Cut(meta.NotFilter(meta.TypeFilter(meta.TokenType))).AppendTo(yyVAL.node.GetMeta()) diff --git a/php5/php5.y b/php5/php5.y index ae1bd83..1e9f167 100644 --- a/php5/php5.y +++ b/php5/php5.y @@ -938,7 +938,7 @@ unticked_statement: $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $3)) // save comments - $1.Meta.SetTokenName(meta.WhileToken).AppendTo($$.GetMeta()) + $1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta()) $2.GetMeta().Cut(meta.TokenNameFilter(meta.OpenParenthesisToken)).Cut(meta.NotFilter(meta.TypeFilter(meta.TokenType))).AppendTo($$.GetMeta()) $2.GetMeta().Cut(meta.TokenNameFilter(meta.CloseParenthesisToken)).Cut(meta.NotFilter(meta.TypeFilter(meta.TokenType))).AppendTo($$.GetMeta()) diff --git a/php7/php7.go b/php7/php7.go index 75cbd05..cb2ac98 100644 --- a/php7/php7.go +++ b/php7/php7.go @@ -3284,7 +3284,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node)) // save comments - yyDollar[1].token.Meta.SetTokenName(meta.WhileToken).AppendTo(yyVAL.node.GetMeta()) + yyDollar[1].token.Meta.SetTokenName(meta.NodeStart).AppendTo(yyVAL.node.GetMeta()) yyDollar[2].token.Meta.SetTokenName(meta.OpenParenthesisToken).AppendTo(yyVAL.node.GetMeta()) yyDollar[4].token.Meta.SetTokenName(meta.CloseParenthesisToken).AppendTo(yyVAL.node.GetMeta()) diff --git a/php7/php7.y b/php7/php7.y index 4f87780..c65eee4 100644 --- a/php7/php7.y +++ b/php7/php7.y @@ -976,7 +976,7 @@ statement: $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $5)) // save comments - $1.Meta.SetTokenName(meta.WhileToken).AppendTo($$.GetMeta()) + $1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta()) $2.Meta.SetTokenName(meta.OpenParenthesisToken).AppendTo($$.GetMeta()) $4.Meta.SetTokenName(meta.CloseParenthesisToken).AppendTo($$.GetMeta()) diff --git a/printer/printer.go b/printer/printer.go index ba4310f..a1b07bb 100644 --- a/printer/printer.go +++ b/printer/printer.go @@ -1842,7 +1842,6 @@ func (p *Printer) printStmtAltWhile(n node.Node) { nn := n.(*stmt.AltWhile) p.printMeta(nn, meta.NodeStart) - p.printMeta(nn, meta.WhileToken) io.WriteString(p.w, "while") p.printMeta(nn, meta.OpenParenthesisToken) io.WriteString(p.w, "(") @@ -2712,7 +2711,6 @@ func (p *Printer) printStmtWhile(n node.Node) { nn := n.(*stmt.While) p.printMeta(nn, meta.NodeStart) - p.printMeta(nn, meta.WhileToken) io.WriteString(p.w, "while") p.printMeta(nn, meta.OpenParenthesisToken) io.WriteString(p.w, "(") diff --git a/printer/printer_test.go b/printer/printer_test.go index 52bdd87..426bd6a 100644 --- a/printer/printer_test.go +++ b/printer/printer_test.go @@ -5389,7 +5389,7 @@ func TestPrinterPrintAltWhile(t *testing.T) { &meta.Data{ Type: meta.WhiteSpaceType, Value: " ", - TokenName: meta.WhileToken, + TokenName: meta.NodeStart, }, &meta.Data{ Type: meta.WhiteSpaceType, @@ -8555,7 +8555,7 @@ func TestPrinterPrintWhileStmtList(t *testing.T) { &meta.Data{ Type: meta.WhiteSpaceType, Value: " ", - TokenName: meta.WhileToken, + TokenName: meta.NodeStart, }, &meta.Data{ Type: meta.WhiteSpaceType,