X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=tokens_preprocessor.inc;h=63ead553ecfb34f35e4e2c29733bb40064348deb;hb=441f7b19fce3fb2baf035f62630c3aeea0e1b09c;hp=f5bfe3e59d95452748ca732551dccefd5b48e18f;hpb=5894d20a1ca98cb5eb0916b083db5838657d6730;p=cparser

diff --git a/tokens_preprocessor.inc b/tokens_preprocessor.inc
index f5bfe3e..63ead55 100644
--- a/tokens_preprocessor.inc
+++ b/tokens_preprocessor.inc
@@ -1,47 +1,19 @@
-#ifndef TS
-#define TS(x,str,val)
-#endif
-
-TS(IDENTIFIER,              "identifier", = 256)
-TS(NUMBER,                  "number",)
-TS(CHARACTER_CONSTANT,      "character constant",)
-TS(WIDE_CHARACTER_CONSTANT, "character constant",)
-TS(STRING_LITERAL,          "string literal",)
-TS(WIDE_STRING_LITERAL,     "wide string literal",)
-TS(PUNCTUATOR,              "punctuator",)
-
-#define ALTERNATE(name, val)          T(_CXX, name, #name,  val)
-#define PUNCTUATOR(name, string, val) T(_ALL, name, string, val)
-#include "tokens_punctuator.inc"
-#undef PUNCTUATOR
-#undef ALTERNATE
-
-#define S(x)   T(_ALL,x,#x,)
-
-S(if)
-S(else)
-S(elif)
-S(endif)
-S(ifdef)
-S(ifndef)
-S(include)
-S(define)
-S(undef)
-S(line)
-S(error)
-S(pragma)
-
-S(defined)
-T(_ALL, va_args, "__VA_ARGS__",)
-T(_MS, __COUNTER__, "__COUNTER__",)
-T(_MS, __TIMESTAMP__, "__TIMESTAMP__",)
-
-S(STDC)
-S(ON)
-S(OFF)
-S(DEFAULT)
-S(FP_CONTRACT)
-S(FENV_ACCESS)
-S(CX_LIMITED_RANGE)
-
-#undef S
+T(CX_LIMITED_RANGE)
+T(DEFAULT)
+T(FENV_ACCESS)
+T(FP_CONTRACT)
+T(OFF)
+T(ON)
+T(STDC)
+T(define)
+T(elif)
+T(else)  /* remember that this gives T_else, not T_IDENTIFIER like most others */
+T(endif)
+T(error)
+T(if)    /* remember that this gives T_if */
+T(ifdef)
+T(ifndef)
+T(include)
+T(line)
+T(pragma)
+T(undef)