From 6995b20aef2ca53b8177ca8b5705c76182335a14 Mon Sep 17 00:00:00 2001 From: z7zmey Date: Fri, 26 Oct 2018 12:02:41 +0300 Subject: [PATCH] remove meta.IncludeOnceToken --- 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 | 3 --- printer/printer_test.go | 2 +- 8 files changed, 7 insertions(+), 11 deletions(-) diff --git a/meta/tokenName.go b/meta/tokenName.go index 8b574d9..29e82e3 100644 --- a/meta/tokenName.go +++ b/meta/tokenName.go @@ -7,7 +7,6 @@ type TokenName int const ( NodeStart TokenName = iota NodeEnd - IncludeOnceToken IfToken StringVarnameToken NumStringToken diff --git a/meta/tokenName_string.go b/meta/tokenName_string.go index e4bc753..893cf02 100644 --- a/meta/tokenName_string.go +++ b/meta/tokenName_string.go @@ -4,9 +4,9 @@ package meta import "strconv" -const _TokenName_name = "NodeStartNodeEndIncludeOnceTokenIfTokenStringVarnameTokenNumStringTokenInlineHTMLTokenEchoTokenDoTokenWhileTokenEndwhileTokenForInitSemicolonTokenForCondSemicolonTokenForTokenEndforTokenForeachTokenEndforeachTokenDeclareTokenEnddeclareTokenAsTokenSwitchTokenEndswitchTokenCaseTokenDefaultTokenBreakTokenContinueTokenGotoTokenFunctionTokenConstTokenReturnTokenTryTokenCatchTokenFinallyTokenThrowTokenInsteadofTokenGlobalTokenVarTokenUnsetTokenIssetTokenClassTokenTraitTokenInterfaceTokenExtendsTokenImplementsTokenDoubleArrowTokenListTokenCallableTokenCurlyOpenTokenPaamayimNekudotayimTokenUseLeadingNsSeparatorTokenNsSeparatorTokenEllipsisTokenRequireTokenRequireOnceTokenLogicalOrTokenLogicalXorTokenLogicalAndTokenInstanceofTokenNewAnchorElseifTokenElseTokenEndifTokenPrintTokenYieldTokenAbstractTokenFinalTokenPrivateTokenProtectedTokenPublicTokenIncTokenDecTokenYieldFromTokenObjectOperatorTokenCoalesceTokenSpaceshipTokenPlusEqualTokenMinusEqualTokenMulEqualTokenPowEqualTokenDivEqualTokenConcatEqualTokenModEqualTokenAndEqualTokenOrEqualTokenXorEqualTokenSlEqualTokenSrEqualTokenBooleanOrTokenBooleanAndTokenPowTokenSlTokenSrTokenIsIdenticalTokenIsNotIdenticalTokenIsEqualTokenIsNotEqualTokenIsSmallerOrEqualTokenIsGreaterOrEqualTokenHaltCompilerTokenCaseSeparatorTokenBackquoteTokenOpenCurlyBracesTokenCloseCurlyBracesTokenSemiColonTokenColonTokenOpenParenthesisTokenCloseParenthesisTokenOpenSquareBracketCloseSquareBracketQuestionMarkTokenAmpersandTokenMinusTokenPlusTokenCommaTokenVerticalBarTokenEqualTokenCaretTokenAsteriskTokenSlashTokenPercentTokenLessTokenGreaterTokenDotToken" +const _TokenName_name = "NodeStartNodeEndIfTokenStringVarnameTokenNumStringTokenInlineHTMLTokenEchoTokenDoTokenWhileTokenEndwhileTokenForInitSemicolonTokenForCondSemicolonTokenForTokenEndforTokenForeachTokenEndforeachTokenDeclareTokenEnddeclareTokenAsTokenSwitchTokenEndswitchTokenCaseTokenDefaultTokenBreakTokenContinueTokenGotoTokenFunctionTokenConstTokenReturnTokenTryTokenCatchTokenFinallyTokenThrowTokenInsteadofTokenGlobalTokenVarTokenUnsetTokenIssetTokenClassTokenTraitTokenInterfaceTokenExtendsTokenImplementsTokenDoubleArrowTokenListTokenCallableTokenCurlyOpenTokenPaamayimNekudotayimTokenUseLeadingNsSeparatorTokenNsSeparatorTokenEllipsisTokenRequireTokenRequireOnceTokenLogicalOrTokenLogicalXorTokenLogicalAndTokenInstanceofTokenNewAnchorElseifTokenElseTokenEndifTokenPrintTokenYieldTokenAbstractTokenFinalTokenPrivateTokenProtectedTokenPublicTokenIncTokenDecTokenYieldFromTokenObjectOperatorTokenCoalesceTokenSpaceshipTokenPlusEqualTokenMinusEqualTokenMulEqualTokenPowEqualTokenDivEqualTokenConcatEqualTokenModEqualTokenAndEqualTokenOrEqualTokenXorEqualTokenSlEqualTokenSrEqualTokenBooleanOrTokenBooleanAndTokenPowTokenSlTokenSrTokenIsIdenticalTokenIsNotIdenticalTokenIsEqualTokenIsNotEqualTokenIsSmallerOrEqualTokenIsGreaterOrEqualTokenHaltCompilerTokenCaseSeparatorTokenBackquoteTokenOpenCurlyBracesTokenCloseCurlyBracesTokenSemiColonTokenColonTokenOpenParenthesisTokenCloseParenthesisTokenOpenSquareBracketCloseSquareBracketQuestionMarkTokenAmpersandTokenMinusTokenPlusTokenCommaTokenVerticalBarTokenEqualTokenCaretTokenAsteriskTokenSlashTokenPercentTokenLessTokenGreaterTokenDotToken" -var _TokenName_index = [...]uint16{0, 9, 16, 32, 39, 57, 71, 86, 95, 102, 112, 125, 146, 167, 175, 186, 198, 213, 225, 240, 247, 258, 272, 281, 293, 303, 316, 325, 338, 348, 359, 367, 377, 389, 399, 413, 424, 432, 442, 452, 462, 472, 486, 498, 513, 529, 538, 551, 565, 589, 615, 631, 644, 656, 672, 686, 701, 716, 731, 740, 751, 760, 770, 780, 790, 803, 813, 825, 839, 850, 858, 866, 880, 899, 912, 926, 940, 955, 968, 981, 994, 1010, 1023, 1036, 1048, 1061, 1073, 1085, 1099, 1114, 1122, 1129, 1136, 1152, 1171, 1183, 1198, 1219, 1240, 1257, 1275, 1289, 1309, 1330, 1344, 1354, 1374, 1395, 1412, 1430, 1447, 1461, 1471, 1480, 1490, 1506, 1516, 1526, 1539, 1549, 1561, 1570, 1582, 1590} +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, 456, 470, 482, 497, 513, 522, 535, 549, 573, 599, 615, 628, 640, 656, 670, 685, 700, 715, 724, 735, 744, 754, 764, 774, 787, 797, 809, 823, 834, 842, 850, 864, 883, 896, 910, 924, 939, 952, 965, 978, 994, 1007, 1020, 1032, 1045, 1057, 1069, 1083, 1098, 1106, 1113, 1120, 1136, 1155, 1167, 1182, 1203, 1224, 1241, 1259, 1273, 1293, 1314, 1328, 1338, 1358, 1379, 1396, 1414, 1431, 1445, 1455, 1464, 1474, 1490, 1500, 1510, 1523, 1533, 1545, 1554, 1566, 1574} 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 9f6ba42..14a40a6 100644 --- a/php5/php5.go +++ b/php5/php5.go @@ -9441,7 +9441,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) // save comments - yyDollar[1].token.Meta.SetTokenName(meta.IncludeOnceToken).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 8d601c1..3a11de3 100644 --- a/php5/php5.y +++ b/php5/php5.y @@ -6844,7 +6844,7 @@ internal_functions_in_yacc: $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)) // save comments - $1.Meta.SetTokenName(meta.IncludeOnceToken).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 cce0ebb..720d204 100644 --- a/php7/php7.go +++ b/php7/php7.go @@ -8087,7 +8087,7 @@ yydefault: yyVAL.node.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) // save comments - yyDollar[1].token.Meta.SetTokenName(meta.IncludeOnceToken).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 452e608..4bfaf87 100644 --- a/php7/php7.y +++ b/php7/php7.y @@ -5390,7 +5390,7 @@ internal_functions_in_yacc: $$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2)) // save comments - $1.Meta.SetTokenName(meta.IncludeOnceToken).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 6850b94..0f9080e 100644 --- a/printer/printer.go +++ b/printer/printer.go @@ -1364,11 +1364,8 @@ func (p *Printer) printExprInclude(n node.Node) { func (p *Printer) printExprIncludeOnce(n node.Node) { nn := n.(*expr.IncludeOnce) p.printMeta(nn, meta.NodeStart) - - p.printMeta(nn, meta.IncludeOnceToken) io.WriteString(p.w, "include_once") p.Print(nn.Expr) - p.printMeta(nn, meta.NodeEnd) } diff --git a/printer/printer_test.go b/printer/printer_test.go index fff8fbb..baf4f7d 100644 --- a/printer/printer_test.go +++ b/printer/printer_test.go @@ -3565,7 +3565,7 @@ func TestPrinterPrintIncludeOnce(t *testing.T) { &meta.Data{ Type: meta.WhiteSpaceType, Value: " ", - TokenName: meta.IncludeOnceToken, + TokenName: meta.NodeStart, }, }, Expr: &scalar.String{Value: "'path'"}, })