Rename various classes from PCH to AST.

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

5 files changed, 14 insertions, 14 deletions

diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp
index 7a2a5afe9a..e0aa1b47e7 100644
--- a/lib/Frontend/ASTUnit.cpp
+++ b/lib/Frontend/ASTUnit.cpp
@@ -304,7 +304,7 @@ namespace {
 
 /// \brief Gathers information from ASTReader that will be used to initialize
 /// a Preprocessor.
-class PCHInfoCollector : public PCHReaderListener {
+class PCHInfoCollector : public ASTReaderListener {
   LangOptions &LangOpt;
   HeaderSearch &HSI;
   std::string &TargetTriple;
@@ -463,7 +463,7 @@ ASTUnit *ASTUnit::LoadFromPCHFile(const std::string &Filename,
   Reader->setListener(new PCHInfoCollector(LangInfo, HeaderInfo, TargetTriple,
                                            Predefines, Counter));
 
-  switch (Reader->ReadPCH(Filename)) {
+  switch (Reader->ReadAST(Filename)) {
   case ASTReader::Success:
     break;
 
diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp
index b930702ef4..1cac78e971 100644
--- a/lib/Frontend/CompilerInstance.cpp
+++ b/lib/Frontend/CompilerInstance.cpp
@@ -270,8 +270,8 @@ CompilerInstance::createPCHExternalASTSource(llvm::StringRef Path,
                              DisablePCHValidation));
 
   Reader->setDeserializationListener(
-            static_cast<PCHDeserializationListener *>(DeserializationListener));
-  switch (Reader->ReadPCH(Path)) {
+            static_cast<ASTDeserializationListener *>(DeserializationListener));
+  switch (Reader->ReadAST(Path)) {
   case ASTReader::Success:
     // Set the predefines buffer as suggested by the PCH reader. Typically, the
     // predefines buffer will be empty.
diff --git a/lib/Frontend/FrontendAction.cpp b/lib/Frontend/FrontendAction.cpp
index 40b4e7fa24..906fd9a76c 100644
--- a/lib/Frontend/FrontendAction.cpp
+++ b/lib/Frontend/FrontendAction.cpp
@@ -122,7 +122,7 @@ bool FrontendAction::BeginSourceFile(CompilerInstance &CI,
                                 CI.getPreprocessorOpts().ImplicitPCHInclude,
                                 CI.getPreprocessorOpts().DisablePCHValidation,
                                 CI.getInvocation().getFrontendOpts().ChainedPCH?
-                                 Consumer->GetPCHDeserializationListener() : 0);
+                                 Consumer->GetASTDeserializationListener() : 0);
       if (!CI.getASTContext().getExternalSource())
         goto failure;
     }
diff --git a/lib/Serialization/GeneratePCH.cpp b/lib/Serialization/GeneratePCH.cpp
index ebc3c02b41..f8dabaabc7 100644
--- a/lib/Serialization/GeneratePCH.cpp
+++ b/lib/Serialization/GeneratePCH.cpp
@@ -59,6 +59,6 @@ void PCHGenerator::HandleTranslationUnit(ASTContext &Ctx) {
   Buffer.clear();
 }
 
-PCHDeserializationListener *PCHGenerator::GetPCHDeserializationListener() {
+ASTDeserializationListener *PCHGenerator::GetASTDeserializationListener() {
   return &Writer;
 }
diff --git a/lib/Serialization/PCHReader.cpp b/lib/Serialization/PCHReader.cpp
index 5b6ed8a1d7..72f4974fb8 100644
--- a/lib/Serialization/PCHReader.cpp
+++ b/lib/Serialization/PCHReader.cpp
@@ -46,7 +46,7 @@ using namespace clang;
 // PCH reader validator implementation
 //===----------------------------------------------------------------------===//
 
-PCHReaderListener::~PCHReaderListener() {}
+ASTReaderListener::~ASTReaderListener() {}
 
 bool
 PCHValidator::ReadLanguageOptions(const LangOptions &LangOpts) {
@@ -460,7 +460,7 @@ ASTReader::PerFileData::PerFileData()
 {}
 
 void
-ASTReader::setDeserializationListener(PCHDeserializationListener *Listener) {
+ASTReader::setDeserializationListener(ASTDeserializationListener *Listener) {
   DeserializationListener = Listener;
   if (DeserializationListener)
     DeserializationListener->SetReader(this);
@@ -1419,7 +1419,7 @@ void ASTReader::MaybeAddSystemRootToFilename(std::string &Filename) {
 }
 
 ASTReader::ASTReadResult
-ASTReader::ReadPCHBlock(PerFileData &F) {
+ASTReader::ReadASTBlock(PerFileData &F) {
   llvm::BitstreamCursor &Stream = F.Stream;
 
   if (Stream.EnterSubBlock(pch::PCH_BLOCK_ID)) {
@@ -1528,7 +1528,7 @@ ASTReader::ReadPCHBlock(PerFileData &F) {
       }
 
       // Load the chained file.
-      switch(ReadPCHCore(llvm::StringRef(BlobStart, BlobLen))) {
+      switch(ReadASTCore(llvm::StringRef(BlobStart, BlobLen))) {
       case Failure: return Failure;
         // If we have to ignore the dependency, we'll have to ignore this too.
       case IgnorePCH: return IgnorePCH;
@@ -1792,8 +1792,8 @@ ASTReader::ReadPCHBlock(PerFileData &F) {
   return Failure;
 }
 
-ASTReader::ASTReadResult ASTReader::ReadPCH(const std::string &FileName) {
-  switch(ReadPCHCore(FileName)) {
+ASTReader::ASTReadResult ASTReader::ReadAST(const std::string &FileName) {
+  switch(ReadASTCore(FileName)) {
   case Failure: return Failure;
   case IgnorePCH: return IgnorePCH;
   case Success: break;
@@ -1882,7 +1882,7 @@ ASTReader::ASTReadResult ASTReader::ReadPCH(const std::string &FileName) {
   return Success;
 }
 
-ASTReader::ASTReadResult ASTReader::ReadPCHCore(llvm::StringRef FileName) {
+ASTReader::ASTReadResult ASTReader::ReadASTCore(llvm::StringRef FileName) {
   Chain.push_back(new PerFileData());
   PerFileData &F = *Chain.back();
 
@@ -1934,7 +1934,7 @@ ASTReader::ASTReadResult ASTReader::ReadPCHCore(llvm::StringRef FileName) {
       }
       break;
     case pch::PCH_BLOCK_ID:
-      switch (ReadPCHBlock(F)) {
+      switch (ReadASTBlock(F)) {
       case Success:
         break;