X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=tokens.inc;h=81362767426e92b9e6ca934265e71e3a2cbfa88a;hb=c8b3b14e20f09576a0035a0bca1157ac578bf054;hp=4c92797ba95afd1c344c3a6bd8184320acd595a5;hpb=cbb685efb1bc71587b73d29bc688eff26c345c11;p=cparser

diff --git a/tokens.inc b/tokens.inc
index 4c92797..8136276 100644
--- a/tokens.inc
+++ b/tokens.inc
@@ -4,6 +4,7 @@
 
 TS(IDENTIFIER,          "identifier", = 256)
 TS(INTEGER,             "integer number",)
+TS(CHARS,               "character constant",)
 TS(FLOATINGPOINT,       "floatingpoint number",)
 TS(STRING_LITERAL,      "string literal",)
 TS(WIDE_STRING_LITERAL, "wide string literal",)
@@ -63,25 +64,28 @@ S(_GNUC, __builtin_islessgreater)
 S(_GNUC, __builtin_isunordered)
 S(_GNUC, __builtin_constant_p)
 S(_GNUC, __builtin_prefetch)
-S(_C99, __PRETTY_FUNCTION__)
+S(_GNUC, __PRETTY_FUNCTION__)
 S(_ALL, __FUNCTION__)
 S(_C99, __func__)
-S(_C99, __alignof__)
 #undef S
 
-T(_GNUC,      real,           "__real__",)
-T(_GNUC,      _real,          "__real",                 = T_real)
-T(_GNUC,      imag,           "__imag__",)
-T(_GNUC,      _imag,          "__imag",                 = T_imag)
+T(_GNUC,      __real__,       "__real__",)
+T(_GNUC,      __real,         "__real",                 = T___real__)
+T(_GNUC,      __imag__,       "__imag__",)
+T(_GNUC,      __imag,         "__imag",                 = T___imag__)
+T(_GNUC|_MS,  __alignof__,    "__alignof__",)
 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|_MS,  restrict,       "__restrict",)
-T(_GNUC,      _restrict_,     "__restrict__",           = T_restrict)
-T(_C99,       _restrict,      "restrict",               = T_restrict)
+T(_GNUC,      __const,        "__const",                = T_const)
+T(_C99,       restrict,       "restrict",)
+T(_GNUC,      __restrict__,   "__restrict__",           = T_restrict)
+T(_GNUC,      __restrict,     "__restrict",             = T_restrict)
+T(_MS,        _restrict,      "_restrict",              = T_restrict)
 T(_ALL,       asm,            "asm",)
 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(_C99,       inline,         "inline",)
@@ -90,8 +94,7 @@ T(_GNUC,      __inline__,     "__inline__",             = T_inline)
 T(_GNUC,      typeof,         "typeof",)
 T(_GNUC,      __typeof,       "__typeof",               = T_typeof)
 T(_GNUC,      __typeof__,     "__typeof__",             = T_typeof)
-T(_GNUC,      attribute,      "__attribute",)
-T(_GNUC,      __attribute__,  "__attribute__",          = T_attribute)
+T(_GNUC,      __attribute__,  "__attribute__",)
 
 T(_GNUC,     __builtin_va_start,     "__builtin_va_start",)
 T(_GNUC,     __builtin_stdarg_start, "__builtin_stdarg_start", = T___builtin_va_start)
@@ -100,8 +103,6 @@ T(_MS,       near,            "_near",)
 T(_MS,       _near,           "__near",                  = T_near)
 T(_MS,       far,             "_far",)
 T(_MS,       _far,            "__far",                   = T_far)
-T(_MS,      _asm,             "_asm",                    = T_asm)
-T(_MS,      __asm,            "__asm",                   = T_asm)
 T(_MS,      cdecl,            "cdecl",)
 T(_MS,      _cdecl,           "_cdecl",                  = T_cdecl)
 T(_MS,      __cdecl,          "__cdecl",                 = T_cdecl)