X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=tokens.inc;h=1e21ee11bd85baf666724736cb0b92366a9af949;hb=c8dfa04bfc2911fd2e49853003d43a46e0073291;hp=d801de9e1f27926a89d0ccdf211f4a62ddd0df1a;hpb=22d24ddd2209686fa723a62ccc19b7c2eea2d172;p=cparser

diff --git a/tokens.inc b/tokens.inc
index d801de9..1e21ee1 100644
--- a/tokens.inc
+++ b/tokens.inc
@@ -2,20 +2,21 @@
 #define TS(x,str,val)
 #endif
 
-TS(IDENTIFIER,              "identifier", = 256)
-TS(INTEGER,                 "integer number",)
-TS(CHARACTER_CONSTANT,      "character constant",)
-TS(WIDE_CHARACTER_CONSTANT, "wide character constant",)
-TS(FLOATINGPOINT,           "floatingpoint number",)
-TS(STRING_LITERAL,          "string literal",)
-TS(WIDE_STRING_LITERAL,     "wide string literal",)
-
+/* These must go first. Some set explicit values. */
 #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
 
+TS(IDENTIFIER,              "identifier",)
+TS(INTEGER,                 "integer number",)
+TS(FLOATINGPOINT,           "floatingpoint number",)
+TS(CHARACTER_CONSTANT,      "character constant",)
+TS(WIDE_CHARACTER_CONSTANT, "wide character constant",)
+TS(STRING_LITERAL,          "string literal",)
+TS(WIDE_STRING_LITERAL,     "wide string literal",)
+
 #define S(mode,x)   T(mode,x,#x,)
 S(_ALL, auto)
 S(_ALL, break)
@@ -109,57 +110,26 @@ S(_MS, __FUNCDNAME__)
 #undef S
 
 /* needed on Windows */
-#ifdef __w64
 #undef __w64
-#endif
-#ifdef __ptr32
 #undef __ptr32
-#endif
-#ifdef __ptr64
 #undef __ptr64
-#endif
 
 /* needed on MinGW */
-#ifdef __MINGW32__
-#ifdef __int8
 #undef __int8
-#endif
-#ifdef __int16
 #undef __int16
-#endif
-#ifdef __int32
 #undef __int32
-#endif
-#ifdef __int64
 #undef __int64
-#endif
-#endif
 
-#if defined(__MINGW32__) || defined(__CYGWIN__)
-#ifdef __cdecl
+/* needed on MinGW and Cygwin */
 #undef __cdecl
-#endif
-#ifdef __stdcall
 #undef __stdcall
-#endif
-#ifdef __fastcall
 #undef __fastcall
-#endif
-#endif
 
-/* needed on darwin... */
-#ifdef __signed
+/* needed on Darwin... */
 #undef __signed
-#endif
-#ifdef __volatile
 #undef __volatile
-#endif
-#ifdef __const
 #undef __const
-#endif
-#ifdef __restrict
 #undef __restrict
-#endif
 
 #define S(mode, x, val) T(mode, x, #x, val)
 S(_ANSI|_C99|_CXX,   signed,               )
@@ -190,7 +160,7 @@ S(_ALL,            __asm,                  = T_asm)
 S(_ANSI|_C99|_CXX,   volatile,             )
 S(_ALL,            __volatile,             = T_volatile)
 S(_ALL,            __volatile__,           = T_volatile)
-S(_C99|_CXX,         inline,               )
+S(_C99|_CXX|_GNUC,   inline,               )
 S(_ALL,            __inline,               = T_inline)
 S(_ALL,            __inline__,             = T_inline)
 S(_GNUC,             typeof,               )