commit dee7359a59e6327206ba710cf22f3851e2a0fc48
author Chris Lattner <sabre@nondot.org> Sat Dec 15 20:48:40 2007 +0000
committer Chris Lattner <sabre@nondot.org> Sat Dec 15 20:48:40 2007 +0000
tree a089e68daf69d43f2e20efbc4fe56892fcb8bf49
parent f816f77480e70caadfdbd741cf17d84a6be30b71

simplify the interfaces to ProcessInputFile and InitializePreprocessor


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

Driver/clang.cpp

diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index bcffeb7..806e7b1 100644
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -507,15 +507,13 @@
 ///
 static unsigned InitializePreprocessor(Preprocessor &PP,
                                        const std::string &InFile,
-                                       SourceManager &SourceMgr,
-                                       HeaderSearch &HeaderInfo,
-                                       const LangOptions &LangInfo,
                                        std::vector<char> &PredefineBuffer) {
   
-  FileManager &FileMgr = HeaderInfo.getFileMgr();
+  FileManager &FileMgr = PP.getFileManager();
   
   // Figure out where to get and map in the main file.
   unsigned MainFileID = 0;
+  SourceManager &SourceMgr = PP.getSourceManager();
   if (InFile != "-") {
     const FileEntry *File = FileMgr.getFile(InFile);
     if (File) MainFileID = SourceMgr.createFileID(File, SourceLocation());
@@ -879,10 +877,7 @@
 ///
 static void ProcessInputFile(Preprocessor &PP, unsigned MainFileID,
                              const std::string &InFile,
-                             SourceManager &SourceMgr,
-                             TextDiagnostics &OurDiagnosticClient,
-                             HeaderSearch &HeaderInfo,
-                             const LangOptions &LangInfo) {
+                             TextDiagnostics &OurDiagnosticClient) {
 
   ASTConsumer* Consumer = NULL;
   bool ClearSourceMgr = false;
@@ -890,7 +885,7 @@
   switch (ProgAction) {
   default:
     Consumer = CreateASTConsumer(InFile, PP.getDiagnostics(),
-                                 HeaderInfo.getFileMgr(),
+                                 PP.getFileManager(),
                                  PP.getLangOptions());
     
     if (!Consumer) {      
@@ -923,7 +918,7 @@
   }
     
   case PrintPreprocessedInput:       // -E mode.
-    DoPrintPreprocessedInput(MainFileID, PP, LangInfo);
+    DoPrintPreprocessedInput(MainFileID, PP);
     ClearSourceMgr = true;
     break;
     
@@ -955,18 +950,17 @@
     fprintf(stderr, "\nSTATISTICS FOR '%s':\n", InFile.c_str());
     PP.PrintStats();
     PP.getIdentifierTable().PrintStats();
-    HeaderInfo.PrintStats();
+    PP.getHeaderSearchInfo().PrintStats();
     if (ClearSourceMgr)
-      SourceMgr.PrintStats();
+      PP.getSourceManager().PrintStats();
     fprintf(stderr, "\n");
   }
 
   // For a multi-file compilation, some things are ok with nuking the source 
   // manager tables, other require stable fileid/macroid's across multiple
   // files.
-  if (ClearSourceMgr) {
-    SourceMgr.clearIDTables();
-  }
+  if (ClearSourceMgr)
+    PP.getSourceManager().clearIDTables();
 }
 
 static void ProcessSerializedFile(const std::string& InFile, Diagnostic& Diag,
@@ -1112,14 +1106,11 @@
       Preprocessor PP(Diags, LangInfo, *Target, SourceMgr, HeaderInfo);
       
       std::vector<char> PredefineBuffer;
-      unsigned MainFileID = InitializePreprocessor(PP, InFile, SourceMgr,
-                                                   HeaderInfo, LangInfo,
-                                                   PredefineBuffer);
+      unsigned MainFileID = InitializePreprocessor(PP, InFile, PredefineBuffer);
       
       if (!MainFileID) continue;
 
-      ProcessInputFile(PP, MainFileID, InFile, SourceMgr,
-                       *DiagClient, HeaderInfo, LangInfo);
+      ProcessInputFile(PP, MainFileID, InFile, *DiagClient);
       
       HeaderInfo.ClearFileInfo();