diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-05-21 20:22:37 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-05-21 20:22:37 +0000 |
| commit | c425fe4c8014c1f0c921d94ba03d8e137b42a3fa (patch) | |
| tree | 4201326a4996f6f7b9ee3f127e51933a2bf5863b | |
| parent | 7d7f6043213a1234addce9acdf70099ce1ef4276 (diff) | |
| download | bcm5719-llvm-c425fe4c8014c1f0c921d94ba03d8e137b42a3fa.tar.gz bcm5719-llvm-c425fe4c8014c1f0c921d94ba03d8e137b42a3fa.zip | |
don't make _Bool be a keyword in -fms-extensions mode, patch by
Steven Watanabe!
llvm-svn: 104373
| -rw-r--r-- | clang/include/clang/Basic/TokenKinds.def | 2 | ||||
| -rw-r--r-- | clang/lib/Basic/IdentifierTable.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/clang/include/clang/Basic/TokenKinds.def b/clang/include/clang/Basic/TokenKinds.def index c50b31d3740..b16b82854b1 100644 --- a/clang/include/clang/Basic/TokenKinds.def +++ b/clang/include/clang/Basic/TokenKinds.def @@ -220,7 +220,7 @@ KEYWORD(unsigned , KEYALL) KEYWORD(void , KEYALL) KEYWORD(volatile , KEYALL) KEYWORD(while , KEYALL) -KEYWORD(_Bool , KEYALL) +KEYWORD(_Bool , KEYNOMS) KEYWORD(_Complex , KEYALL) KEYWORD(_Imaginary , KEYALL) KEYWORD(__func__ , KEYALL) diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp index ed0de8c4af0..8993e6713fb 100644 --- a/clang/lib/Basic/IdentifierTable.cpp +++ b/clang/lib/Basic/IdentifierTable.cpp @@ -70,7 +70,8 @@ namespace { KEYGNU = 16, KEYMS = 32, BOOLSUPPORT = 64, - KEYALTIVEC = 128 + KEYALTIVEC = 128, + KEYNOMS = 256 }; } @@ -94,6 +95,7 @@ static void AddKeyword(llvm::StringRef Keyword, else if (LangOpts.Microsoft && (Flags & KEYMS)) AddResult = 1; else if (LangOpts.Bool && (Flags & BOOLSUPPORT)) AddResult = 2; else if (LangOpts.AltiVec && (Flags & KEYALTIVEC)) AddResult = 2; + else if (!LangOpts.Microsoft && (Flags & KEYNOMS)) AddResult = 2; // Don't add this keyword if disabled in this language. if (AddResult == 0) return; |
