Hi David, Thanks for doing this. One nit: the file PathDiagnosticClients.h should probably be renamed as well.
Cheers, Ted On Sep 25, 2011, at 5:51 PM, David Blaikie wrote: > Author: dblaikie > Date: Sun Sep 25 19:51:36 2011 > New Revision: 140492 > > URL: http://llvm.org/viewvc/llvm-project?rev=140492&view=rev > Log: > Rename PathDiagnosticClient to PathDiagnosticConsumer as per issue 5397 > > Modified: > cfe/trunk/include/clang/Frontend/Analyses.def > cfe/trunk/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h > cfe/trunk/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h > cfe/trunk/include/clang/StaticAnalyzer/Core/PathDiagnosticClients.h > cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h > cfe/trunk/lib/StaticAnalyzer/Core/AnalysisManager.cpp > cfe/trunk/lib/StaticAnalyzer/Core/BugReporter.cpp > cfe/trunk/lib/StaticAnalyzer/Core/CoreEngine.cpp > cfe/trunk/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp > cfe/trunk/lib/StaticAnalyzer/Core/PathDiagnostic.cpp > cfe/trunk/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp > cfe/trunk/lib/StaticAnalyzer/Core/TextPathDiagnostics.cpp > cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp > > Modified: cfe/trunk/include/clang/Frontend/Analyses.def > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/Analyses.def?rev=140492&r1=140491&r2=140492&view=diff > ============================================================================== > --- cfe/trunk/include/clang/Frontend/Analyses.def (original) > +++ cfe/trunk/include/clang/Frontend/Analyses.def Sun Sep 25 19:51:36 2011 > @@ -28,10 +28,10 @@ > #define ANALYSIS_DIAGNOSTICS(NAME, CMDFLAG, DESC, CREATEFN, AUTOCREATE) > #endif > > -ANALYSIS_DIAGNOSTICS(HTML, "html", "Output analysis results using HTML", > createHTMLDiagnosticClient, false) > -ANALYSIS_DIAGNOSTICS(PLIST, "plist", "Output analysis results using Plists", > createPlistDiagnosticClient, true) > -ANALYSIS_DIAGNOSTICS(PLIST_HTML, "plist-html", "Output analysis results > using HTML wrapped with Plists", createPlistHTMLDiagnosticClient, true) > -ANALYSIS_DIAGNOSTICS(TEXT, "text", "Text output of analysis results", > createTextPathDiagnosticClient, true) > +ANALYSIS_DIAGNOSTICS(HTML, "html", "Output analysis results using HTML", > createHTMLDiagnosticConsumer, false) > +ANALYSIS_DIAGNOSTICS(PLIST, "plist", "Output analysis results using Plists", > createPlistDiagnosticConsumer, true) > +ANALYSIS_DIAGNOSTICS(PLIST_HTML, "plist-html", "Output analysis results > using HTML wrapped with Plists", createPlistHTMLDiagnosticConsumer, true) > +ANALYSIS_DIAGNOSTICS(TEXT, "text", "Text output of analysis results", > createTextPathDiagnosticConsumer, true) > > #undef ANALYSIS_STORE > #undef ANALYSIS_CONSTRAINTS > > Modified: > cfe/trunk/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h?rev=140492&r1=140491&r2=140492&view=diff > ============================================================================== > --- cfe/trunk/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h > (original) > +++ cfe/trunk/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h Sun > Sep 25 19:51:36 2011 > @@ -218,7 +218,7 @@ > public: > virtual ~BugReporterData(); > virtual DiagnosticsEngine& getDiagnostic() = 0; > - virtual PathDiagnosticClient* getPathDiagnosticClient() = 0; > + virtual PathDiagnosticConsumer* getPathDiagnosticConsumer() = 0; > virtual ASTContext &getASTContext() = 0; > virtual SourceManager& getSourceManager() = 0; > }; > @@ -264,8 +264,8 @@ > return D.getDiagnostic(); > } > > - PathDiagnosticClient* getPathDiagnosticClient() { > - return D.getPathDiagnosticClient(); > + PathDiagnosticConsumer* getPathDiagnosticConsumer() { > + return D.getPathDiagnosticConsumer(); > } > > /// \brief Iterator over the set of BugTypes tracked by the BugReporter. > > Modified: > cfe/trunk/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h?rev=140492&r1=140491&r2=140492&view=diff > ============================================================================== > --- cfe/trunk/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h > (original) > +++ cfe/trunk/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h > Sun Sep 25 19:51:36 2011 > @@ -45,11 +45,11 @@ > > class PathDiagnostic; > > -class PathDiagnosticClient { > +class PathDiagnosticConsumer { > public: > - PathDiagnosticClient() {} > + PathDiagnosticConsumer() {} > > - virtual ~PathDiagnosticClient() {} > + virtual ~PathDiagnosticConsumer() {} > > virtual void > FlushDiagnostics(SmallVectorImpl<std::string> *FilesMade = 0) = 0; > @@ -70,7 +70,7 @@ > > protected: > /// The actual logic for handling path diagnostics, as implemented > - /// by subclasses of PathDiagnosticClient. > + /// by subclasses of PathDiagnosticConsumer. > virtual void HandlePathDiagnosticImpl(const PathDiagnostic* D) = 0; > > }; > @@ -288,7 +288,7 @@ > const std::string& getString() const { return str; } > > /// getDisplayHint - Return a hint indicating where the diagnostic should > - /// be displayed by the PathDiagnosticClient. > + /// be displayed by the PathDiagnosticConsumer. > DisplayHint getDisplayHint() const { return Hint; } > > virtual PathDiagnosticLocation getLocation() const = 0; > > Modified: cfe/trunk/include/clang/StaticAnalyzer/Core/PathDiagnosticClients.h > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathDiagnosticClients.h?rev=140492&r1=140491&r2=140492&view=diff > ============================================================================== > --- cfe/trunk/include/clang/StaticAnalyzer/Core/PathDiagnosticClients.h > (original) > +++ cfe/trunk/include/clang/StaticAnalyzer/Core/PathDiagnosticClients.h Sun > Sep 25 19:51:36 2011 > @@ -22,18 +22,18 @@ > > namespace ento { > > -class PathDiagnosticClient; > +class PathDiagnosticConsumer; > > -PathDiagnosticClient* > -createHTMLDiagnosticClient(const std::string& prefix, const Preprocessor > &PP); > +PathDiagnosticConsumer* > +createHTMLDiagnosticConsumer(const std::string& prefix, const Preprocessor > &PP); > > -PathDiagnosticClient* > -createPlistDiagnosticClient(const std::string& prefix, const Preprocessor > &PP, > - PathDiagnosticClient *SubPD = 0); > - > -PathDiagnosticClient* > -createTextPathDiagnosticClient(const std::string& prefix, > - const Preprocessor &PP); > +PathDiagnosticConsumer* > +createPlistDiagnosticConsumer(const std::string& prefix, const Preprocessor > &PP, > + PathDiagnosticConsumer *SubPD = 0); > + > +PathDiagnosticConsumer* > +createTextPathDiagnosticConsumer(const std::string& prefix, > + const Preprocessor &PP); > > } // end GR namespace > > > Modified: > cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h?rev=140492&r1=140491&r2=140492&view=diff > ============================================================================== > --- > cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h > (original) > +++ > cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h > Sun Sep 25 19:51:36 2011 > @@ -37,7 +37,7 @@ > DiagnosticsEngine &Diags; > const LangOptions &LangInfo; > > - llvm::OwningPtr<PathDiagnosticClient> PD; > + llvm::OwningPtr<PathDiagnosticConsumer> PD; > > // Configurable components creators. > StoreManagerCreator CreateStoreMgr; > @@ -76,7 +76,7 @@ > > public: > AnalysisManager(ASTContext &ctx, DiagnosticsEngine &diags, > - const LangOptions &lang, PathDiagnosticClient *pd, > + const LangOptions &lang, PathDiagnosticConsumer *pd, > StoreManagerCreator storemgr, > ConstraintManagerCreator constraintmgr, > CheckerManager *checkerMgr, > @@ -126,7 +126,7 @@ > return LangInfo; > } > > - virtual PathDiagnosticClient *getPathDiagnosticClient() { > + virtual PathDiagnosticConsumer *getPathDiagnosticConsumer() { > return PD.get(); > } > > > Modified: cfe/trunk/lib/StaticAnalyzer/Core/AnalysisManager.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/AnalysisManager.cpp?rev=140492&r1=140491&r2=140492&view=diff > ============================================================================== > --- cfe/trunk/lib/StaticAnalyzer/Core/AnalysisManager.cpp (original) > +++ cfe/trunk/lib/StaticAnalyzer/Core/AnalysisManager.cpp Sun Sep 25 19:51:36 > 2011 > @@ -15,7 +15,8 @@ > using namespace ento; > > AnalysisManager::AnalysisManager(ASTContext &ctx, DiagnosticsEngine &diags, > - const LangOptions &lang, > PathDiagnosticClient *pd, > + const LangOptions &lang, > + PathDiagnosticConsumer *pd, > StoreManagerCreator storemgr, > ConstraintManagerCreator constraintmgr, > CheckerManager *checkerMgr, > > Modified: cfe/trunk/lib/StaticAnalyzer/Core/BugReporter.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/BugReporter.cpp?rev=140492&r1=140491&r2=140492&view=diff > ============================================================================== > --- cfe/trunk/lib/StaticAnalyzer/Core/BugReporter.cpp (original) > +++ cfe/trunk/lib/StaticAnalyzer/Core/BugReporter.cpp Sun Sep 25 19:51:36 2011 > @@ -127,13 +127,13 @@ > > class PathDiagnosticBuilder : public BugReporterContext { > BugReport *R; > - PathDiagnosticClient *PDC; > + PathDiagnosticConsumer *PDC; > llvm::OwningPtr<ParentMap> PM; > NodeMapClosure NMC; > public: > PathDiagnosticBuilder(GRBugReporter &br, > BugReport *r, NodeBackMap *Backmap, > - PathDiagnosticClient *pdc) > + PathDiagnosticConsumer *pdc) > : BugReporterContext(br), > R(r), PDC(pdc), NMC(Backmap) {} > > @@ -160,8 +160,8 @@ > > PathDiagnosticLocation getEnclosingStmtLocation(const Stmt *S); > > - PathDiagnosticClient::PathGenerationScheme getGenerationScheme() const { > - return PDC ? PDC->getGenerationScheme() : > PathDiagnosticClient::Extensive; > + PathDiagnosticConsumer::PathGenerationScheme getGenerationScheme() const { > + return PDC ? PDC->getGenerationScheme() : > PathDiagnosticConsumer::Extensive; > } > > bool supportsLogicalOpControlFlow() const { > @@ -1631,7 +1631,8 @@ > const ExplodedNode *N = GPair.second.first; > > // Start building the path diagnostic... > - PathDiagnosticBuilder PDB(*this, R, BackMap.get(), > getPathDiagnosticClient()); > + PathDiagnosticBuilder PDB(*this, R, BackMap.get(), > + getPathDiagnosticConsumer()); > > // Register additional node visitors. > R->addVisitor(new NilReceiverBRVisitor()); > @@ -1656,10 +1657,10 @@ > return; > > switch (PDB.getGenerationScheme()) { > - case PathDiagnosticClient::Extensive: > + case PathDiagnosticConsumer::Extensive: > GenerateExtensivePathDiagnostic(PD, PDB, N); > break; > - case PathDiagnosticClient::Minimal: > + case PathDiagnosticConsumer::Minimal: > GenerateMinimalPathDiagnostic(PD, PDB, N); > break; > } > @@ -1850,7 +1851,7 @@ > if (!exampleReport) > return; > > - PathDiagnosticClient* PD = getPathDiagnosticClient(); > + PathDiagnosticConsumer* PD = getPathDiagnosticConsumer(); > > // FIXME: Make sure we use the 'R' for the path that was actually used. > // Probably doesn't make a difference in practice. > @@ -1906,7 +1907,7 @@ > diagBuilder << *I; > } > > - // Emit a full diagnostic for the path if we have a PathDiagnosticClient. > + // Emit a full diagnostic for the path if we have a PathDiagnosticConsumer. > if (!PD) > return; > > > Modified: cfe/trunk/lib/StaticAnalyzer/Core/CoreEngine.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/CoreEngine.cpp?rev=140492&r1=140491&r2=140492&view=diff > ============================================================================== > --- cfe/trunk/lib/StaticAnalyzer/Core/CoreEngine.cpp (original) > +++ cfe/trunk/lib/StaticAnalyzer/Core/CoreEngine.cpp Sun Sep 25 19:51:36 2011 > @@ -786,7 +786,7 @@ > // The Diagnostic is actually shared when we create ASTUnits from AST > files. > AnalysisManager AMgr(TU->getASTContext(), TU->getDiagnostic(), > OldMgr.getLangOptions(), > - OldMgr.getPathDiagnosticClient(), > + OldMgr.getPathDiagnosticConsumer(), > OldMgr.getStoreManagerCreator(), > OldMgr.getConstraintManagerCreator(), > OldMgr.getCheckerManager(), > > Modified: cfe/trunk/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp?rev=140492&r1=140491&r2=140492&view=diff > ============================================================================== > --- cfe/trunk/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp (original) > +++ cfe/trunk/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp Sun Sep 25 19:51:36 > 2011 > @@ -35,7 +35,7 @@ > > namespace { > > -class HTMLDiagnostics : public PathDiagnosticClient { > +class HTMLDiagnostics : public PathDiagnosticConsumer { > llvm::sys::Path Directory, FilePrefix; > bool createdDir, noDir; > const Preprocessor &PP; > @@ -78,8 +78,8 @@ > FilePrefix.appendComponent("report"); > } > > -PathDiagnosticClient* > -ento::createHTMLDiagnosticClient(const std::string& prefix, > +PathDiagnosticConsumer* > +ento::createHTMLDiagnosticConsumer(const std::string& prefix, > const Preprocessor &PP) { > return new HTMLDiagnostics(prefix, PP); > } > > Modified: cfe/trunk/lib/StaticAnalyzer/Core/PathDiagnostic.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/PathDiagnostic.cpp?rev=140492&r1=140491&r2=140492&view=diff > ============================================================================== > --- cfe/trunk/lib/StaticAnalyzer/Core/PathDiagnostic.cpp (original) > +++ cfe/trunk/lib/StaticAnalyzer/Core/PathDiagnostic.cpp Sun Sep 25 19:51:36 > 2011 > @@ -82,10 +82,10 @@ > Desc(StripTrailingDots(desc)), > Category(StripTrailingDots(category)) {} > > -void PathDiagnosticClient::HandlePathDiagnostic(const PathDiagnostic *D) { > +void PathDiagnosticConsumer::HandlePathDiagnostic(const PathDiagnostic *D) { > // For now this simply forwards to HandlePathDiagnosticImpl. In the future > // we can use this indirection to control for multi-threaded access to > - // the PathDiagnosticClient from multiple bug reporters. > + // the PathDiagnosticConsumer from multiple bug reporters. > HandlePathDiagnosticImpl(D); > } > > > Modified: cfe/trunk/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp?rev=140492&r1=140491&r2=140492&view=diff > ============================================================================== > --- cfe/trunk/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp (original) > +++ cfe/trunk/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp Sun Sep 25 > 19:51:36 2011 > @@ -60,15 +60,15 @@ > } > > namespace { > - class PlistDiagnostics : public PathDiagnosticClient { > + class PlistDiagnostics : public PathDiagnosticConsumer { > std::vector<const PathDiagnostic*> BatchedDiags; > const std::string OutputFile; > const LangOptions &LangOpts; > - llvm::OwningPtr<PathDiagnosticClient> SubPD; > + llvm::OwningPtr<PathDiagnosticConsumer> SubPD; > bool flushed; > public: > PlistDiagnostics(const std::string& prefix, const LangOptions &LangOpts, > - PathDiagnosticClient *subPD); > + PathDiagnosticConsumer *subPD); > > ~PlistDiagnostics() { FlushDiagnostics(NULL); } > > @@ -89,18 +89,18 @@ > > PlistDiagnostics::PlistDiagnostics(const std::string& output, > const LangOptions &LO, > - PathDiagnosticClient *subPD) > + PathDiagnosticConsumer *subPD) > : OutputFile(output), LangOpts(LO), SubPD(subPD), flushed(false) {} > > -PathDiagnosticClient* > -ento::createPlistDiagnosticClient(const std::string& s, const Preprocessor > &PP, > - PathDiagnosticClient *subPD) { > +PathDiagnosticConsumer* > +ento::createPlistDiagnosticConsumer(const std::string& s, const Preprocessor > &PP, > + PathDiagnosticConsumer *subPD) { > return new PlistDiagnostics(s, PP.getLangOptions(), subPD); > } > > -PathDiagnosticClient::PathGenerationScheme > +PathDiagnosticConsumer::PathGenerationScheme > PlistDiagnostics::getGenerationScheme() const { > - if (const PathDiagnosticClient *PD = SubPD.get()) > + if (const PathDiagnosticConsumer *PD = SubPD.get()) > return PD->getGenerationScheme(); > > return Extensive; > > Modified: cfe/trunk/lib/StaticAnalyzer/Core/TextPathDiagnostics.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/TextPathDiagnostics.cpp?rev=140492&r1=140491&r2=140492&view=diff > ============================================================================== > --- cfe/trunk/lib/StaticAnalyzer/Core/TextPathDiagnostics.cpp (original) > +++ cfe/trunk/lib/StaticAnalyzer/Core/TextPathDiagnostics.cpp Sun Sep 25 > 19:51:36 2011 > @@ -23,7 +23,7 @@ > > /// \brief Simple path diagnostic client used for outputting as diagnostic > notes > /// the sequence of events. > -class TextPathDiagnostics : public PathDiagnosticClient { > +class TextPathDiagnostics : public PathDiagnosticConsumer { > const std::string OutputFile; > DiagnosticsEngine &Diag; > > @@ -47,8 +47,8 @@ > > } // end anonymous namespace > > -PathDiagnosticClient* > -ento::createTextPathDiagnosticClient(const std::string& out, > +PathDiagnosticConsumer* > +ento::createTextPathDiagnosticConsumer(const std::string& out, > const Preprocessor &PP) { > return new TextPathDiagnostics(out, PP.getDiagnostics()); > } > > Modified: cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp?rev=140492&r1=140491&r2=140492&view=diff > ============================================================================== > --- cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp (original) > +++ cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp Sun Sep 25 > 19:51:36 2011 > @@ -45,12 +45,12 @@ > // Special PathDiagnosticClients. > //===----------------------------------------------------------------------===// > > -static PathDiagnosticClient* > -createPlistHTMLDiagnosticClient(const std::string& prefix, > +static PathDiagnosticConsumer* > +createPlistHTMLDiagnosticConsumer(const std::string& prefix, > const Preprocessor &PP) { > - PathDiagnosticClient *PD = > - createHTMLDiagnosticClient(llvm::sys::path::parent_path(prefix), PP); > - return createPlistDiagnosticClient(prefix, PP, PD); > + PathDiagnosticConsumer *PD = > + createHTMLDiagnosticConsumer(llvm::sys::path::parent_path(prefix), PP); > + return createPlistDiagnosticConsumer(prefix, PP, PD); > } > > //===----------------------------------------------------------------------===// > @@ -68,7 +68,7 @@ > ArrayRef<std::string> Plugins; > > // PD is owned by AnalysisManager. > - PathDiagnosticClient *PD; > + PathDiagnosticConsumer *PD; > > StoreManagerCreator CreateStoreMgr; > ConstraintManagerCreator CreateConstraintMgr; > @@ -85,7 +85,7 @@ > } > > void DigestAnalyzerOptions() { > - // Create the PathDiagnosticClient. > + // Create the PathDiagnosticConsumer. > if (!OutDir.empty()) { > switch (Opts.AnalysisDiagOpt) { > default: > @@ -96,7 +96,7 @@ > } else if (Opts.AnalysisDiagOpt == PD_TEXT) { > // Create the text client even without a specified output file since > // it just uses diagnostic notes. > - PD = createTextPathDiagnosticClient("", PP); > + PD = createTextPathDiagnosticConsumer("", PP); > } > > // Create the analyzer component creators. > @@ -244,9 +244,9 @@ > // After all decls handled, run checkers on the entire TranslationUnit. > checkerMgr->runCheckersOnEndOfTranslationUnit(TU, *Mgr, BR); > > - // Explicitly destroy the PathDiagnosticClient. This will flush its > output. > + // Explicitly destroy the PathDiagnosticConsumer. This will flush its > output. > // FIXME: This should be replaced with something that doesn't rely on > - // side-effects in PathDiagnosticClient's destructor. This is required when > + // side-effects in PathDiagnosticConsumer's destructor. This is required > when > // used with option -disable-free. > Mgr.reset(NULL); > } > > > _______________________________________________ > cfe-commits mailing list > [email protected] > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
