From 5d4b592a8b40a77aeb5cc20e9956d379fed8a90b Mon Sep 17 00:00:00 2001 From: z7zmey Date: Mon, 29 Oct 2018 12:54:59 +0200 Subject: [PATCH] remove meta.ForToken --- meta/tokenName.go | 1 - meta/tokenName_string.go | 4 ++-- 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 ++-- 8 files changed, 8 insertions(+), 11 deletions(-) diff --git a/meta/tokenName.go b/meta/tokenName.go index 83f89ae..4c57ec8 100644 --- a/meta/tokenName.go +++ b/meta/tokenName.go @@ -17,7 +17,6 @@ const ( EndwhileToken ForInitSemicolonToken ForCondSemicolonToken - ForToken EndforToken ForeachToken EndforeachToken diff --git a/meta/tokenName_string.go b/meta/tokenName_string.go index b194cdc..dd4fe96 100644 --- a/meta/tokenName_string.go +++ b/meta/tokenName_string.go @@ -4,9 +4,9 @@ package meta import "strconv" -const _TokenName_name = "NodeStartNodeEndIfTokenStringVarnameTokenNumStringTokenInlineHTMLTokenEchoTokenDoTokenWhileTokenEndwhileTokenForInitSemicolonTokenForCondSemicolonTokenForTokenEndforTokenForeachTokenEndforeachTokenDeclareTokenEnddeclareTokenAsTokenSwitchTokenEndswitchTokenCaseTokenDefaultTokenBreakTokenContinueTokenGotoTokenFunctionTokenConstTokenReturnTokenTryTokenCatchTokenFinallyTokenThrowTokenInsteadofTokenGlobalTokenVarTokenUnsetTokenClassTokenTraitTokenInterfaceTokenExtendsTokenImplementsTokenDoubleArrowTokenCallableTokenCurlyOpenTokenPaamayimNekudotayimTokenUseLeadingNsSeparatorTokenNsSeparatorTokenEllipsisTokenLogicalOrTokenLogicalXorTokenLogicalAndTokenInstanceofTokenEndifTokenAbstractTokenFinalTokenPrivateTokenProtectedTokenPublicTokenIncTokenDecTokenObjectOperatorTokenCoalesceTokenSpaceshipTokenPlusEqualTokenMinusEqualTokenMulEqualTokenPowEqualTokenDivEqualTokenConcatEqualTokenModEqualTokenAndEqualTokenOrEqualTokenXorEqualTokenSlEqualTokenSrEqualTokenBooleanOrTokenBooleanAndTokenPowTokenSlTokenSrTokenIsIdenticalTokenIsNotIdenticalTokenIsEqualTokenIsNotEqualTokenIsSmallerOrEqualTokenIsGreaterOrEqualTokenHaltCompilerTokenCaseSeparatorTokenOpenCurlyBracesTokenCloseCurlyBracesTokenSemiColonTokenColonTokenOpenParenthesisTokenCloseParenthesisTokenOpenSquareBracketCloseSquareBracketQuestionMarkTokenAmpersandTokenMinusTokenPlusTokenCommaTokenVerticalBarTokenEqualTokenCaretTokenAsteriskTokenSlashTokenPercentTokenLessTokenGreaterTokenDotToken" +const _TokenName_name = "NodeStartNodeEndIfTokenStringVarnameTokenNumStringTokenInlineHTMLTokenEchoTokenDoTokenWhileTokenEndwhileTokenForInitSemicolonTokenForCondSemicolonTokenEndforTokenForeachTokenEndforeachTokenDeclareTokenEnddeclareTokenAsTokenSwitchTokenEndswitchTokenCaseTokenDefaultTokenBreakTokenContinueTokenGotoTokenFunctionTokenConstTokenReturnTokenTryTokenCatchTokenFinallyTokenThrowTokenInsteadofTokenGlobalTokenVarTokenUnsetTokenClassTokenTraitTokenInterfaceTokenExtendsTokenImplementsTokenDoubleArrowTokenCallableTokenCurlyOpenTokenPaamayimNekudotayimTokenUseLeadingNsSeparatorTokenNsSeparatorTokenEllipsisTokenLogicalOrTokenLogicalXorTokenLogicalAndTokenInstanceofTokenEndifTokenAbstractTokenFinalTokenPrivateTokenProtectedTokenPublicTokenIncTokenDecTokenObjectOperatorTokenCoalesceTokenSpaceshipTokenPlusEqualTokenMinusEqualTokenMulEqualTokenPowEqualTokenDivEqualTokenConcatEqualTokenModEqualTokenAndEqualTokenOrEqualTokenXorEqualTokenSlEqualTokenSrEqualTokenBooleanOrTokenBooleanAndTokenPowTokenSlTokenSrTokenIsIdenticalTokenIsNotIdenticalTokenIsEqualTokenIsNotEqualTokenIsSmallerOrEqualTokenIsGreaterOrEqualTokenHaltCompilerTokenCaseSeparatorTokenOpenCurlyBracesTokenCloseCurlyBracesTokenSemiColonTokenColonTokenOpenParenthesisTokenCloseParenthesisTokenOpenSquareBracketCloseSquareBracketQuestionMarkTokenAmpersandTokenMinusTokenPlusTokenCommaTokenVerticalBarTokenEqualTokenCaretTokenAsteriskTokenSlashTokenPercentTokenLessTokenGreaterTokenDotToken" -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} +var _TokenName_index = [...]uint16{0, 9, 16, 23, 41, 55, 70, 79, 86, 96, 109, 130, 151, 162, 174, 189, 201, 216, 223, 234, 248, 257, 269, 279, 292, 301, 314, 324, 335, 343, 353, 365, 375, 389, 400, 408, 418, 428, 438, 452, 464, 479, 495, 508, 522, 546, 572, 588, 601, 615, 630, 645, 660, 670, 683, 693, 705, 719, 730, 738, 746, 765, 778, 792, 806, 821, 834, 847, 860, 876, 889, 902, 914, 927, 939, 951, 965, 980, 988, 995, 1002, 1018, 1037, 1049, 1064, 1085, 1106, 1123, 1141, 1161, 1182, 1196, 1206, 1226, 1247, 1264, 1282, 1299, 1313, 1323, 1332, 1342, 1358, 1368, 1378, 1391, 1401, 1413, 1422, 1434, 1442} 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 746091a..48cc6f0 100644 --- a/php5/php5.go +++ b/php5/php5.go @@ -3088,7 +3088,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[9].node)) // save comments - yyDollar[1].token.Meta.SetTokenName(meta.ForToken).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.ForInitSemicolonToken).AppendTo(yyVAL.node.GetMeta()) yyDollar[6].token.Meta.SetTokenName(meta.ForCondSemicolonToken).AppendTo(yyVAL.node.GetMeta()) diff --git a/php5/php5.y b/php5/php5.y index 7841cc3..73c73ef 100644 --- a/php5/php5.y +++ b/php5/php5.y @@ -980,7 +980,7 @@ unticked_statement: $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $9)) // save comments - $1.Meta.SetTokenName(meta.ForToken).AppendTo($$.GetMeta()) + $1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta()) $2.Meta.SetTokenName(meta.OpenParenthesisToken).AppendTo($$.GetMeta()) $4.Meta.SetTokenName(meta.ForInitSemicolonToken).AppendTo($$.GetMeta()) $6.Meta.SetTokenName(meta.ForCondSemicolonToken).AppendTo($$.GetMeta()) diff --git a/php7/php7.go b/php7/php7.go index c69e293..c8d0450 100644 --- a/php7/php7.go +++ b/php7/php7.go @@ -3330,7 +3330,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[9].node)) // save comments - yyDollar[1].token.Meta.SetTokenName(meta.ForToken).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.ForInitSemicolonToken).AppendTo(yyVAL.node.GetMeta()) yyDollar[6].token.Meta.SetTokenName(meta.ForCondSemicolonToken).AppendTo(yyVAL.node.GetMeta()) diff --git a/php7/php7.y b/php7/php7.y index 8b89f7a..ef5e09e 100644 --- a/php7/php7.y +++ b/php7/php7.y @@ -1018,7 +1018,7 @@ statement: $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $9)) // save comments - $1.Meta.SetTokenName(meta.ForToken).AppendTo($$.GetMeta()) + $1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta()) $2.Meta.SetTokenName(meta.OpenParenthesisToken).AppendTo($$.GetMeta()) $4.Meta.SetTokenName(meta.ForInitSemicolonToken).AppendTo($$.GetMeta()) $6.Meta.SetTokenName(meta.ForCondSemicolonToken).AppendTo($$.GetMeta()) diff --git a/printer/printer.go b/printer/printer.go index 241e5e6..a3f91f4 100644 --- a/printer/printer.go +++ b/printer/printer.go @@ -1724,7 +1724,6 @@ func (p *Printer) printStmtAltFor(n node.Node) { nn := n.(*stmt.AltFor) p.printMeta(nn, meta.NodeStart) - p.printMeta(nn, meta.ForToken) io.WriteString(p.w, "for") p.printMeta(nn, meta.OpenParenthesisToken) io.WriteString(p.w, "(") @@ -2196,7 +2195,6 @@ func (p *Printer) printStmtFor(n node.Node) { nn := n.(*stmt.For) p.printMeta(nn, meta.NodeStart) - p.printMeta(nn, meta.ForToken) io.WriteString(p.w, "for") p.printMeta(nn, meta.OpenParenthesisToken) io.WriteString(p.w, "(") diff --git a/printer/printer_test.go b/printer/printer_test.go index ea5bd62..5cd813e 100644 --- a/printer/printer_test.go +++ b/printer/printer_test.go @@ -4942,7 +4942,7 @@ func TestPrinterPrintAltFor(t *testing.T) { &meta.Data{ Type: meta.WhiteSpaceType, Value: " ", - TokenName: meta.ForToken, + TokenName: meta.NodeStart, }, &meta.Data{ Type: meta.WhiteSpaceType, @@ -6761,7 +6761,7 @@ func TestPrinterPrintStmtFor(t *testing.T) { &meta.Data{ Type: meta.WhiteSpaceType, Value: " ", - TokenName: meta.ForToken, + TokenName: meta.NodeStart, }, &meta.Data{ Type: meta.WhiteSpaceType,