From 3b5fd0874369eaf3c48fd5dbc9e03a495e3b33ab Mon Sep 17 00:00:00 2001 From: z7zmey Date: Fri, 26 Oct 2018 11:50:21 +0300 Subject: [PATCH] remove meta.EmptyToken --- meta/tokenName.go | 1 - php5/php5.go | 4 ++-- php5/php5.y | 4 ++-- php7/php7.go | 2 +- php7/php7.y | 2 +- printer/printer.go | 4 ---- printer/printer_test.go | 2 +- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/meta/tokenName.go b/meta/tokenName.go index 9d1539e..043893d 100644 --- a/meta/tokenName.go +++ b/meta/tokenName.go @@ -46,7 +46,6 @@ const ( VarToken UnsetToken IssetToken - EmptyToken ClassToken TraitToken InterfaceToken diff --git a/php5/php5.go b/php5/php5.go index 5fe8f68..932758d 100644 --- a/php5/php5.go +++ b/php5/php5.go @@ -9395,7 +9395,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token)) // save comments - yyDollar[1].token.Meta.SetTokenName(meta.EmptyToken).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()) @@ -9411,7 +9411,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token)) // save comments - yyDollar[1].token.Meta.SetTokenName(meta.EmptyToken).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/php5/php5.y b/php5/php5.y index 6978922..0225363 100644 --- a/php5/php5.y +++ b/php5/php5.y @@ -6804,7 +6804,7 @@ internal_functions_in_yacc: $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)) // save comments - $1.Meta.SetTokenName(meta.EmptyToken).AppendTo($$.GetMeta()) + $1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta()) $2.Meta.SetTokenName(meta.OpenParenthesisToken).AppendTo($$.GetMeta()) $4.Meta.SetTokenName(meta.CloseParenthesisToken).AppendTo($$.GetMeta()) @@ -6818,7 +6818,7 @@ internal_functions_in_yacc: $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)) // save comments - $1.Meta.SetTokenName(meta.EmptyToken).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/php7/php7.go b/php7/php7.go index 1e1f67b..9f75d4c 100644 --- a/php7/php7.go +++ b/php7/php7.go @@ -8057,7 +8057,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token)) // save comments - yyDollar[1].token.Meta.SetTokenName(meta.EmptyToken).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 ebf1a83..a642a0a 100644 --- a/php7/php7.y +++ b/php7/php7.y @@ -5364,7 +5364,7 @@ internal_functions_in_yacc: $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition($1, $4)) // save comments - $1.Meta.SetTokenName(meta.EmptyToken).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 46d87e9..86485f4 100644 --- a/printer/printer.go +++ b/printer/printer.go @@ -1282,17 +1282,13 @@ func (p *Printer) printExprClosure(n node.Node) { func (p *Printer) printExprConstFetch(n node.Node) { nn := n.(*expr.ConstFetch) p.printMeta(nn, meta.NodeStart) - p.Print(nn.Constant) - p.printMeta(nn, meta.NodeEnd) } func (p *Printer) printExprEmpty(n node.Node) { nn := n.(*expr.Empty) p.printMeta(nn, meta.NodeStart) - - p.printMeta(nn, meta.EmptyToken) io.WriteString(p.w, "empty") p.printMeta(nn, meta.OpenParenthesisToken) io.WriteString(p.w, "(") diff --git a/printer/printer_test.go b/printer/printer_test.go index 87fee15..53a832f 100644 --- a/printer/printer_test.go +++ b/printer/printer_test.go @@ -3261,7 +3261,7 @@ func TestPrinterPrintEmpty(t *testing.T) { &meta.Data{ Type: meta.WhiteSpaceType, Value: " ", - TokenName: meta.EmptyToken, + TokenName: meta.NodeStart, }, &meta.Data{ Type: meta.WhiteSpaceType,