Augment MATCH_NEWLINE() in the preprocessor so its usage looks like an ordinary case...

[cparser] / tokens_preprocessor.inc

diff --git a/tokens_preprocessor.inc b/tokens_preprocessor.inc
index 9782ad0..e10b76f 100644 (file)
--- a/tokens_preprocessor.inc
+++ b/tokens_preprocessor.inc
@@ -2,18 +2,18 @@
 #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",)
-
-#define PUNCTUATOR(name,string,val)   T(_ALL,name,string,val)
+TS(IDENTIFIER,         "identifier", = 256)
+TS(NUMBER,             "number",)
+TS(CHARACTER_CONSTANT, "character constant",)
+TS(STRING_LITERAL,     "string literal",)
+TS(HEADERNAME,         "headername",)
+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,)
 
@@ -32,6 +32,8 @@ S(pragma)
 
 S(defined)
 T(_ALL, va_args, "__VA_ARGS__",)
+T(_MS, __COUNTER__, "__COUNTER__",)
+T(_MS, __TIMESTAMP__, "__TIMESTAMP__",)
 
 S(STDC)
 S(ON)
@@ -41,8 +43,4 @@ S(FP_CONTRACT)
 S(FENV_ACCESS)
 S(CX_LIMITED_RANGE)
 
-#define TP_LAST_TOKEN  (TP_CX_LIMITED_RANGE + 1)
-
-TS(NEWLINE,                 "newline", = '\n')
-
 #undef S