Do not crash if the expression of an array designator is not constant.
[cparser] / tokens_preprocessor.inc
index 33d66cd..d061054 100644 (file)
@@ -2,19 +2,20 @@
 #define TS(x,str,val)
 #endif
 
-TS(HEADERNAME,              "header name", = 256)
-TS(IDENTIFIER,              "identifier",)
+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(HEADERNAME,              "headername",)
 TS(PUNCTUATOR,              "punctuator",)
-TS(NEWLINE,                 "newline", = '\n')
 
-#define PUNCTUATOR(name,string,val)   T(_ALL,name,string,val)
+#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,)
 
@@ -33,6 +34,8 @@ S(pragma)
 
 S(defined)
 T(_ALL, va_args, "__VA_ARGS__",)
+T(_MS, __COUNTER__, "__COUNTER__",)
+T(_MS, __TIMESTAMP__, "__TIMESTAMP__",)
 
 S(STDC)
 S(ON)