diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Basic/IdentifierTable.cpp | 6 | ||||
| -rw-r--r-- | lib/Lex/PPDirectives.cpp | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/lib/Basic/IdentifierTable.cpp b/lib/Basic/IdentifierTable.cpp index 3da15bde0e..c191456b1e 100644 --- a/lib/Basic/IdentifierTable.cpp +++ b/lib/Basic/IdentifierTable.cpp @@ -217,16 +217,18 @@ tok::PPKeywordKind IdentifierInfo::getPPKeywordID() const { CASE( 6, 'i', 'n', ifndef); CASE( 6, 'i', 'p', import); CASE( 6, 'p', 'a', pragma); - CASE( 6, 'p', 'b', public); CASE( 7, 'd', 'f', defined); CASE( 7, 'i', 'c', include); - CASE( 7, 'p', 'i', private); CASE( 7, 'w', 'r', warning); CASE( 8, 'u', 'a', unassert); CASE(12, 'i', 'c', include_next); + CASE(14, '_', 'p', __public_macro); + + CASE(15, '_', 'p', __private_macro); + CASE(16, '_', 'i', __include_macros); #undef CASE #undef HASH diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp index 138e7d9879..4379b6bad1 100644 --- a/lib/Lex/PPDirectives.cpp +++ b/lib/Lex/PPDirectives.cpp @@ -682,12 +682,12 @@ TryAgain: //isExtension = true; // FIXME: implement #unassert break; - case tok::pp_public: + case tok::pp___public_macro: if (getLangOptions().Modules) return HandleMacroPublicDirective(Result); break; - case tok::pp_private: + case tok::pp___private_macro: if (getLangOptions().Modules) return HandleMacroPrivateDirective(Result); break; @@ -1052,8 +1052,8 @@ void Preprocessor::HandleMacroPublicDirective(Token &Tok) { if (MacroNameTok.is(tok::eod)) return; - // Check to see if this is the last token on the #public line. - CheckEndOfDirective("public"); + // Check to see if this is the last token on the #__public_macro line. + CheckEndOfDirective("__public_macro"); // Okay, we finally have a valid identifier to undef. MacroInfo *MI = getMacroInfo(MacroNameTok.getIdentifierInfo()); @@ -1083,8 +1083,8 @@ void Preprocessor::HandleMacroPrivateDirective(Token &Tok) { if (MacroNameTok.is(tok::eod)) return; - // Check to see if this is the last token on the #private line. - CheckEndOfDirective("private"); + // Check to see if this is the last token on the #__private_macro line. + CheckEndOfDirective("__private_macro"); // Okay, we finally have a valid identifier to undef. MacroInfo *MI = getMacroInfo(MacroNameTok.getIdentifierInfo()); |