commit f9bba1315276a41b65f42a9ffcece0bf583eaffe
author Steve Naroff <snaroff@apple.com> Thu Feb 07 15:26:07 2008 +0000
committer Steve Naroff <snaroff@apple.com> Thu Feb 07 15:26:07 2008 +0000
tree 1bb10d7fe9a6709b074e8ec5750fc78f09d8a103
parent 02b5b405df5ca3c907aabff6af81e1f72e0c1c8b

Minor cleanup from yesterday's -fms-extension commit. Move __int* MS keywords to predefined macros. This removes some of the MS-madness from Parser::ParseDeclarationSpecifiers().


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@46852 91177308-0d34-0410-b5e6-96231b3b80d8

Lex/Preprocessor.cpp

diff --git a/Lex/Preprocessor.cpp b/Lex/Preprocessor.cpp
index f4e7374..2fe08c6 100644
--- a/Lex/Preprocessor.cpp
+++ b/Lex/Preprocessor.cpp
@@ -430,6 +430,10 @@
     DefineBuiltinMacro(Buf, "_cdecl=");
     DefineBuiltinMacro(Buf, "__ptr64=");
     DefineBuiltinMacro(Buf, "__forceinline=");
+    DefineBuiltinMacro(Buf, "__int8=char");
+    DefineBuiltinMacro(Buf, "__int16=short");
+    DefineBuiltinMacro(Buf, "__int32=int");
+    DefineBuiltinMacro(Buf, "__int64=long");
   }
   // FIXME: Should emit a #line directive here.
 }

Parse/ParseDecl.cpp

diff --git a/Parse/ParseDecl.cpp b/Parse/ParseDecl.cpp
index 902c523..2fc4d0d 100644
--- a/Parse/ParseDecl.cpp
+++ b/Parse/ParseDecl.cpp
@@ -516,11 +516,9 @@
       break;
       
     // type-specifiers
-    case tok::kw___int16:
     case tok::kw_short:
       isInvalid = DS.SetTypeSpecWidth(DeclSpec::TSW_short, Loc, PrevSpec);
       break;
-    case tok::kw___int64:
     case tok::kw_long:
       if (DS.getTypeSpecWidth() != DeclSpec::TSW_long)
         isInvalid = DS.SetTypeSpecWidth(DeclSpec::TSW_long, Loc, PrevSpec);
@@ -542,11 +540,9 @@
     case tok::kw_void:
       isInvalid = DS.SetTypeSpecType(DeclSpec::TST_void, Loc, PrevSpec);
       break;
-    case tok::kw___int8:
     case tok::kw_char:
       isInvalid = DS.SetTypeSpecType(DeclSpec::TST_char, Loc, PrevSpec);
       break;
-    case tok::kw___int32:
     case tok::kw_int:
       isInvalid = DS.SetTypeSpecType(DeclSpec::TST_int, Loc, PrevSpec);
       break;

include/clang/Basic/TokenKinds.def

diff --git a/include/clang/Basic/TokenKinds.def b/include/clang/Basic/TokenKinds.def
index e17e0fe..f747da1 100644
--- a/include/clang/Basic/TokenKinds.def
+++ b/include/clang/Basic/TokenKinds.def
@@ -302,10 +302,6 @@
 // Microsoft Extensions.
 KEYWORD(__w64          , EXTC90|EXTC99|NOTCPP)
 KEYWORD(__declspec     , EXTC90|EXTC99|NOTCPP)
-KEYWORD(__int8         , EXTC90|EXTC99|NOTCPP)
-KEYWORD(__int16        , EXTC90|EXTC99|NOTCPP)
-KEYWORD(__int32        , EXTC90|EXTC99|NOTCPP)
-KEYWORD(__int64        , EXTC90|EXTC99|NOTCPP)
 
 // Alternate spelling for various tokens.  There are GCC extensions in all
 // languages, but should not be disabled in strict conformance mode.