From a1e96dbbf21f1c943b4cfc7dbb0314ed18aa4429 Mon Sep 17 00:00:00 2001 From: z7zmey Date: Mon, 29 Oct 2018 12:52:27 +0200 Subject: [PATCH] remove meta.ElseToken --- meta/tokenName.go | 1 - meta/tokenName_string.go | 4 ++-- php5/php5.go | 4 ++-- php5/php5.y | 4 ++-- php7/php7.go | 4 ++-- php7/php7.y | 4 ++-- printer/printer.go | 2 -- printer/printer_test.go | 8 ++++---- 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/meta/tokenName.go b/meta/tokenName.go index 960cc02..83f89ae 100644 --- a/meta/tokenName.go +++ b/meta/tokenName.go @@ -58,7 +58,6 @@ const ( LogicalXorToken LogicalAndToken InstanceofToken - ElseToken EndifToken AbstractToken FinalToken diff --git a/meta/tokenName_string.go b/meta/tokenName_string.go index e303c9b..b194cdc 100644 --- a/meta/tokenName_string.go +++ b/meta/tokenName_string.go @@ -4,9 +4,9 @@ package meta import "strconv" -const _TokenName_name = "NodeStartNodeEndIfTokenStringVarnameTokenNumStringTokenInlineHTMLTokenEchoTokenDoTokenWhileTokenEndwhileTokenForInitSemicolonTokenForCondSemicolonTokenForTokenEndforTokenForeachTokenEndforeachTokenDeclareTokenEnddeclareTokenAsTokenSwitchTokenEndswitchTokenCaseTokenDefaultTokenBreakTokenContinueTokenGotoTokenFunctionTokenConstTokenReturnTokenTryTokenCatchTokenFinallyTokenThrowTokenInsteadofTokenGlobalTokenVarTokenUnsetTokenClassTokenTraitTokenInterfaceTokenExtendsTokenImplementsTokenDoubleArrowTokenCallableTokenCurlyOpenTokenPaamayimNekudotayimTokenUseLeadingNsSeparatorTokenNsSeparatorTokenEllipsisTokenLogicalOrTokenLogicalXorTokenLogicalAndTokenInstanceofTokenElseTokenEndifTokenAbstractTokenFinalTokenPrivateTokenProtectedTokenPublicTokenIncTokenDecTokenObjectOperatorTokenCoalesceTokenSpaceshipTokenPlusEqualTokenMinusEqualTokenMulEqualTokenPowEqualTokenDivEqualTokenConcatEqualTokenModEqualTokenAndEqualTokenOrEqualTokenXorEqualTokenSlEqualTokenSrEqualTokenBooleanOrTokenBooleanAndTokenPowTokenSlTokenSrTokenIsIdenticalTokenIsNotIdenticalTokenIsEqualTokenIsNotEqualTokenIsSmallerOrEqualTokenIsGreaterOrEqualTokenHaltCompilerTokenCaseSeparatorTokenOpenCurlyBracesTokenCloseCurlyBracesTokenSemiColonTokenColonTokenOpenParenthesisTokenCloseParenthesisTokenOpenSquareBracketCloseSquareBracketQuestionMarkTokenAmpersandTokenMinusTokenPlusTokenCommaTokenVerticalBarTokenEqualTokenCaretTokenAsteriskTokenSlashTokenPercentTokenLessTokenGreaterTokenDotToken" +const _TokenName_name = "NodeStartNodeEndIfTokenStringVarnameTokenNumStringTokenInlineHTMLTokenEchoTokenDoTokenWhileTokenEndwhileTokenForInitSemicolonTokenForCondSemicolonTokenForTokenEndforTokenForeachTokenEndforeachTokenDeclareTokenEnddeclareTokenAsTokenSwitchTokenEndswitchTokenCaseTokenDefaultTokenBreakTokenContinueTokenGotoTokenFunctionTokenConstTokenReturnTokenTryTokenCatchTokenFinallyTokenThrowTokenInsteadofTokenGlobalTokenVarTokenUnsetTokenClassTokenTraitTokenInterfaceTokenExtendsTokenImplementsTokenDoubleArrowTokenCallableTokenCurlyOpenTokenPaamayimNekudotayimTokenUseLeadingNsSeparatorTokenNsSeparatorTokenEllipsisTokenLogicalOrTokenLogicalXorTokenLogicalAndTokenInstanceofTokenEndifTokenAbstractTokenFinalTokenPrivateTokenProtectedTokenPublicTokenIncTokenDecTokenObjectOperatorTokenCoalesceTokenSpaceshipTokenPlusEqualTokenMinusEqualTokenMulEqualTokenPowEqualTokenDivEqualTokenConcatEqualTokenModEqualTokenAndEqualTokenOrEqualTokenXorEqualTokenSlEqualTokenSrEqualTokenBooleanOrTokenBooleanAndTokenPowTokenSlTokenSrTokenIsIdenticalTokenIsNotIdenticalTokenIsEqualTokenIsNotEqualTokenIsSmallerOrEqualTokenIsGreaterOrEqualTokenHaltCompilerTokenCaseSeparatorTokenOpenCurlyBracesTokenCloseCurlyBracesTokenSemiColonTokenColonTokenOpenParenthesisTokenCloseParenthesisTokenOpenSquareBracketCloseSquareBracketQuestionMarkTokenAmpersandTokenMinusTokenPlusTokenCommaTokenVerticalBarTokenEqualTokenCaretTokenAsteriskTokenSlashTokenPercentTokenLessTokenGreaterTokenDotToken" -var _TokenName_index = [...]uint16{0, 9, 16, 23, 41, 55, 70, 79, 86, 96, 109, 130, 151, 159, 170, 182, 197, 209, 224, 231, 242, 256, 265, 277, 287, 300, 309, 322, 332, 343, 351, 361, 373, 383, 397, 408, 416, 426, 436, 446, 460, 472, 487, 503, 516, 530, 554, 580, 596, 609, 623, 638, 653, 668, 677, 687, 700, 710, 722, 736, 747, 755, 763, 782, 795, 809, 823, 838, 851, 864, 877, 893, 906, 919, 931, 944, 956, 968, 982, 997, 1005, 1012, 1019, 1035, 1054, 1066, 1081, 1102, 1123, 1140, 1158, 1178, 1199, 1213, 1223, 1243, 1264, 1281, 1299, 1316, 1330, 1340, 1349, 1359, 1375, 1385, 1395, 1408, 1418, 1430, 1439, 1451, 1459} +var _TokenName_index = [...]uint16{0, 9, 16, 23, 41, 55, 70, 79, 86, 96, 109, 130, 151, 159, 170, 182, 197, 209, 224, 231, 242, 256, 265, 277, 287, 300, 309, 322, 332, 343, 351, 361, 373, 383, 397, 408, 416, 426, 436, 446, 460, 472, 487, 503, 516, 530, 554, 580, 596, 609, 623, 638, 653, 668, 678, 691, 701, 713, 727, 738, 746, 754, 773, 786, 800, 814, 829, 842, 855, 868, 884, 897, 910, 922, 935, 947, 959, 973, 988, 996, 1003, 1010, 1026, 1045, 1057, 1072, 1093, 1114, 1131, 1149, 1169, 1190, 1204, 1214, 1234, 1255, 1272, 1290, 1307, 1321, 1331, 1340, 1350, 1366, 1376, 1386, 1399, 1409, 1421, 1430, 1442, 1450} func (i TokenName) String() string { if i < 0 || i >= TokenName(len(_TokenName_index)-1) { diff --git a/php5/php5.go b/php5/php5.go index b8c7199..746091a 100644 --- a/php5/php5.go +++ b/php5/php5.go @@ -4337,7 +4337,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) // save comments - yyDollar[1].token.Meta.SetTokenName(meta.ElseToken).AppendTo(yyVAL.node.GetMeta()) + yyDollar[1].token.Meta.SetTokenName(meta.NodeStart).AppendTo(yyVAL.node.GetMeta()) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4361,7 +4361,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list)) // save comments - yyDollar[1].token.Meta.SetTokenName(meta.ElseToken).AppendTo(yyVAL.node.GetMeta()) + yyDollar[1].token.Meta.SetTokenName(meta.NodeStart).AppendTo(yyVAL.node.GetMeta()) yyDollar[2].token.Meta.SetTokenName(meta.ColonToken).AppendTo(yyVAL.node.GetMeta()) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) diff --git a/php5/php5.y b/php5/php5.y index de045fb..7841cc3 100644 --- a/php5/php5.y +++ b/php5/php5.y @@ -2164,7 +2164,7 @@ else_single: $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)) // save comments - $1.Meta.SetTokenName(meta.ElseToken).AppendTo($$.GetMeta()) + $1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta()) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2188,7 +2188,7 @@ new_else_single: $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($1, $3)) // save comments - $1.Meta.SetTokenName(meta.ElseToken).AppendTo($$.GetMeta()) + $1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta()) $2.Meta.SetTokenName(meta.ColonToken).AppendTo($$.GetMeta()) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) diff --git a/php7/php7.go b/php7/php7.go index 9152d0c..c69e293 100644 --- a/php7/php7.go +++ b/php7/php7.go @@ -4364,7 +4364,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) // save comments - yyDollar[2].token.Meta.SetTokenName(meta.ElseToken).AppendTo(_else.GetMeta()) + yyDollar[2].token.Meta.SetTokenName(meta.NodeStart).AppendTo(_else.GetMeta()) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -4437,7 +4437,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewNodeTokenPosition(yyDollar[1].node, yyDollar[6].token)) // save comments - yyDollar[2].token.Meta.SetTokenName(meta.ElseToken).AppendTo(_else.GetMeta()) + yyDollar[2].token.Meta.SetTokenName(meta.NodeStart).AppendTo(_else.GetMeta()) yyDollar[3].token.Meta.SetTokenName(meta.ColonToken).AppendTo(_else.GetMeta()) yyDollar[5].token.Meta.SetTokenName(meta.EndifToken).AppendTo(yyVAL.node.GetMeta()) yyDollar[6].token.Meta.SetTokenName(meta.SemiColonToken).AppendTo(yyVAL.node.GetMeta()) diff --git a/php7/php7.y b/php7/php7.y index a8a592c..8b89f7a 100644 --- a/php7/php7.y +++ b/php7/php7.y @@ -1987,7 +1987,7 @@ if_stmt: $$.SetPosition(yylex.(*Parser).positionBuilder.NewNodesPosition($1, $3)) // save comments - $2.Meta.SetTokenName(meta.ElseToken).AppendTo(_else.GetMeta()) + $2.Meta.SetTokenName(meta.NodeStart).AppendTo(_else.GetMeta()) yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } @@ -2058,7 +2058,7 @@ alt_if_stmt: $$.SetPosition(yylex.(*Parser).positionBuilder.NewNodeTokenPosition($1, $6)) // save comments - $2.Meta.SetTokenName(meta.ElseToken).AppendTo(_else.GetMeta()) + $2.Meta.SetTokenName(meta.NodeStart).AppendTo(_else.GetMeta()) $3.Meta.SetTokenName(meta.ColonToken).AppendTo(_else.GetMeta()) $5.Meta.SetTokenName(meta.EndifToken).AppendTo($$.GetMeta()) $6.Meta.SetTokenName(meta.SemiColonToken).AppendTo($$.GetMeta()) diff --git a/printer/printer.go b/printer/printer.go index 0fe4915..241e5e6 100644 --- a/printer/printer.go +++ b/printer/printer.go @@ -1709,7 +1709,6 @@ func (p *Printer) printStmtAltElse(n node.Node) { nn := n.(*stmt.AltElse) p.printMeta(nn, meta.NodeStart) - p.printMeta(nn, meta.ElseToken) io.WriteString(p.w, "else") p.printMeta(nn, meta.ColonToken) io.WriteString(p.w, ":") @@ -2160,7 +2159,6 @@ func (p *Printer) printStmtElse(n node.Node) { nn := n.(*stmt.Else) p.printMeta(nn, meta.NodeStart) - p.printMeta(nn, meta.ElseToken) io.WriteString(p.w, "else") p.Print(nn.Stmt) diff --git a/printer/printer_test.go b/printer/printer_test.go index fde9c6e..ea5bd62 100644 --- a/printer/printer_test.go +++ b/printer/printer_test.go @@ -4873,7 +4873,7 @@ func TestPrinterPrintAltElse(t *testing.T) { &meta.Data{ Type: meta.WhiteSpaceType, Value: " ", - TokenName: meta.ElseToken, + TokenName: meta.NodeStart, }, &meta.Data{ Type: meta.WhiteSpaceType, @@ -4914,7 +4914,7 @@ func TestPrinterPrintAltElseEmpty(t *testing.T) { &meta.Data{ Type: meta.WhiteSpaceType, Value: " ", - TokenName: meta.ElseToken, + TokenName: meta.NodeStart, }, &meta.Data{ Type: meta.WhiteSpaceType, @@ -6623,7 +6623,7 @@ func TestPrinterPrintStmtElseStmts(t *testing.T) { &meta.Data{ Type: meta.WhiteSpaceType, Value: " ", - TokenName: meta.ElseToken, + TokenName: meta.NodeStart, }, }, Stmt: &stmt.StmtList{ @@ -6650,7 +6650,7 @@ func TestPrinterPrintStmtElseExpr(t *testing.T) { &meta.Data{ Type: meta.WhiteSpaceType, Value: " ", - TokenName: meta.ElseToken, + TokenName: meta.NodeStart, }, }, Stmt: &stmt.Expression{Expr: &scalar.String{Value: "'bar'"}},