replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove the ASTContext parameter from the printing related methods of Decl. 

llvm-svn: 74503
This commit is contained in:
Argyrios Kyrtzidis 2009-06-30 02:35:04 +00:00
parent 4e1a72b37b
commit 8a803cc351
5 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/include/clang/AST/DeclBase.h
View File

@ -347,15 +347,13 @@ public:
/// Destroy - Call destructors and release memory.
virtual void Destroy(ASTContext& C);
void print(llvm::raw_ostream &Out, ASTContext &Context,
void print(llvm::raw_ostream &Out, unsigned Indentation = 0);
void print(llvm::raw_ostream &Out, const PrintingPolicy &Policy,
unsigned Indentation = 0);
void print(llvm::raw_ostream &Out, ASTContext &Context,
const PrintingPolicy &Policy, unsigned Indentation = 0);
static void printGroup(Decl** Begin, unsigned NumDecls,
llvm::raw_ostream &Out, ASTContext &Context,
const PrintingPolicy &Policy,
llvm::raw_ostream &Out, const PrintingPolicy &Policy,
unsigned Indentation = 0);
void dump(ASTContext &Context);
void dump();
private:
const Attr *getAttrsImpl() const;

27
clang/lib/AST/DeclPrinter.cpp
View File

@ -74,14 +74,13 @@ namespace {
};
}
void Decl::print(llvm::raw_ostream &Out, ASTContext &Context,
unsigned Indentation) {
print(Out, Context, Context.PrintingPolicy, Indentation);
void Decl::print(llvm::raw_ostream &Out, unsigned Indentation) {
print(Out, getASTContext().PrintingPolicy, Indentation);
}
void Decl::print(llvm::raw_ostream &Out, ASTContext &Context,
const PrintingPolicy &Policy, unsigned Indentation) {
DeclPrinter Printer(Out, Context, Policy, Indentation);
void Decl::print(llvm::raw_ostream &Out, const PrintingPolicy &Policy,
unsigned Indentation) {
DeclPrinter Printer(Out, getASTContext(), Policy, Indentation);
Printer.Visit(this);
}
@ -112,11 +111,10 @@ static QualType getDeclType(Decl* D) {
}
void Decl::printGroup(Decl** Begin, unsigned NumDecls,
llvm::raw_ostream &Out, ASTContext &Context,
const PrintingPolicy &Policy,
llvm::raw_ostream &Out, const PrintingPolicy &Policy,
unsigned Indentation) {
if (NumDecls == 1) {
(*Begin)->print(Out, Context, Policy, Indentation);
(*Begin)->print(Out, Policy, Indentation);
return;
}
@ -127,7 +125,7 @@ void Decl::printGroup(Decl** Begin, unsigned NumDecls,
PrintingPolicy SubPolicy(Policy);
if (TD && TD->isDefinition()) {
TD->print(Out, Context, Policy, Indentation);
TD->print(Out, Policy, Indentation);
Out << " ";
SubPolicy.SuppressTag = true;
}
@ -142,12 +140,12 @@ void Decl::printGroup(Decl** Begin, unsigned NumDecls,
SubPolicy.SuppressSpecifiers = true;
}
(*Begin)->print(Out, Context, SubPolicy, Indentation);
(*Begin)->print(Out, SubPolicy, Indentation);
}
}
void Decl::dump(ASTContext &Context) {
print(llvm::errs(), Context);
void Decl::dump() {
print(llvm::errs());
}
llvm::raw_ostream& DeclPrinter::Indent() {
@ -158,8 +156,7 @@ llvm::raw_ostream& DeclPrinter::Indent() {
void DeclPrinter::ProcessDeclGroup(llvm::SmallVectorImpl<Decl*>& Decls) {
this->Indent();
Decl::printGroup(Decls.data(), Decls.size(), Out, Context,
Policy, Indentation);
Decl::printGroup(Decls.data(), Decls.size(), Out, Policy, Indentation);
Out << ";\n";
Decls.clear();

5
clang/lib/AST/StmtPrinter.cpp
View File

@ -114,7 +114,7 @@ void StmtPrinter::PrintRawCompoundStmt(CompoundStmt *Node) {
}
void StmtPrinter::PrintRawDecl(Decl *D) {
D->print(OS, Context, Policy, IndentLevel);
D->print(OS, Policy, IndentLevel);
}
void StmtPrinter::PrintRawDeclStmt(DeclStmt *S) {
@ -123,8 +123,7 @@ void StmtPrinter::PrintRawDeclStmt(DeclStmt *S) {
for ( ; Begin != End; ++Begin)
Decls.push_back(*Begin);
Decl::printGroup(Decls.data(), Decls.size(), OS, Context, Policy,
IndentLevel);
Decl::printGroup(Decls.data(), Decls.size(), OS, Policy, IndentLevel);
}
void StmtPrinter::VisitNullStmt(NullStmt *Node) {

6
clang/lib/Frontend/ASTConsumers.cpp
View File

@ -44,7 +44,7 @@ namespace {
virtual void HandleTranslationUnit(ASTContext &Context) {
PrintingPolicy Policy = Context.PrintingPolicy;
Policy.Dump = Dump;
Context.getTranslationUnitDecl()->print(Out, Context, Policy);
Context.getTranslationUnitDecl()->print(Out, Policy);
}
};
} // end anonymous namespace
@ -114,7 +114,7 @@ namespace {
void ASTViewer::HandleTopLevelSingleDecl(Decl *D) {
if (FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) {
FD->print(llvm::errs(), *Context);
FD->print(llvm::errs());
if (FD->getBodyIfAvailable()) {
llvm::cerr << '\n';
@ -125,7 +125,7 @@ void ASTViewer::HandleTopLevelSingleDecl(Decl *D) {
}
if (ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(D)) {
MD->print(llvm::errs(), *Context);
MD->print(llvm::errs());
if (MD->getBody()) {
llvm::cerr << '\n';

2
clang/lib/Frontend/ResolveLocation.cpp
View File

@ -287,7 +287,7 @@ void LocResolverBase::FixRange(SourceRange &Range) {
void LocResolverBase::print(Decl *D) {
llvm::raw_ostream &OS = llvm::outs();
OS << "#### DECL ####\n";
D->print(OS, Ctx);
D->print(OS);
OS << " <";
D->getLocStart().print(OS, Ctx.getSourceManager());
OS << " > - <";