Consistency - use DEBUG_TOKEN for all tokens

1 files changed, 100 insertions, 100 deletions

diff --git a/toke.c b/toke.c
index 7d785a8771..83d65e1b57 100644
--- a/toke.c
+++ b/toke.c
@@ -410,106 +410,106 @@ static struct debug_tokens {
     const char *name;
 } const debug_tokens[] =
 {
-    { ADDOP,		TOKENTYPE_OPNUM,	"ADDOP" },
-    { ANDAND,		TOKENTYPE_NONE,		"ANDAND" },
-    { ANDOP,		TOKENTYPE_NONE,		"ANDOP" },
-    { ARROW,		TOKENTYPE_NONE,		"ARROW" },
-    { ASSIGNOP,		TOKENTYPE_OPNUM,	"ASSIGNOP" },
-    { BITANDOP,		TOKENTYPE_OPNUM,	"BITANDOP" },
-    { BITOROP,		TOKENTYPE_OPNUM,	"BITOROP" },
-    { CHEQOP,		TOKENTYPE_OPNUM,	"CHEQOP" },
-    { CHRELOP,		TOKENTYPE_OPNUM,	"CHRELOP" },
-    { COLONATTR,	TOKENTYPE_NONE,		"COLONATTR" },
-    { DOLSHARP,		TOKENTYPE_NONE,		"DOLSHARP" },
-    { DORDOR,		TOKENTYPE_NONE,		"DORDOR" },
-    { DOTDOT,		TOKENTYPE_IVAL,		"DOTDOT" },
-    { FORMLBRACK,	TOKENTYPE_NONE,		"FORMLBRACK" },
-    { FORMRBRACK,	TOKENTYPE_NONE,		"FORMRBRACK" },
-    { FUNC,		TOKENTYPE_OPNUM,	"FUNC" },
-    { FUNC0,		TOKENTYPE_OPNUM,	"FUNC0" },
-    { FUNC0OP,		TOKENTYPE_OPVAL,	"FUNC0OP" },
-    { FUNC0SUB,		TOKENTYPE_OPVAL,	"FUNC0SUB" },
-    { FUNC1,		TOKENTYPE_OPNUM,	"FUNC1" },
-    { HASHBRACK,	TOKENTYPE_NONE,		"HASHBRACK" },
-    DEBUG_TOKEN (IVAL, KW_CATCH),
-    DEBUG_TOKEN (IVAL, KW_CONTINUE),
-    DEBUG_TOKEN (IVAL, KW_DEFAULT),
-    DEBUG_TOKEN (IVAL, KW_DO),
-    DEBUG_TOKEN (IVAL, KW_ELSE),
-    DEBUG_TOKEN (IVAL, KW_ELSIF),
-    DEBUG_TOKEN (IVAL, KW_GIVEN),
-    DEBUG_TOKEN (IVAL, KW_FOR),
-    DEBUG_TOKEN (IVAL, KW_FORMAT),
-    DEBUG_TOKEN (IVAL, KW_IF),
-    DEBUG_TOKEN (IVAL, KW_LOCAL),
-    DEBUG_TOKEN (IVAL, KW_MY),
-    DEBUG_TOKEN (IVAL, KW_PACKAGE),
-    DEBUG_TOKEN (IVAL, KW_REQUIRE),
-    DEBUG_TOKEN (IVAL, KW_SUB_anon),
-    DEBUG_TOKEN (IVAL, KW_SUB_anon_sig),
-    DEBUG_TOKEN (IVAL, KW_SUB_named),
-    DEBUG_TOKEN (IVAL, KW_SUB_named_sig),
-    DEBUG_TOKEN (IVAL, KW_TRY),
-    DEBUG_TOKEN (IVAL, KW_USE_or_NO),
-    DEBUG_TOKEN (IVAL, KW_UNLESS),
-    DEBUG_TOKEN (IVAL, KW_UNTIL),
-    DEBUG_TOKEN (IVAL, KW_WHEN),
-    DEBUG_TOKEN (IVAL, KW_WHILE),
-    { LABEL,		TOKENTYPE_OPVAL,	"LABEL" },
-    { LOOPEX,		TOKENTYPE_OPNUM,	"LOOPEX" },
-    { LSTOP,		TOKENTYPE_OPNUM,	"LSTOP" },
-    { LSTOPSUB,		TOKENTYPE_OPVAL,	"LSTOPSUB" },
-    { MATCHOP,		TOKENTYPE_OPNUM,	"MATCHOP" },
-    { METHCALL,		TOKENTYPE_OPVAL,	"METHCALL" },
-    { METHCALL0,	TOKENTYPE_OPVAL,	"METHCALL0" },
-    { MULOP,		TOKENTYPE_OPNUM,	"MULOP" },
-    { NCEQOP,		TOKENTYPE_OPNUM,	"NCEQOP" },
-    { NCRELOP,		TOKENTYPE_OPNUM,	"NCRELOP" },
-    { NOAMP,		TOKENTYPE_NONE,		"NOAMP" },
-    { NOTOP,		TOKENTYPE_NONE,		"NOTOP" },
-    { OROP,		TOKENTYPE_IVAL,		"OROP" },
-    { OROR,		TOKENTYPE_NONE,		"OROR" },
-    DEBUG_TOKEN (IVAL, PERLY_AMPERSAND),
-    DEBUG_TOKEN (IVAL, PERLY_BRACE_CLOSE),
-    DEBUG_TOKEN (IVAL, PERLY_BRACE_OPEN),
-    DEBUG_TOKEN (IVAL, PERLY_BRACKET_CLOSE),
-    DEBUG_TOKEN (IVAL, PERLY_BRACKET_OPEN),
-    DEBUG_TOKEN (IVAL, PERLY_COLON),
-    DEBUG_TOKEN (IVAL, PERLY_COMMA),
-    DEBUG_TOKEN (IVAL, PERLY_DOT),
-    DEBUG_TOKEN (IVAL, PERLY_EQUAL_SIGN),
-    DEBUG_TOKEN (IVAL, PERLY_EXCLAMATION_MARK),
-    DEBUG_TOKEN (IVAL, PERLY_MINUS),
-    DEBUG_TOKEN (IVAL, PERLY_PAREN_OPEN),
-    DEBUG_TOKEN (IVAL, PERLY_PERCENT_SIGN),
-    DEBUG_TOKEN (IVAL, PERLY_PLUS),
-    DEBUG_TOKEN (IVAL, PERLY_QUESTION_MARK),
-    DEBUG_TOKEN (IVAL, PERLY_SEMICOLON),
-    DEBUG_TOKEN (IVAL, PERLY_SLASH),
-    DEBUG_TOKEN (IVAL, PERLY_SNAIL),
-    DEBUG_TOKEN (IVAL, PERLY_STAR),
-    DEBUG_TOKEN (IVAL, PERLY_TILDE),
-    { PLUGEXPR,		TOKENTYPE_OPVAL,	"PLUGEXPR" },
-    { PLUGSTMT,		TOKENTYPE_OPVAL,	"PLUGSTMT" },
-    { PMFUNC,		TOKENTYPE_OPVAL,	"PMFUNC" },
-    { POSTJOIN,		TOKENTYPE_NONE,		"POSTJOIN" },
-    { POSTDEC,		TOKENTYPE_NONE,		"POSTDEC" },
-    { POSTINC,		TOKENTYPE_NONE,		"POSTINC" },
-    { POWOP,		TOKENTYPE_OPNUM,	"POWOP" },
-    { PREDEC,		TOKENTYPE_NONE,		"PREDEC" },
-    { PREINC,		TOKENTYPE_NONE,		"PREINC" },
-    { PRIVATEREF,	TOKENTYPE_OPVAL,	"PRIVATEREF" },
-    { QWLIST,		TOKENTYPE_OPVAL,	"QWLIST" },
-    { REFGEN,		TOKENTYPE_NONE,		"REFGEN" },
-    { SHIFTOP,		TOKENTYPE_OPNUM,	"SHIFTOP" },
-    { SUBLEXEND,	TOKENTYPE_NONE,		"SUBLEXEND" },
-    { SUBLEXSTART,	TOKENTYPE_NONE,		"SUBLEXSTART" },
-    { THING,		TOKENTYPE_OPVAL,	"THING" },
-    { UMINUS,		TOKENTYPE_NONE,		"UMINUS" },
-    { UNIOP,		TOKENTYPE_OPNUM,	"UNIOP" },
-    { UNIOPSUB,		TOKENTYPE_OPVAL,	"UNIOPSUB" },
-    { BAREWORD,		TOKENTYPE_OPVAL,	"BAREWORD" },
-    { YADAYADA,		TOKENTYPE_IVAL,		"YADAYADA" },
+    DEBUG_TOKEN (OPNUM, ADDOP),
+    DEBUG_TOKEN (NONE,  ANDAND),
+    DEBUG_TOKEN (NONE,  ANDOP),
+    DEBUG_TOKEN (NONE,  ARROW),
+    DEBUG_TOKEN (OPNUM, ASSIGNOP),
+    DEBUG_TOKEN (OPNUM, BITANDOP),
+    DEBUG_TOKEN (OPNUM, BITOROP),
+    DEBUG_TOKEN (OPNUM, CHEQOP),
+    DEBUG_TOKEN (OPNUM, CHRELOP),
+    DEBUG_TOKEN (NONE,  COLONATTR),
+    DEBUG_TOKEN (NONE,  DOLSHARP),
+    DEBUG_TOKEN (NONE,  DORDOR),
+    DEBUG_TOKEN (IVAL,  DOTDOT),
+    DEBUG_TOKEN (NONE,  FORMLBRACK),
+    DEBUG_TOKEN (NONE,  FORMRBRACK),
+    DEBUG_TOKEN (OPNUM, FUNC),
+    DEBUG_TOKEN (OPNUM, FUNC0),
+    DEBUG_TOKEN (OPVAL, FUNC0OP),
+    DEBUG_TOKEN (OPVAL, FUNC0SUB),
+    DEBUG_TOKEN (OPNUM, FUNC1),
+    DEBUG_TOKEN (NONE,  HASHBRACK),
+    DEBUG_TOKEN (IVAL,  KW_CATCH),
+    DEBUG_TOKEN (IVAL,  KW_CONTINUE),
+    DEBUG_TOKEN (IVAL,  KW_DEFAULT),
+    DEBUG_TOKEN (IVAL,  KW_DO),
+    DEBUG_TOKEN (IVAL,  KW_ELSE),
+    DEBUG_TOKEN (IVAL,  KW_ELSIF),
+    DEBUG_TOKEN (IVAL,  KW_GIVEN),
+    DEBUG_TOKEN (IVAL,  KW_FOR),
+    DEBUG_TOKEN (IVAL,  KW_FORMAT),
+    DEBUG_TOKEN (IVAL,  KW_IF),
+    DEBUG_TOKEN (IVAL,  KW_LOCAL),
+    DEBUG_TOKEN (IVAL,  KW_MY),
+    DEBUG_TOKEN (IVAL,  KW_PACKAGE),
+    DEBUG_TOKEN (IVAL,  KW_REQUIRE),
+    DEBUG_TOKEN (IVAL,  KW_SUB_anon),
+    DEBUG_TOKEN (IVAL,  KW_SUB_anon_sig),
+    DEBUG_TOKEN (IVAL,  KW_SUB_named),
+    DEBUG_TOKEN (IVAL,  KW_SUB_named_sig),
+    DEBUG_TOKEN (IVAL,  KW_TRY),
+    DEBUG_TOKEN (IVAL,  KW_USE_or_NO),
+    DEBUG_TOKEN (IVAL,  KW_UNLESS),
+    DEBUG_TOKEN (IVAL,  KW_UNTIL),
+    DEBUG_TOKEN (IVAL,  KW_WHEN),
+    DEBUG_TOKEN (IVAL,  KW_WHILE),
+    DEBUG_TOKEN (OPVAL, LABEL),
+    DEBUG_TOKEN (OPNUM, LOOPEX),
+    DEBUG_TOKEN (OPNUM, LSTOP),
+    DEBUG_TOKEN (OPVAL, LSTOPSUB),
+    DEBUG_TOKEN (OPNUM, MATCHOP),
+    DEBUG_TOKEN (OPVAL, METHCALL),
+    DEBUG_TOKEN (OPVAL, METHCALL0),
+    DEBUG_TOKEN (OPNUM, MULOP),
+    DEBUG_TOKEN (OPNUM, NCEQOP),
+    DEBUG_TOKEN (OPNUM, NCRELOP),
+    DEBUG_TOKEN (NONE,  NOAMP),
+    DEBUG_TOKEN (NONE,  NOTOP),
+    DEBUG_TOKEN (IVAL,  OROP),
+    DEBUG_TOKEN (NONE,  OROR),
+    DEBUG_TOKEN (IVAL,  PERLY_AMPERSAND),
+    DEBUG_TOKEN (IVAL,  PERLY_BRACE_CLOSE),
+    DEBUG_TOKEN (IVAL,  PERLY_BRACE_OPEN),
+    DEBUG_TOKEN (IVAL,  PERLY_BRACKET_CLOSE),
+    DEBUG_TOKEN (IVAL,  PERLY_BRACKET_OPEN),
+    DEBUG_TOKEN (IVAL,  PERLY_COLON),
+    DEBUG_TOKEN (IVAL,  PERLY_COMMA),
+    DEBUG_TOKEN (IVAL,  PERLY_DOT),
+    DEBUG_TOKEN (IVAL,  PERLY_EQUAL_SIGN),
+    DEBUG_TOKEN (IVAL,  PERLY_EXCLAMATION_MARK),
+    DEBUG_TOKEN (IVAL,  PERLY_MINUS),
+    DEBUG_TOKEN (IVAL,  PERLY_PAREN_OPEN),
+    DEBUG_TOKEN (IVAL,  PERLY_PERCENT_SIGN),
+    DEBUG_TOKEN (IVAL,  PERLY_PLUS),
+    DEBUG_TOKEN (IVAL,  PERLY_QUESTION_MARK),
+    DEBUG_TOKEN (IVAL,  PERLY_SEMICOLON),
+    DEBUG_TOKEN (IVAL,  PERLY_SLASH),
+    DEBUG_TOKEN (IVAL,  PERLY_SNAIL),
+    DEBUG_TOKEN (IVAL,  PERLY_STAR),
+    DEBUG_TOKEN (IVAL,  PERLY_TILDE),
+    DEBUG_TOKEN (OPVAL, PLUGEXPR),
+    DEBUG_TOKEN (OPVAL, PLUGSTMT),
+    DEBUG_TOKEN (OPVAL, PMFUNC),
+    DEBUG_TOKEN (NONE,  POSTJOIN),
+    DEBUG_TOKEN (NONE,  POSTDEC),
+    DEBUG_TOKEN (NONE,  POSTINC),
+    DEBUG_TOKEN (OPNUM, POWOP),
+    DEBUG_TOKEN (NONE,  PREDEC),
+    DEBUG_TOKEN (NONE,  PREINC),
+    DEBUG_TOKEN (OPVAL, PRIVATEREF),
+    DEBUG_TOKEN (OPVAL, QWLIST),
+    DEBUG_TOKEN (NONE,  REFGEN),
+    DEBUG_TOKEN (OPNUM, SHIFTOP),
+    DEBUG_TOKEN (NONE,  SUBLEXEND),
+    DEBUG_TOKEN (NONE,  SUBLEXSTART),
+    DEBUG_TOKEN (OPVAL, THING),
+    DEBUG_TOKEN (NONE,  UMINUS),
+    DEBUG_TOKEN (OPNUM, UNIOP),
+    DEBUG_TOKEN (OPVAL, UNIOPSUB),
+    DEBUG_TOKEN (OPVAL, BAREWORD),
+    DEBUG_TOKEN (IVAL,  YADAYADA),
     { 0,		TOKENTYPE_NONE,		NULL }
 };