- fixed names of MS keywords

- more ms keywords added

[r18967]

diff --git a/parser.c b/parser.c
index 2c8c173..658be05 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -145,7 +145,7 @@ static void semantic_comparison(binary_expression_t *expression);
        case T_restrict:        \
        case T_volatile:        \
        case T_inline:          \
-       case T_forceinline:
+       case T__forceinline:
 
 #ifdef PROVIDE_COMPLEX
 #define COMPLEX_SPECIFIERS  \
@@ -173,7 +173,7 @@ static void semantic_comparison(binary_expression_t *expression);
        case T_enum:              \
        case T___typeof__:        \
        case T___builtin_va_list: \
-       case T_declspec:          \
+       case T__declspec:         \
        COMPLEX_SPECIFIERS        \
        IMAGINARY_SPECIFIERS
 
@@ -2294,7 +2294,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
                MATCH_SPECIFIER(T__Complex,   SPECIFIER_COMPLEX,   "_Complex")
                MATCH_SPECIFIER(T__Imaginary, SPECIFIER_IMAGINARY, "_Imaginary")
 #endif
-               case T_forceinline:
+               case T__forceinline:
                        /* only in microsoft mode */
                        specifiers->decl_modifiers |= DM_FORCEINLINE;
 
@@ -4742,7 +4742,7 @@ end_error:
  * Parses a MS assume() expression.
  */
 static expression_t *parse_assume(void) {
-       eat(T_assume);
+       eat(T__assume);
 
        expression_t *expression
                = allocate_expression_zero(EXPR_UNARY_ASSUME);
@@ -4792,7 +4792,7 @@ static expression_t *parse_primary_expression(void)
                case T___builtin_isunordered:    return parse_compare_builtin();
                case T___builtin_constant_p:     return parse_builtin_constant();
                case T___builtin_prefetch:       return parse_builtin_prefetch();
-               case T_assume:                   return parse_assume();
+               case T__assume:                  return parse_assume();
 
                case '(':                        return parse_brace_expression();
        }

diff --git a/tokens.inc b/tokens.inc
index 7299aa5..8f24e5d 100644 (file)
--- a/tokens.inc
+++ b/tokens.inc
@@ -104,43 +104,42 @@ 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,      __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)