maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Inline dumpFullComment into callers 

It causes confusion over whether it or dumpComment is the more
important. It is easier to refactor with fewer utility methods.

llvm-svn: 348715
This commit is contained in:
Stephen Kelly 2018-12-09 13:18:55 +00:00
parent 7ec37b2b29
commit 570b297673
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clang/lib/AST/ASTDumper.cpp
View File

@ -84,7 +84,6 @@ namespace {
void dumpDecl(const Decl *D); void dumpDecl(const Decl *D);
void dumpStmt(const Stmt *S); void dumpStmt(const Stmt *S);
void dumpFullComment(const FullComment *C);
// Utilities // Utilities
void dumpType(QualType T) { NodeDumper.dumpType(T); } void dumpType(QualType T) { NodeDumper.dumpType(T); }
@ -831,7 +830,7 @@ void ASTDumper::dumpDecl(const Decl *D) {
if (const FullComment *Comment = if (const FullComment *Comment =
D->getASTContext().getLocalCommentForDeclUncached(D)) D->getASTContext().getLocalCommentForDeclUncached(D))
dumpFullComment(Comment); dumpComment(Comment, Comment);
// Decls within functions are visited by the body. // Decls within functions are visited by the body.
if (!isa<FunctionDecl>(*D) && !isa<ObjCMethodDecl>(*D) && if (!isa<FunctionDecl>(*D) && !isa<ObjCMethodDecl>(*D) &&
@ -2304,12 +2303,6 @@ const char *ASTDumper::getCommandName(unsigned CommandID) {
return "<not a builtin command>"; return "<not a builtin command>";
} }
void ASTDumper::dumpFullComment(const FullComment *C) {
if (!C)
return;
dumpComment(C, C);
}
void ASTDumper::dumpComment(const Comment *C, const FullComment *FC) { void ASTDumper::dumpComment(const Comment *C, const FullComment *FC) {
dumpChild([=] { dumpChild([=] {
if (!C) { if (!C) {
@ -2547,12 +2540,16 @@ LLVM_DUMP_METHOD void Comment::dump(const ASTContext &Context) const {
void Comment::dump(raw_ostream &OS, const CommandTraits *Traits, void Comment::dump(raw_ostream &OS, const CommandTraits *Traits,
const SourceManager *SM) const { const SourceManager *SM) const {
const FullComment *FC = dyn_cast<FullComment>(this); const FullComment *FC = dyn_cast<FullComment>(this);
if (!FC)
return;
ASTDumper D(OS, Traits, SM); ASTDumper D(OS, Traits, SM);
D.dumpFullComment(FC); D.dumpComment(FC, FC);
} }
LLVM_DUMP_METHOD void Comment::dumpColor() const { LLVM_DUMP_METHOD void Comment::dumpColor() const {
const FullComment *FC = dyn_cast<FullComment>(this); const FullComment *FC = dyn_cast<FullComment>(this);
if (!FC)
return;
ASTDumper D(llvm::errs(), nullptr, nullptr, /*ShowColors*/true); ASTDumper D(llvm::errs(), nullptr, nullptr, /*ShowColors*/true);
D.dumpFullComment(FC); D.dumpComment(FC, FC);
} }