X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=tokens_preprocessor.inc;h=cad600b58d7e803e92b3886e6334f1ae8c7c70ed;hb=bf92df408b5fef01d5ee065b02c1deb7e4289a5b;hp=9fb79663059588eecdf49422a65260f51f7f7500;hpb=cc5baf03706cebfcd0da082d60e18775198d1965;p=cparser

diff --git a/tokens_preprocessor.inc b/tokens_preprocessor.inc
index 9fb7966..cad600b 100644
--- a/tokens_preprocessor.inc
+++ b/tokens_preprocessor.inc
@@ -1,3 +1,23 @@
+#ifndef TS
+#define TS(x,str,val)
+#endif
+
+TS(HEADERNAME,              "header name", = 256)
+TS(IDENTIFIER,              "identifier",)
+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",)
+TS(NEWLINE,                 "newline", = '\n')
+
+#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)
@@ -15,6 +35,8 @@ S(pragma)
 
 S(defined)
 T(_ALL, va_args, "__VA_ARGS__",)
+T(_MS, __COUNTER__, "__COUNTER__",)
+T(_MS, __TIMESTAMP__, "__TIMESTAMP__",)
 
 S(STDC)
 S(ON)
@@ -25,5 +47,3 @@ S(FENV_ACCESS)
 S(CX_LIMITED_RANGE)
 
 #undef S
-
-#define TP_LAST_TOKEN  (TP_CX_LIMITED_RANGE + 1)