commit 4e9899f6dbaa798ed73f347f5fc5dc6eb0909744
author Ted Kremenek <kremenek@apple.com> Thu Apr 17 22:31:54 2008 +0000
committer Ted Kremenek <kremenek@apple.com> Thu Apr 17 22:31:54 2008 +0000
tree 15e66daac43c681523a05a5df269e2a6d9f19c8d
parent 31001eddddf07044ba74d73fa5a52149f88da931

class Preprocessor: Now owns the "predefines" char*; it deletes [] it in its dstor.

clang.cpp: InitializePreprocessor now makes a copy of the contents of PredefinesBuffer and
  passes it to the preprocessor object.
  
clang.cpp: DriverPreprocessorFactory now calls "InitializePreprocessor" instead of this being done in main().

html::HighlightMacros() now takes a PreprocessorFactory, allowing it to conjure up a new
Preprocessor to highlight macros.

class HTMLDiagnostics now takes a PreprocessorFactory* that it can use for html::HighlightMacros().
Updated clients of HTMLDiagnostics to use this new interface.


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

Driver/ASTConsumers.cpp

diff --git a/Driver/ASTConsumers.cpp b/Driver/ASTConsumers.cpp
index e6e8f45..9653526 100644
--- a/Driver/ASTConsumers.cpp
+++ b/Driver/ASTConsumers.cpp
@@ -649,17 +649,18 @@
   Diagnostic &Diags;
   ASTContext* Ctx;
   Preprocessor* PP;
+  PreprocessorFactory* PPF;
   const std::string& HTMLDir;
   bool Visualize;
   bool TrimGraph;
   llvm::OwningPtr<PathDiagnosticClient> PD;
   bool AnalyzeAll;
 public:
-  CheckerConsumer(Diagnostic &diags, Preprocessor* pp,
+  CheckerConsumer(Diagnostic &diags, Preprocessor* pp, PreprocessorFactory* ppf,
                   const std::string& fname,
                   const std::string& htmldir,
                   bool visualize, bool trim, bool analyzeAll)
-    : CFGVisitor(fname), Diags(diags), PP(pp), HTMLDir(htmldir),
+    : CFGVisitor(fname), Diags(diags), PP(pp), PPF(ppf), HTMLDir(htmldir),
       Visualize(visualize), TrimGraph(trim), AnalyzeAll(analyzeAll) {}
   
   virtual void Initialize(ASTContext &Context) { Ctx = &Context; }    
@@ -687,7 +688,7 @@
   // Lazily create the diagnostic client.
   
   if (!HTMLDir.empty() && PD.get() == NULL)
-    PD.reset(CreateHTMLDiagnosticClient(HTMLDir, PP));
+    PD.reset(CreateHTMLDiagnosticClient(HTMLDir, PP, PPF));
   
 
   if (!Visualize) {
@@ -734,9 +735,11 @@
 class GRSimpleValsVisitor : public CheckerConsumer {
 public:
   GRSimpleValsVisitor(Diagnostic &diags, Preprocessor* pp,
+                      PreprocessorFactory* ppf,
                       const std::string& fname, const std::string& htmldir,
                       bool visualize, bool trim, bool analyzeAll)
-  : CheckerConsumer(diags, pp, fname, htmldir, visualize, trim, analyzeAll) {}
+  : CheckerConsumer(diags, pp, ppf, fname, htmldir, visualize,
+                    trim, analyzeAll) {}
 
   virtual const char* getCheckerName() { return "GRSimpleVals"; }
   
@@ -748,12 +751,13 @@
 
 ASTConsumer* clang::CreateGRSimpleVals(Diagnostic &Diags,
                                        Preprocessor* PP,
+                                       PreprocessorFactory* PPF,
                                        const std::string& FunctionName,
                                        const std::string& HTMLDir,
                                        bool Visualize, bool TrimGraph,
                                        bool AnalyzeAll) {
   
-  return new GRSimpleValsVisitor(Diags, PP, FunctionName, HTMLDir,
+  return new GRSimpleValsVisitor(Diags, PP, PPF, FunctionName, HTMLDir,
                                  Visualize, TrimGraph, AnalyzeAll);
 }
 
@@ -765,10 +769,12 @@
 class CFRefCountCheckerVisitor : public CheckerConsumer {
 public:
   CFRefCountCheckerVisitor(Diagnostic &diags, Preprocessor* pp,
+                           PreprocessorFactory* ppf,
                            const std::string& fname,
                            const std::string& htmldir,
                            bool visualize, bool trim, bool analyzeAll)
-  : CheckerConsumer(diags, pp, fname, htmldir, visualize, trim, analyzeAll) {}
+  : CheckerConsumer(diags, pp, ppf, fname, htmldir, visualize,
+                    trim, analyzeAll) {}
   
   virtual const char* getCheckerName() { return "CFRefCountChecker"; }
   
@@ -780,12 +786,13 @@
 
 ASTConsumer* clang::CreateCFRefChecker(Diagnostic &Diags,
                                        Preprocessor* PP,
+                                       PreprocessorFactory* PPF,
                                        const std::string& FunctionName,
                                        const std::string& HTMLDir,
                                        bool Visualize, bool TrimGraph,
                                        bool AnalyzeAll) {
   
-  return new CFRefCountCheckerVisitor(Diags, PP, FunctionName, HTMLDir,
+  return new CFRefCountCheckerVisitor(Diags, PP, PPF, FunctionName, HTMLDir,
                                       Visualize, TrimGraph, AnalyzeAll);
 }