Re-uglify #public and #private to #__public_macro and #__private_macro.

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

8 files changed, 19 insertions, 17 deletions

diff --git a/include/clang/Basic/TokenKinds.def b/include/clang/Basic/TokenKinds.def
index 7841c201b8..cac0733730 100644
--- a/include/clang/Basic/TokenKinds.def
+++ b/include/clang/Basic/TokenKinds.def
@@ -90,8 +90,8 @@ PPKEYWORD(assert)
 PPKEYWORD(unassert)
 
 // Clang extensions
-PPKEYWORD(public)
-PPKEYWORD(private)
+PPKEYWORD(__public_macro)
+PPKEYWORD(__private_macro)
 
 //===----------------------------------------------------------------------===//
 // Language keywords.
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());
diff --git a/test/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h b/test/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h
index d2a5174dfe..9425f4873c 100644
--- a/test/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h
+++ b/test/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h
@@ -1,5 +1,5 @@
 #include <Module/Module.h> //expected-warning{{treating #include as an import of module 'Module'}}
 
 #define DEPENDS_ON_MODULE 1
-#private DEPENDS_ON_MODULE
+#__private_macro DEPENDS_ON_MODULE
 
diff --git a/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h b/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h
index b13bcdd766..f7f9fb66c9 100644
--- a/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h
+++ b/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h
@@ -1,5 +1,5 @@
 #ifndef MODULE_SUBFRAMEWORK_H
 #define MODULE_SUBFRAMEWORK_H
-#private MODULE_SUBFRAMEWORK_H
+#__private_macro MODULE_SUBFRAMEWORK_H
 char *module_subframework;
 #endif
diff --git a/test/Modules/Inputs/Module.framework/Headers/Module.h b/test/Modules/Inputs/Module.framework/Headers/Module.h
index 832855f8de..738b2221cb 100644
--- a/test/Modules/Inputs/Module.framework/Headers/Module.h
+++ b/test/Modules/Inputs/Module.framework/Headers/Module.h
@@ -14,7 +14,7 @@ const char *getModuleVersion(void);
 @end
 
 #define MODULE_H_MACRO 1
-#private MODULE_H_MACRO
+#__private_macro MODULE_H_MACRO
 
 #include <Module/Sub.h>
 #include <Module/Buried/Treasure.h>
diff --git a/test/Modules/Inputs/macros.h b/test/Modules/Inputs/macros.h
index ed1b46766f..4f535563ad 100644
--- a/test/Modules/Inputs/macros.h
+++ b/test/Modules/Inputs/macros.h
@@ -3,8 +3,8 @@
 #define FLOAT float
 #define DOUBLE double
 
-#public INTEGER
-#private FLOAT
-#private MODULE
+#__public_macro INTEGER
+#__private_macro FLOAT
+#__private_macro MODULE
 
 int (INTEGER);
diff --git a/test/Modules/macros.c b/test/Modules/macros.c
index 3fddcc7ff5..35fde4a9a6 100644
--- a/test/Modules/macros.c
+++ b/test/Modules/macros.c
@@ -22,7 +22,7 @@
 double d;
 DOUBLE *dp = &d;
 
-#public WIBBLE // expected-error{{no macro named 'WIBBLE'}}
+#__public_macro WIBBLE // expected-error{{no macro named 'WIBBLE'}}
 
 void f() {
   // CHECK-PREPROCESSED: int i = INTEGER;