X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=tokens.inc;h=affe29cf078ff74dcff7a88a317fbfab4a5e4b34;hb=9f84f8eb0cb393885efd87a52d539413f7dae2ee;hp=7299aa55efa00cab51126c6967275e2ed7ec8fb9;hpb=38e1ed624f66bd98f002e73b99ffcecce33aed82;p=cparser

diff --git a/tokens.inc b/tokens.inc
index 7299aa5..affe29c 100644
--- a/tokens.inc
+++ b/tokens.inc
@@ -35,7 +35,6 @@ S(_ALL, long)
 S(_ALL, register)
 S(_ALL, return)
 S(_ALL, short)
-S(_ANSI|_C99, signed)
 S(_ALL, sizeof)
 S(_ALL, static)
 S(_ALL, struct)
@@ -47,8 +46,6 @@ S(_ALL, void)
 S(_ALL, while)
 
 S(_C99|_GNUC, _Bool)
-S(_C99|_GNUC, _Complex)
-S(_C99|_GNUC, _Imaginary)
 S(_GNUC, __thread)
 S(_GNUC, __extension__)
 S(_GNUC, __builtin_classify_type)
@@ -72,8 +69,17 @@ S(_GNUC, __builtin_prefetch)
 S(_GNUC, __PRETTY_FUNCTION__)
 S(_ALL, __FUNCTION__)
 S(_C99, __func__)
+S(_MS, __FUNCSIG__)
+S(_MS, __FUNCDNAME__)
 #undef S
 
+T(_ANSI|_C99,   signed,       "signed",)
+T(_ALL,       __signed,       "__signed",               = T_signed)
+T(_ALL,       __signed__,     "__signed__",             = T_signed)
+T(_C99|_GNUC, _Complex,       "_Complex",)
+T(_GNUC,      __complex__,    "__complex__",            = T__Complex)
+T(_GNUC,      __complex,      "__complex",              = T__Complex)
+T(_C99|_GNUC, _Imaginary,     "_Imaginary",)
 T(_GNUC,      __real__,       "__real__",)
 T(_GNUC,      __real,         "__real",                 = T___real__)
 T(_GNUC,      __imag__,       "__imag__",)
@@ -83,6 +89,7 @@ T(_GNUC|_MS,  __alignof,      "__alignof",              = T___alignof__)
 T(_MS,        _alignof,       "_alignof",               = T___alignof__)
 T(_ANSI|_C99, const,          "const",)
 T(_GNUC,      __const,        "__const",                = T_const)
+T(_GNUC,      __const__,      "__const__",              = T_const)
 T(_C99,       restrict,       "restrict",)
 T(_GNUC,      __restrict__,   "__restrict__",           = T_restrict)
 T(_GNUC,      __restrict,     "__restrict",             = T_restrict)
@@ -92,6 +99,7 @@ T(_GNUC,      __asm__,        "__asm__",                = T_asm)
 T(_MS,        _asm,           "_asm",                   = T_asm)
 T(_GNUC|_MS,  __asm,          "__asm",                  = T_asm)
 T(_ANSI|_C99, volatile,       "volatile",)
+T(_GNUC,      __volatile,     "__volatile",             = T_volatile)
 T(_GNUC,      __volatile__,   "__volatile__",           = T_volatile)
 T(_C99,       inline,         "inline",)
 T(_GNUC|_MS,  __inline,       "__inline",               = T_inline)
@@ -104,43 +112,43 @@ T(_GNUC,      __attribute__,  "__attribute__",)
 T(_GNUC,     __builtin_va_start,     "__builtin_va_start",)
 T(_GNUC,     __builtin_stdarg_start, "__builtin_stdarg_start", = T___builtin_va_start)
 
-T(_MS,       near,            "_near",)
-T(_MS,       _near,           "__near",                  = T_near)
-T(_MS,       far,             "_far",)
-T(_MS,       _far,            "__far",                   = T_far)
+T(_MS,      _near,            "_near",)
+T(_MS,      __near,           "__near",                  = T__near)
+T(_MS,      _far,             "_far",)
+T(_MS,      __far,            "__far",                   = T__far)
 T(_MS,      cdecl,            "cdecl",)
 T(_MS,      _cdecl,           "_cdecl",                  = T_cdecl)
 T(_MS,      __cdecl,          "__cdecl",                 = T_cdecl)
-T(_MS,      stdcall,          "_stdcall",)
-T(_MS,      __stdcall,        "__stdcall",               = T_stdcall)
-T(_MS,      fastcall,         "_fastcall",)
-T(_MS,      __fastcall,       "__fastcall",              = T_fastcall)
-T(_MS,      thiscall,         "_thiscall",)
-T(_MS,      __thiscall,       "__thiscall",              = T_thiscall)
-T(_MS,      forceinline,      "_forceinline",)
-T(_MS,      __forceinline,    "__forceinline",           = T_forceinline)
-T(_MS,      unaligned,        "_unaligned",)
-T(_MS,      __unaligned,      "__unaligned",             = T_unaligned)
-T(_MS,      assume,           "_assume",)
-T(_MS,      __assume,         "__assume",                = T_assume)
-T(_MS,      try,              "_try",)
-T(_MS,      __try,            "__try",                   = T_try)
-T(_MS,      finally,          "_finally",)
-T(_MS,      __finally,        "__finally",               = T_finally)
-T(_MS,      leave,            "_leave",)
-T(_MS,      __leave,          "__leave",                 = T_leave)
-T(_MS,      except,           "_except",)
-T(_MS,      __except,         "__except",                = T_except)
-T(_MS,      declspec,         "_declspec",)
-T(_MS,      __declspec,       "__declspec",              = T_declspec)
-T(_MS,      based,            "_based",)
-T(_MS,      __based,          "__based",                 = T_based)
+T(_MS,      _stdcall,         "_stdcall",)
+T(_MS,      __stdcall,        "__stdcall",               = T__stdcall)
+T(_MS,      _fastcall,        "_fastcall",)
+T(_MS,      __fastcall,       "__fastcall",              = T__fastcall)
+T(_MS,      __thiscall,       "__thiscall",)
+T(_MS,      _forceinline,     "_forceinline",)
+T(_MS,      __forceinline,    "__forceinline",           = T__forceinline)
+T(_MS,      __unaligned,      "__unaligned",)
+T(_MS,      _assume,          "_assume",)
+T(_MS,      __assume,         "__assume",                = T__assume)
+T(_MS,      _try,             "_try",)
+T(_MS,      __try,            "__try",                   = T__try)
+T(_MS,      _finally,         "_finally",)
+T(_MS,      __finally,        "__finally",               = T__finally)
+T(_MS,      _leave,           "_leave",)
+T(_MS,      __leave,          "__leave",                 = T__leave)
+T(_MS,      _except,          "_except",)
+T(_MS,      __except,         "__except",                = T__except)
+T(_MS,      _declspec,        "_declspec",)
+T(_MS,      __declspec,       "__declspec",              = T__declspec)
+T(_MS,      _based,            "_based",)
+T(_MS,      __based,          "__based",                 = T__based)
+T(_MS,      __noop,           "__noop",)
 
 T(_MS,      __ptr32,          "__ptr32",)
 T(_MS,      __ptr64,          "__ptr64",)
 T(_MS,      __sptr,           "__sptr",)
 T(_MS,      __uptr,           "__uptr",)
-T(_MS,      __w64,            "__w64",)
+T(_MS,      _w64,             "_w64",)
+T(_MS,      __w64,            "__w64",                   = T__w64)
 
 T(_MS,      _int8,            "_int8",)
 T(_MS,      __int8,           "__int8",                  = T__int8)