diff --git a/meta/tokenName.go b/meta/tokenName.go index f5ec9d6..8f4f47e 100644 --- a/meta/tokenName.go +++ b/meta/tokenName.go @@ -22,7 +22,6 @@ const ( EnddeclareToken AsToken EndswitchToken - CaseToken DefaultToken ContinueToken GotoToken diff --git a/meta/tokenName_string.go b/meta/tokenName_string.go index 7351225..c648795 100644 --- a/meta/tokenName_string.go +++ b/meta/tokenName_string.go @@ -4,9 +4,9 @@ package meta import "strconv" -const _TokenName_name = "NodeStartNodeEndStringVarnameTokenNumStringTokenInlineHTMLTokenEchoTokenDoTokenWhileTokenEndwhileTokenForInitSemicolonTokenForCondSemicolonTokenEndforTokenEndforeachTokenDeclareTokenEnddeclareTokenAsTokenEndswitchTokenCaseTokenDefaultTokenContinueTokenGotoTokenFunctionTokenConstTokenReturnTokenTryTokenCatchTokenFinallyTokenThrowTokenInsteadofTokenGlobalTokenVarTokenUnsetTokenClassTokenTraitTokenInterfaceTokenExtendsTokenImplementsTokenDoubleArrowTokenCallableTokenCurlyOpenTokenPaamayimNekudotayimTokenUseLeadingNsSeparatorTokenNsSeparatorTokenEllipsisTokenLogicalOrTokenLogicalXorTokenLogicalAndTokenInstanceofTokenEndifTokenAbstractTokenFinalTokenPrivateTokenProtectedTokenPublicTokenIncTokenDecTokenObjectOperatorTokenCoalesceTokenSpaceshipTokenPlusEqualTokenMinusEqualTokenMulEqualTokenPowEqualTokenDivEqualTokenConcatEqualTokenModEqualTokenAndEqualTokenOrEqualTokenXorEqualTokenSlEqualTokenSrEqualTokenBooleanOrTokenBooleanAndTokenPowTokenSlTokenSrTokenIsIdenticalTokenIsNotIdenticalTokenIsEqualTokenIsNotEqualTokenIsSmallerOrEqualTokenIsGreaterOrEqualTokenHaltCompilerTokenCaseSeparatorTokenOpenCurlyBracesTokenCloseCurlyBracesTokenSemiColonTokenColonTokenOpenParenthesisTokenCloseParenthesisTokenOpenSquareBracketCloseSquareBracketQuestionMarkTokenAmpersandTokenMinusTokenPlusTokenCommaTokenVerticalBarTokenEqualTokenCaretTokenAsteriskTokenSlashTokenPercentTokenLessTokenGreaterTokenDotToken" +const _TokenName_name = "NodeStartNodeEndStringVarnameTokenNumStringTokenInlineHTMLTokenEchoTokenDoTokenWhileTokenEndwhileTokenForInitSemicolonTokenForCondSemicolonTokenEndforTokenEndforeachTokenDeclareTokenEnddeclareTokenAsTokenEndswitchTokenDefaultTokenContinueTokenGotoTokenFunctionTokenConstTokenReturnTokenTryTokenCatchTokenFinallyTokenThrowTokenInsteadofTokenGlobalTokenVarTokenUnsetTokenClassTokenTraitTokenInterfaceTokenExtendsTokenImplementsTokenDoubleArrowTokenCallableTokenCurlyOpenTokenPaamayimNekudotayimTokenUseLeadingNsSeparatorTokenNsSeparatorTokenEllipsisTokenLogicalOrTokenLogicalXorTokenLogicalAndTokenInstanceofTokenEndifTokenAbstractTokenFinalTokenPrivateTokenProtectedTokenPublicTokenIncTokenDecTokenObjectOperatorTokenCoalesceTokenSpaceshipTokenPlusEqualTokenMinusEqualTokenMulEqualTokenPowEqualTokenDivEqualTokenConcatEqualTokenModEqualTokenAndEqualTokenOrEqualTokenXorEqualTokenSlEqualTokenSrEqualTokenBooleanOrTokenBooleanAndTokenPowTokenSlTokenSrTokenIsIdenticalTokenIsNotIdenticalTokenIsEqualTokenIsNotEqualTokenIsSmallerOrEqualTokenIsGreaterOrEqualTokenHaltCompilerTokenCaseSeparatorTokenOpenCurlyBracesTokenCloseCurlyBracesTokenSemiColonTokenColonTokenOpenParenthesisTokenCloseParenthesisTokenOpenSquareBracketCloseSquareBracketQuestionMarkTokenAmpersandTokenMinusTokenPlusTokenCommaTokenVerticalBarTokenEqualTokenCaretTokenAsteriskTokenSlashTokenPercentTokenLessTokenGreaterTokenDotToken" -var _TokenName_index = [...]uint16{0, 9, 16, 34, 48, 63, 72, 79, 89, 102, 123, 144, 155, 170, 182, 197, 204, 218, 227, 239, 252, 261, 274, 284, 295, 303, 313, 325, 335, 349, 360, 368, 378, 388, 398, 412, 424, 439, 455, 468, 482, 506, 532, 548, 561, 575, 590, 605, 620, 630, 643, 653, 665, 679, 690, 698, 706, 725, 738, 752, 766, 781, 794, 807, 820, 836, 849, 862, 874, 887, 899, 911, 925, 940, 948, 955, 962, 978, 997, 1009, 1024, 1045, 1066, 1083, 1101, 1121, 1142, 1156, 1166, 1186, 1207, 1224, 1242, 1259, 1273, 1283, 1292, 1302, 1318, 1328, 1338, 1351, 1361, 1373, 1382, 1394, 1402} +var _TokenName_index = [...]uint16{0, 9, 16, 34, 48, 63, 72, 79, 89, 102, 123, 144, 155, 170, 182, 197, 204, 218, 230, 243, 252, 265, 275, 286, 294, 304, 316, 326, 340, 351, 359, 369, 379, 389, 403, 415, 430, 446, 459, 473, 497, 523, 539, 552, 566, 581, 596, 611, 621, 634, 644, 656, 670, 681, 689, 697, 716, 729, 743, 757, 772, 785, 798, 811, 827, 840, 853, 865, 878, 890, 902, 916, 931, 939, 946, 953, 969, 988, 1000, 1015, 1036, 1057, 1074, 1092, 1112, 1133, 1147, 1157, 1177, 1198, 1215, 1233, 1250, 1264, 1274, 1283, 1293, 1309, 1319, 1329, 1342, 1352, 1364, 1373, 1385, 1393} 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 3319209..b4914f7 100644 --- a/php5/php5.go +++ b/php5/php5.go @@ -4201,7 +4201,7 @@ yydefault: _case.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[2].token, yyDollar[5].list)) // save comments - yyDollar[2].token.Meta.SetTokenName(meta.CaseToken).AppendTo(_case.GetMeta()) + yyDollar[2].token.Meta.SetTokenName(meta.NodeStart).AppendTo(_case.GetMeta()) yyDollar[4].token.Meta.SetTokenName(meta.CaseSeparatorToken).AppendTo(_case.GetMeta()) yylex.(*Parser).appendMetaToken(_case, yyDollar[4].token, meta.CaseSeparatorToken) diff --git a/php5/php5.y b/php5/php5.y index df7e58c..9e81e5a 100644 --- a/php5/php5.y +++ b/php5/php5.y @@ -2029,7 +2029,7 @@ case_list: _case.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($2, $5)) // save comments - $2.Meta.SetTokenName(meta.CaseToken).AppendTo(_case.GetMeta()) + $2.Meta.SetTokenName(meta.NodeStart).AppendTo(_case.GetMeta()) $4.Meta.SetTokenName(meta.CaseSeparatorToken).AppendTo(_case.GetMeta()) yylex.(*Parser).appendMetaToken(_case, $4, meta.CaseSeparatorToken) diff --git a/php7/php7.go b/php7/php7.go index fc72fa6..671d13b 100644 --- a/php7/php7.go +++ b/php7/php7.go @@ -4245,7 +4245,7 @@ yydefault: _case.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodeListPosition(yyDollar[2].token, yyDollar[5].list)) // save comments - yyDollar[2].token.Meta.SetTokenName(meta.CaseToken).AppendTo(_case.GetMeta()) + yyDollar[2].token.Meta.SetTokenName(meta.NodeStart).AppendTo(_case.GetMeta()) yyDollar[4].token.Meta.SetTokenName(meta.CaseSeparatorToken).AppendTo(_case.GetMeta()) yylex.(*Parser).appendMetaToken(_case, yyDollar[4].token, meta.CaseSeparatorToken) diff --git a/php7/php7.y b/php7/php7.y index 7514767..6aa4669 100644 --- a/php7/php7.y +++ b/php7/php7.y @@ -1874,7 +1874,7 @@ case_list: _case.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodeListPosition($2, $5)) // save comments - $2.Meta.SetTokenName(meta.CaseToken).AppendTo(_case.GetMeta()) + $2.Meta.SetTokenName(meta.NodeStart).AppendTo(_case.GetMeta()) $4.Meta.SetTokenName(meta.CaseSeparatorToken).AppendTo(_case.GetMeta()) yylex.(*Parser).appendMetaToken(_case, $4, meta.CaseSeparatorToken) diff --git a/printer/printer.go b/printer/printer.go index cf24850..c2df8bd 100644 --- a/printer/printer.go +++ b/printer/printer.go @@ -1879,7 +1879,6 @@ func (p *Printer) printStmtCase(n node.Node) { nn := n.(*stmt.Case) p.printMeta(nn, meta.NodeStart) - p.printMeta(nn, meta.CaseToken) io.WriteString(p.w, "case") p.Print(nn.Cond) r := p.printMeta(nn, meta.CaseSeparatorToken) diff --git a/printer/printer_test.go b/printer/printer_test.go index 3fd6386..733d63d 100644 --- a/printer/printer_test.go +++ b/printer/printer_test.go @@ -5507,7 +5507,7 @@ func TestPrinterPrintStmtCase(t *testing.T) { &meta.Data{ Type: meta.WhiteSpaceType, Value: " ", - TokenName: meta.CaseToken, + TokenName: meta.NodeStart, }, }, Cond: &expr.Variable{ @@ -5551,7 +5551,7 @@ func TestPrinterPrintStmtCaseEmpty(t *testing.T) { &meta.Data{ Type: meta.WhiteSpaceType, Value: " ", - TokenName: meta.CaseToken, + TokenName: meta.NodeStart, }, }, Cond: &expr.Variable{