Create a new PrintingPolicy class, which we pass down through the AST
printing logic to help customize the output. For now, we use this
rather than a special flag to suppress the "struct" when printing
"struct X" and to print the Boolean type as "bool" in C++ but "_Bool"
in C.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72590 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 00eaa36..c719b0b 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -44,6 +44,7 @@
BuiltinInfo.InitializeTargetBuiltins(Target);
if (InitializeBuiltins)
this->InitializeBuiltins(idents);
+ PrintingPolicy.CPlusPlus = LangOpts.CPlusPlus;
}
ASTContext::~ASTContext() {
diff --git a/lib/AST/CFG.cpp b/lib/AST/CFG.cpp
index af2a891..9f2f207 100644
--- a/lib/AST/CFG.cpp
+++ b/lib/AST/CFG.cpp
@@ -1525,23 +1525,26 @@
llvm::raw_ostream& OS;
StmtPrinterHelper* Helper;
+ PrintingPolicy Policy;
+
public:
- CFGBlockTerminatorPrint(llvm::raw_ostream& os, StmtPrinterHelper* helper)
- : OS(os), Helper(helper) {}
+ CFGBlockTerminatorPrint(llvm::raw_ostream& os, StmtPrinterHelper* helper,
+ const PrintingPolicy &Policy = PrintingPolicy())
+ : OS(os), Helper(helper), Policy(Policy) {}
void VisitIfStmt(IfStmt* I) {
OS << "if ";
- I->getCond()->printPretty(OS,Helper);
+ I->getCond()->printPretty(OS,Helper,Policy);
}
// Default case.
- void VisitStmt(Stmt* Terminator) { Terminator->printPretty(OS); }
+ void VisitStmt(Stmt* Terminator) { Terminator->printPretty(OS, Helper, Policy); }
void VisitForStmt(ForStmt* F) {
OS << "for (" ;
if (F->getInit()) OS << "...";
OS << "; ";
- if (Stmt* C = F->getCond()) C->printPretty(OS,Helper);
+ if (Stmt* C = F->getCond()) C->printPretty(OS, Helper, Policy);
OS << "; ";
if (F->getInc()) OS << "...";
OS << ")";
@@ -1549,33 +1552,33 @@
void VisitWhileStmt(WhileStmt* W) {
OS << "while " ;
- if (Stmt* C = W->getCond()) C->printPretty(OS,Helper);
+ if (Stmt* C = W->getCond()) C->printPretty(OS, Helper, Policy);
}
void VisitDoStmt(DoStmt* D) {
OS << "do ... while ";
- if (Stmt* C = D->getCond()) C->printPretty(OS,Helper);
+ if (Stmt* C = D->getCond()) C->printPretty(OS, Helper, Policy);
}
void VisitSwitchStmt(SwitchStmt* Terminator) {
OS << "switch ";
- Terminator->getCond()->printPretty(OS,Helper);
+ Terminator->getCond()->printPretty(OS, Helper, Policy);
}
void VisitConditionalOperator(ConditionalOperator* C) {
- C->getCond()->printPretty(OS,Helper);
+ C->getCond()->printPretty(OS, Helper, Policy);
OS << " ? ... : ...";
}
void VisitChooseExpr(ChooseExpr* C) {
OS << "__builtin_choose_expr( ";
- C->getCond()->printPretty(OS,Helper);
+ C->getCond()->printPretty(OS, Helper, Policy);
OS << " )";
}
void VisitIndirectGotoStmt(IndirectGotoStmt* I) {
OS << "goto *";
- I->getTarget()->printPretty(OS,Helper);
+ I->getTarget()->printPretty(OS, Helper, Policy);
}
void VisitBinaryOperator(BinaryOperator* B) {
@@ -1584,7 +1587,7 @@
return;
}
- B->getLHS()->printPretty(OS,Helper);
+ B->getLHS()->printPretty(OS, Helper, Policy);
switch (B->getOpcode()) {
case BinaryOperator::LOr:
@@ -1599,7 +1602,7 @@
}
void VisitExpr(Expr* E) {
- E->printPretty(OS,Helper);
+ E->printPretty(OS, Helper, Policy);
}
};
@@ -1629,7 +1632,7 @@
}
}
- Terminator->printPretty(OS, Helper);
+ Terminator->printPretty(OS, Helper, /*FIXME:*/PrintingPolicy());
// Expressions need a newline.
if (isa<Expr>(Terminator)) OS << '\n';
@@ -1662,10 +1665,10 @@
OS << L->getName();
else if (CaseStmt* C = dyn_cast<CaseStmt>(Terminator)) {
OS << "case ";
- C->getLHS()->printPretty(OS);
+ C->getLHS()->printPretty(OS, Helper, /*FIXME:*/PrintingPolicy());
if (C->getRHS()) {
OS << " ... ";
- C->getRHS()->printPretty(OS);
+ C->getRHS()->printPretty(OS, Helper, /*FIXME:*/PrintingPolicy());
}
}
else if (isa<DefaultStmt>(Terminator))
@@ -1703,7 +1706,7 @@
if (Helper) Helper->setBlockID(-1);
- CFGBlockTerminatorPrint TPrinter(OS,Helper);
+ CFGBlockTerminatorPrint TPrinter(OS, Helper, /*FIXME*/PrintingPolicy());
TPrinter.Visit(const_cast<Stmt*>(B.getTerminator()));
OS << '\n';
}
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 0639140..cb3ec1f 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -18,6 +18,7 @@
#include "clang/AST/ASTContext.h"
#include "clang/AST/Stmt.h"
#include "clang/AST/Expr.h"
+#include "clang/AST/PrettyPrinter.h"
#include "clang/Basic/IdentifierTable.h"
#include <vector>
@@ -224,10 +225,13 @@
if (const ClassTemplateSpecializationDecl *Spec
= dyn_cast<ClassTemplateSpecializationDecl>(Ctx)) {
const TemplateArgumentList &TemplateArgs = Spec->getTemplateArgs();
+ PrintingPolicy Policy;
+ Policy.CPlusPlus = true;
std::string TemplateArgsStr
= TemplateSpecializationType::PrintTemplateArgumentList(
TemplateArgs.getFlatArgumentList(),
- TemplateArgs.flat_size());
+ TemplateArgs.flat_size(),
+ Policy);
Names.push_back(Spec->getIdentifier()->getName() + TemplateArgsStr);
} else if (const NamedDecl *ND = dyn_cast<NamedDecl>(Ctx))
Names.push_back(ND->getNameAsString());
diff --git a/lib/AST/NestedNameSpecifier.cpp b/lib/AST/NestedNameSpecifier.cpp
index c94a4da..09522a2 100644
--- a/lib/AST/NestedNameSpecifier.cpp
+++ b/lib/AST/NestedNameSpecifier.cpp
@@ -14,6 +14,7 @@
#include "clang/AST/NestedNameSpecifier.h"
#include "clang/AST/ASTContext.h"
#include "clang/AST/Decl.h"
+#include "clang/AST/PrettyPrinter.h"
#include "clang/AST/Type.h"
#include "llvm/Support/raw_ostream.h"
#include <cassert>
@@ -104,9 +105,11 @@
/// \brief Print this nested name specifier to the given output
/// stream.
-void NestedNameSpecifier::print(llvm::raw_ostream &OS) const {
+void
+NestedNameSpecifier::print(llvm::raw_ostream &OS,
+ const PrintingPolicy &Policy) const {
if (getPrefix())
- getPrefix()->print(OS);
+ getPrefix()->print(OS, Policy);
switch (getKind()) {
case Identifier:
@@ -134,10 +137,9 @@
if (const QualifiedNameType *QualT = dyn_cast<QualifiedNameType>(T))
T = QualT->getNamedType().getTypePtr();
- if (const TagType *TagT = dyn_cast<TagType>(T))
- TagT->getAsStringInternal(TypeStr, true);
- else
- T->getAsStringInternal(TypeStr);
+ PrintingPolicy InnerPolicy(Policy);
+ InnerPolicy.SuppressTagKind = true;
+ T->getAsStringInternal(TypeStr, InnerPolicy);
OS << TypeStr;
break;
}
@@ -152,5 +154,7 @@
}
void NestedNameSpecifier::dump() {
- print(llvm::errs());
+ PrintingPolicy Policy;
+ Policy.CPlusPlus = true;
+ print(llvm::errs(), Policy);
}
diff --git a/lib/AST/StmtDumper.cpp b/lib/AST/StmtDumper.cpp
index 821eb55..b24e912 100644
--- a/lib/AST/StmtDumper.cpp
+++ b/lib/AST/StmtDumper.cpp
@@ -15,6 +15,7 @@
#include "clang/AST/StmtVisitor.h"
#include "clang/AST/DeclObjC.h"
#include "clang/AST/DeclCXX.h"
+#include "clang/AST/PrettyPrinter.h"
#include "clang/Basic/SourceManager.h"
#include "llvm/Support/Compiler.h"
#include <cstdio>
@@ -39,6 +40,8 @@
/// out so that we can print out deltas from then on out.
const char *LastLocFilename;
unsigned LastLocLine;
+
+ PrintingPolicy Policy;
public:
StmtDumper(SourceManager *sm, FILE *f, unsigned maxDepth)
: SM(sm), F(f), IndentLevel(0-1), MaxDepth(maxDepth) {
@@ -223,7 +226,7 @@
}
std::string Name = VD->getNameAsString();
- VD->getType().getAsStringInternal(Name);
+ VD->getType().getAsStringInternal(Name, Policy);
fprintf(F, "%s", Name.c_str());
// If this is a vardecl with an initializer, emit it.
diff --git a/lib/AST/StmtPrinter.cpp b/lib/AST/StmtPrinter.cpp
index 80aa2d1..e6a2bad 100644
--- a/lib/AST/StmtPrinter.cpp
+++ b/lib/AST/StmtPrinter.cpp
@@ -29,14 +29,20 @@
class VISIBILITY_HIDDEN StmtPrinter : public StmtVisitor<StmtPrinter> {
llvm::raw_ostream &OS;
unsigned IndentLevel;
- bool NoIndent;
clang::PrinterHelper* Helper;
+ PrintingPolicy Policy;
+
public:
- StmtPrinter(llvm::raw_ostream &os, PrinterHelper* helper, unsigned I=0,
- bool noIndent=false) :
- OS(os), IndentLevel(I), NoIndent(noIndent), Helper(helper) {}
+ StmtPrinter(llvm::raw_ostream &os, PrinterHelper* helper,
+ const PrintingPolicy &Policy = PrintingPolicy(),
+ unsigned Indentation = 0)
+ : OS(os), IndentLevel(Indentation), Helper(helper), Policy(Policy) {}
- void PrintStmt(Stmt *S, int SubIndent = 1) {
+ void PrintStmt(Stmt *S) {
+ PrintStmt(S, Policy.Indentation);
+ }
+
+ void PrintStmt(Stmt *S, int SubIndent) {
IndentLevel += SubIndent;
if (S && isa<Expr>(S)) {
// If this is an expr used in a stmt context, indent and newline it.
@@ -66,10 +72,8 @@
}
llvm::raw_ostream &Indent(int Delta = 0) {
- if (!NoIndent) {
- for (int i = 0, e = IndentLevel+Delta; i < e; ++i)
- OS << " ";
- } else NoIndent = false;
+ for (int i = 0, e = IndentLevel+Delta; i < e; ++i)
+ OS << " ";
return OS;
}
@@ -123,7 +127,7 @@
}
std::string Name = VD->getNameAsString();
- VD->getType().getAsStringInternal(Name);
+ VD->getType().getAsStringInternal(Name, Policy);
OS << Name;
// If this is a vardecl with an initializer, emit it.
@@ -531,12 +535,12 @@
void StmtPrinter::VisitQualifiedDeclRefExpr(QualifiedDeclRefExpr *Node) {
NamedDecl *D = Node->getDecl();
- Node->getQualifier()->print(OS);
+ Node->getQualifier()->print(OS, Policy);
OS << D->getNameAsString();
}
void StmtPrinter::VisitUnresolvedDeclRefExpr(UnresolvedDeclRefExpr *Node) {
- Node->getQualifier()->print(OS);
+ Node->getQualifier()->print(OS, Policy);
OS << Node->getDeclName().getAsString();
}
@@ -1065,11 +1069,11 @@
std::string TypeS;
if (Expr *Size = E->getArraySize()) {
llvm::raw_string_ostream s(TypeS);
- Size->printPretty(s);
+ Size->printPretty(s, Helper, Policy);
s.flush();
TypeS = "[" + TypeS + "]";
}
- E->getAllocatedType().getAsStringInternal(TypeS);
+ E->getAllocatedType().getAsStringInternal(TypeS, Policy);
OS << TypeS;
if (E->isParenTypeId())
OS << ")";
@@ -1221,7 +1225,7 @@
E = BD->param_end(); AI != E; ++AI) {
if (AI != BD->param_begin()) OS << ", ";
ParamStr = (*AI)->getNameAsString();
- (*AI)->getType().getAsStringInternal(ParamStr);
+ (*AI)->getType().getAsStringInternal(ParamStr, Policy);
OS << ParamStr;
}
@@ -1242,17 +1246,18 @@
//===----------------------------------------------------------------------===//
void Stmt::dumpPretty() const {
- printPretty(llvm::errs());
+ printPretty(llvm::errs(), 0, PrintingPolicy());
}
void Stmt::printPretty(llvm::raw_ostream &OS, PrinterHelper* Helper,
- unsigned I, bool NoIndent) const {
+ const PrintingPolicy &Policy,
+ unsigned Indentation) const {
if (this == 0) {
OS << "<NULL>";
return;
}
- StmtPrinter P(OS, Helper, I, NoIndent);
+ StmtPrinter P(OS, Helper, Policy, Indentation);
P.Visit(const_cast<Stmt*>(this));
}
diff --git a/lib/AST/TemplateName.cpp b/lib/AST/TemplateName.cpp
index c437e7b..3613da7 100644
--- a/lib/AST/TemplateName.cpp
+++ b/lib/AST/TemplateName.cpp
@@ -14,6 +14,7 @@
#include "clang/AST/TemplateName.h"
#include "clang/AST/DeclTemplate.h"
#include "clang/AST/NestedNameSpecifier.h"
+#include "clang/AST/PrettyPrinter.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
@@ -38,23 +39,27 @@
return true;
}
-void TemplateName::print(llvm::raw_ostream &OS, bool SuppressNNS) const {
+void
+TemplateName::print(llvm::raw_ostream &OS, const PrintingPolicy &Policy,
+ bool SuppressNNS) const {
if (TemplateDecl *Template = Storage.dyn_cast<TemplateDecl *>())
OS << Template->getIdentifier()->getName();
else if (QualifiedTemplateName *QTN = getAsQualifiedTemplateName()) {
if (!SuppressNNS)
- QTN->getQualifier()->print(OS);
+ QTN->getQualifier()->print(OS, Policy);
if (QTN->hasTemplateKeyword())
OS << "template ";
OS << QTN->getTemplateDecl()->getIdentifier()->getName();
} else if (DependentTemplateName *DTN = getAsDependentTemplateName()) {
if (!SuppressNNS)
- DTN->getQualifier()->print(OS);
+ DTN->getQualifier()->print(OS, Policy);
OS << "template ";
OS << DTN->getName()->getName();
}
}
void TemplateName::dump() const {
- print(llvm::errs());
+ PrintingPolicy Policy;
+ Policy.CPlusPlus = true;
+ print(llvm::errs(), Policy);
}
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
index c04e827..64433cd 100644
--- a/lib/AST/Type.cpp
+++ b/lib/AST/Type.cpp
@@ -17,6 +17,7 @@
#include "clang/AST/DeclObjC.h"
#include "clang/AST/DeclTemplate.h"
#include "clang/AST/Expr.h"
+#include "clang/AST/PrettyPrinter.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
@@ -895,11 +896,11 @@
return false;
}
-const char *BuiltinType::getName() const {
+const char *BuiltinType::getName(bool CPlusPlus) const {
switch (getKind()) {
default: assert(0 && "Unknown builtin type!");
case Void: return "void";
- case Bool: return "_Bool";
+ case Bool: return CPlusPlus? "bool" : "_Bool";
case Char_S: return "char";
case Char_U: return "char";
case SChar: return "signed char";
@@ -1099,8 +1100,9 @@
//===----------------------------------------------------------------------===//
void QualType::dump(const char *msg) const {
+ PrintingPolicy Policy;
std::string R = "identifier";
- getAsStringInternal(R);
+ getAsStringInternal(R, Policy);
if (msg)
fprintf(stderr, "%s: %s\n", msg, R.c_str());
else
@@ -1112,7 +1114,7 @@
void Type::dump() const {
std::string S = "identifier";
- getAsStringInternal(S);
+ getAsStringInternal(S, PrintingPolicy());
fprintf(stderr, "%s\n", S.c_str());
}
@@ -1129,7 +1131,15 @@
S += (NonePrinted+" restrict"), NonePrinted = false;
}
-void QualType::getAsStringInternal(std::string &S) const {
+std::string QualType::getAsString() const {
+ std::string S;
+ getAsStringInternal(S, PrintingPolicy());
+ return S;
+}
+
+void
+QualType::getAsStringInternal(std::string &S,
+ const PrintingPolicy &Policy) const {
if (isNull()) {
S += "NULL TYPE";
return;
@@ -1145,20 +1155,21 @@
S = TQS;
}
- getTypePtr()->getAsStringInternal(S);
+ getTypePtr()->getAsStringInternal(S, Policy);
}
-void BuiltinType::getAsStringInternal(std::string &S) const {
+void BuiltinType::getAsStringInternal(std::string &S,
+ const PrintingPolicy &Policy) const {
if (S.empty()) {
- S = getName();
+ S = getName(Policy.CPlusPlus);
} else {
// Prefix the basic type, e.g. 'int X'.
S = ' ' + S;
- S = getName() + S;
+ S = getName(Policy.CPlusPlus) + S;
}
}
-void FixedWidthIntType::getAsStringInternal(std::string &S) const {
+void FixedWidthIntType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const {
// FIXME: Once we get bitwidth attribute, write as
// "int __attribute__((bitwidth(x)))".
std::string prefix = "__clang_fixedwidth";
@@ -1173,12 +1184,12 @@
}
-void ComplexType::getAsStringInternal(std::string &S) const {
- ElementType->getAsStringInternal(S);
+void ComplexType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const {
+ ElementType->getAsStringInternal(S, Policy);
S = "_Complex " + S;
}
-void ExtQualType::getAsStringInternal(std::string &S) const {
+void ExtQualType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const {
bool NeedsSpace = false;
if (AddressSpace) {
S = "__attribute__((address_space("+llvm::utostr_32(AddressSpace)+")))" + S;
@@ -1194,10 +1205,10 @@
S += "strong";
S += ")))";
}
- BaseType->getAsStringInternal(S);
+ BaseType->getAsStringInternal(S, Policy);
}
-void PointerType::getAsStringInternal(std::string &S) const {
+void PointerType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const {
S = '*' + S;
// Handle things like 'int (*A)[4];' correctly.
@@ -1205,15 +1216,15 @@
if (isa<ArrayType>(getPointeeType()))
S = '(' + S + ')';
- getPointeeType().getAsStringInternal(S);
+ getPointeeType().getAsStringInternal(S, Policy);
}
-void BlockPointerType::getAsStringInternal(std::string &S) const {
+void BlockPointerType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const {
S = '^' + S;
- PointeeType.getAsStringInternal(S);
+ PointeeType.getAsStringInternal(S, Policy);
}
-void LValueReferenceType::getAsStringInternal(std::string &S) const {
+void LValueReferenceType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const {
S = '&' + S;
// Handle things like 'int (&A)[4];' correctly.
@@ -1221,10 +1232,10 @@
if (isa<ArrayType>(getPointeeType()))
S = '(' + S + ')';
- getPointeeType().getAsStringInternal(S);
+ getPointeeType().getAsStringInternal(S, Policy);
}
-void RValueReferenceType::getAsStringInternal(std::string &S) const {
+void RValueReferenceType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const {
S = "&&" + S;
// Handle things like 'int (&&A)[4];' correctly.
@@ -1232,12 +1243,12 @@
if (isa<ArrayType>(getPointeeType()))
S = '(' + S + ')';
- getPointeeType().getAsStringInternal(S);
+ getPointeeType().getAsStringInternal(S, Policy);
}
-void MemberPointerType::getAsStringInternal(std::string &S) const {
+void MemberPointerType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const {
std::string C;
- Class->getAsStringInternal(C);
+ Class->getAsStringInternal(C, Policy);
C += "::*";
S = C + S;
@@ -1246,24 +1257,24 @@
if (isa<ArrayType>(getPointeeType()))
S = '(' + S + ')';
- getPointeeType().getAsStringInternal(S);
+ getPointeeType().getAsStringInternal(S, Policy);
}
-void ConstantArrayType::getAsStringInternal(std::string &S) const {
+void ConstantArrayType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const {
S += '[';
S += llvm::utostr(getSize().getZExtValue());
S += ']';
- getElementType().getAsStringInternal(S);
+ getElementType().getAsStringInternal(S, Policy);
}
-void IncompleteArrayType::getAsStringInternal(std::string &S) const {
+void IncompleteArrayType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const {
S += "[]";
- getElementType().getAsStringInternal(S);
+ getElementType().getAsStringInternal(S, Policy);
}
-void VariableArrayType::getAsStringInternal(std::string &S) const {
+void VariableArrayType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const {
S += '[';
if (getIndexTypeQualifier()) {
@@ -1279,15 +1290,15 @@
if (getSizeExpr()) {
std::string SStr;
llvm::raw_string_ostream s(SStr);
- getSizeExpr()->printPretty(s);
+ getSizeExpr()->printPretty(s, 0, Policy);
S += s.str();
}
S += ']';
- getElementType().getAsStringInternal(S);
+ getElementType().getAsStringInternal(S, Policy);
}
-void DependentSizedArrayType::getAsStringInternal(std::string &S) const {
+void DependentSizedArrayType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const {
S += '[';
if (getIndexTypeQualifier()) {
@@ -1303,57 +1314,57 @@
if (getSizeExpr()) {
std::string SStr;
llvm::raw_string_ostream s(SStr);
- getSizeExpr()->printPretty(s);
+ getSizeExpr()->printPretty(s, 0, Policy);
S += s.str();
}
S += ']';
- getElementType().getAsStringInternal(S);
+ getElementType().getAsStringInternal(S, Policy);
}
-void VectorType::getAsStringInternal(std::string &S) const {
+void VectorType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const {
// FIXME: We prefer to print the size directly here, but have no way
// to get the size of the type.
S += " __attribute__((__vector_size__(";
S += llvm::utostr_32(NumElements); // convert back to bytes.
S += " * sizeof(" + ElementType.getAsString() + "))))";
- ElementType.getAsStringInternal(S);
+ ElementType.getAsStringInternal(S, Policy);
}
-void ExtVectorType::getAsStringInternal(std::string &S) const {
+void ExtVectorType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const {
S += " __attribute__((ext_vector_type(";
S += llvm::utostr_32(NumElements);
S += ")))";
- ElementType.getAsStringInternal(S);
+ ElementType.getAsStringInternal(S, Policy);
}
-void TypeOfExprType::getAsStringInternal(std::string &InnerString) const {
+void TypeOfExprType::getAsStringInternal(std::string &InnerString, const PrintingPolicy &Policy) const {
if (!InnerString.empty()) // Prefix the basic type, e.g. 'typeof(e) X'.
InnerString = ' ' + InnerString;
std::string Str;
llvm::raw_string_ostream s(Str);
- getUnderlyingExpr()->printPretty(s);
+ getUnderlyingExpr()->printPretty(s, 0, Policy);
InnerString = "typeof " + s.str() + InnerString;
}
-void TypeOfType::getAsStringInternal(std::string &InnerString) const {
+void TypeOfType::getAsStringInternal(std::string &InnerString, const PrintingPolicy &Policy) const {
if (!InnerString.empty()) // Prefix the basic type, e.g. 'typeof(t) X'.
InnerString = ' ' + InnerString;
std::string Tmp;
- getUnderlyingType().getAsStringInternal(Tmp);
+ getUnderlyingType().getAsStringInternal(Tmp, Policy);
InnerString = "typeof(" + Tmp + ")" + InnerString;
}
-void FunctionNoProtoType::getAsStringInternal(std::string &S) const {
+void FunctionNoProtoType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const {
// If needed for precedence reasons, wrap the inner part in grouping parens.
if (!S.empty())
S = "(" + S + ")";
S += "()";
- getResultType().getAsStringInternal(S);
+ getResultType().getAsStringInternal(S, Policy);
}
-void FunctionProtoType::getAsStringInternal(std::string &S) const {
+void FunctionProtoType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const {
// If needed for precedence reasons, wrap the inner part in grouping parens.
if (!S.empty())
S = "(" + S + ")";
@@ -1362,7 +1373,7 @@
std::string Tmp;
for (unsigned i = 0, e = getNumArgs(); i != e; ++i) {
if (i) S += ", ";
- getArgType(i).getAsStringInternal(Tmp);
+ getArgType(i).getAsStringInternal(Tmp, Policy);
S += Tmp;
Tmp.clear();
}
@@ -1377,17 +1388,17 @@
}
S += ")";
- getResultType().getAsStringInternal(S);
+ getResultType().getAsStringInternal(S, Policy);
}
-void TypedefType::getAsStringInternal(std::string &InnerString) const {
+void TypedefType::getAsStringInternal(std::string &InnerString, const PrintingPolicy &Policy) const {
if (!InnerString.empty()) // Prefix the basic type, e.g. 'typedefname X'.
InnerString = ' ' + InnerString;
InnerString = getDecl()->getIdentifier()->getName() + InnerString;
}
-void TemplateTypeParmType::getAsStringInternal(std::string &InnerString) const {
+void TemplateTypeParmType::getAsStringInternal(std::string &InnerString, const PrintingPolicy &Policy) const {
if (!InnerString.empty()) // Prefix the basic type, e.g. 'parmname X'.
InnerString = ' ' + InnerString;
@@ -1398,9 +1409,11 @@
InnerString = Name->getName() + InnerString;
}
-std::string TemplateSpecializationType::PrintTemplateArgumentList(
- const TemplateArgument *Args,
- unsigned NumArgs) {
+std::string
+TemplateSpecializationType::PrintTemplateArgumentList(
+ const TemplateArgument *Args,
+ unsigned NumArgs,
+ const PrintingPolicy &Policy) {
std::string SpecString;
SpecString += '<';
for (unsigned Arg = 0; Arg < NumArgs; ++Arg) {
@@ -1411,7 +1424,7 @@
std::string ArgString;
switch (Args[Arg].getKind()) {
case TemplateArgument::Type:
- Args[Arg].getAsType().getAsStringInternal(ArgString);
+ Args[Arg].getAsType().getAsStringInternal(ArgString, Policy);
break;
case TemplateArgument::Declaration:
@@ -1424,7 +1437,7 @@
case TemplateArgument::Expression: {
llvm::raw_string_ostream s(ArgString);
- Args[Arg].getAsExpr()->printPretty(s);
+ Args[Arg].getAsExpr()->printPretty(s, 0, Policy);
break;
}
}
@@ -1451,35 +1464,33 @@
void
TemplateSpecializationType::
-getAsStringInternal(std::string &InnerString) const {
+getAsStringInternal(std::string &InnerString, const PrintingPolicy &Policy) const {
std::string SpecString;
{
llvm::raw_string_ostream OS(SpecString);
- Template.print(OS);
+ Template.print(OS, Policy);
}
- SpecString += PrintTemplateArgumentList(getArgs(), getNumArgs());
+ SpecString += PrintTemplateArgumentList(getArgs(), getNumArgs(), Policy);
if (InnerString.empty())
InnerString.swap(SpecString);
else
InnerString = SpecString + ' ' + InnerString;
}
-void QualifiedNameType::getAsStringInternal(std::string &InnerString) const {
+void QualifiedNameType::getAsStringInternal(std::string &InnerString, const PrintingPolicy &Policy) const {
std::string MyString;
{
llvm::raw_string_ostream OS(MyString);
- NNS->print(OS);
+ NNS->print(OS, Policy);
}
std::string TypeStr;
- if (const TagType *TagT = dyn_cast<TagType>(NamedType.getTypePtr())) {
- // Suppress printing of 'enum', 'struct', 'union', or 'class'.
- TagT->getAsStringInternal(TypeStr, true);
- } else
- NamedType.getAsStringInternal(TypeStr);
+ PrintingPolicy InnerPolicy(Policy);
+ InnerPolicy.SuppressTagKind = true;
+ NamedType.getAsStringInternal(TypeStr, InnerPolicy);
MyString += TypeStr;
if (InnerString.empty())
@@ -1488,20 +1499,22 @@
InnerString = MyString + ' ' + InnerString;
}
-void TypenameType::getAsStringInternal(std::string &InnerString) const {
+void TypenameType::getAsStringInternal(std::string &InnerString, const PrintingPolicy &Policy) const {
std::string MyString;
{
llvm::raw_string_ostream OS(MyString);
OS << "typename ";
- NNS->print(OS);
+ NNS->print(OS, Policy);
if (const IdentifierInfo *Ident = getIdentifier())
OS << Ident->getName();
else if (const TemplateSpecializationType *Spec = getTemplateId()) {
- Spec->getTemplateName().print(OS, true);
+ Spec->getTemplateName().print(OS, Policy, true);
OS << TemplateSpecializationType::PrintTemplateArgumentList(
- Spec->getArgs(), Spec->getNumArgs());
+ Spec->getArgs(),
+ Spec->getNumArgs(),
+ Policy);
}
}
@@ -1511,14 +1524,15 @@
InnerString = MyString + ' ' + InnerString;
}
-void ObjCInterfaceType::getAsStringInternal(std::string &InnerString) const {
+void ObjCInterfaceType::getAsStringInternal(std::string &InnerString, const PrintingPolicy &Policy) const {
if (!InnerString.empty()) // Prefix the basic type, e.g. 'typedefname X'.
InnerString = ' ' + InnerString;
InnerString = getDecl()->getIdentifier()->getName() + InnerString;
}
-void ObjCQualifiedInterfaceType::getAsStringInternal(
- std::string &InnerString) const {
+void
+ObjCQualifiedInterfaceType::getAsStringInternal(std::string &InnerString,
+ const PrintingPolicy &Policy) const {
if (!InnerString.empty()) // Prefix the basic type, e.g. 'typedefname X'.
InnerString = ' ' + InnerString;
std::string ObjCQIString = getDecl()->getNameAsString();
@@ -1535,7 +1549,7 @@
InnerString = ObjCQIString + InnerString;
}
-void ObjCQualifiedIdType::getAsStringInternal(std::string &InnerString) const {
+void ObjCQualifiedIdType::getAsStringInternal(std::string &InnerString, const PrintingPolicy &Policy) const {
if (!InnerString.empty()) // Prefix the basic type, e.g. 'typedefname X'.
InnerString = ' ' + InnerString;
std::string ObjCQIString = "id";
@@ -1549,16 +1563,11 @@
InnerString = ObjCQIString + InnerString;
}
-void TagType::getAsStringInternal(std::string &InnerString) const {
- getAsStringInternal(InnerString, false);
-}
-
-void TagType::getAsStringInternal(std::string &InnerString,
- bool SuppressTagKind) const {
+void TagType::getAsStringInternal(std::string &InnerString, const PrintingPolicy &Policy) const {
if (!InnerString.empty()) // Prefix the basic type, e.g. 'typedefname X'.
InnerString = ' ' + InnerString;
- const char *Kind = SuppressTagKind? 0 : getDecl()->getKindName();
+ const char *Kind = Policy.SuppressTagKind? 0 : getDecl()->getKindName();
const char *ID;
if (const IdentifierInfo *II = getDecl()->getIdentifier())
ID = II->getName();
@@ -1577,7 +1586,8 @@
std::string TemplateArgsStr
= TemplateSpecializationType::PrintTemplateArgumentList(
TemplateArgs.getFlatArgumentList(),
- TemplateArgs.flat_size());
+ TemplateArgs.flat_size(),
+ Policy);
InnerString = TemplateArgsStr + InnerString;
}
@@ -1597,7 +1607,8 @@
std::string TemplateArgsStr
= TemplateSpecializationType::PrintTemplateArgumentList(
TemplateArgs.getFlatArgumentList(),
- TemplateArgs.flat_size());
+ TemplateArgs.flat_size(),
+ Policy);
MyPart = Spec->getIdentifier()->getName() + TemplateArgsStr;
} else if (TagDecl *Tag = dyn_cast<TagDecl>(DC)) {
if (TypedefDecl *Typedef = Tag->getTypedefForAnonDecl())
diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp
index 0c6ed4b..049e716 100644
--- a/lib/CodeGen/CGDebugInfo.cpp
+++ b/lib/CodeGen/CGDebugInfo.cpp
@@ -150,7 +150,9 @@
uint64_t Align = M->getContext().getTypeAlign(BT);
uint64_t Offset = 0;
- return DebugFactory.CreateBasicType(Unit, BT->getName(), Unit, 0, Size, Align,
+ return DebugFactory.CreateBasicType(Unit,
+ BT->getName(M->getContext().getLangOptions().CPlusPlus),
+ Unit, 0, Size, Align,
Offset, /*flags*/ 0, Encoding);
}
diff --git a/lib/Frontend/ASTConsumers.cpp b/lib/Frontend/ASTConsumers.cpp
index ba482b0..c35f4c9 100644
--- a/lib/Frontend/ASTConsumers.cpp
+++ b/lib/Frontend/ASTConsumers.cpp
@@ -20,6 +20,7 @@
#include "clang/AST/AST.h"
#include "clang/AST/ASTConsumer.h"
#include "clang/AST/ASTContext.h"
+#include "clang/AST/PrettyPrinter.h"
#include "clang/CodeGen/ModuleBuilder.h"
#include "llvm/Module.h"
#include "llvm/Support/Streams.h"
@@ -35,10 +36,13 @@
class DeclPrinter {
public:
llvm::raw_ostream& Out;
+ PrintingPolicy Policy;
unsigned Indentation;
- DeclPrinter(llvm::raw_ostream* out) : Out(out ? *out : llvm::errs()),
- Indentation(0) {}
+ DeclPrinter(llvm::raw_ostream* out,
+ const PrintingPolicy &Policy = PrintingPolicy())
+ : Out(out ? *out : llvm::errs()), Policy(Policy),
+ Indentation(0) {}
DeclPrinter() : Out(llvm::errs()), Indentation(0) {}
virtual ~DeclPrinter();
@@ -84,7 +88,7 @@
// FIXME: Pass a context here so we can use getBody()
if (FD->getBodyIfAvailable()) {
Out << ' ';
- FD->getBodyIfAvailable()->printPretty(Out, 0, Indentation, true);
+ FD->getBodyIfAvailable()->printPretty(Out, 0, Policy);
Out << '\n';
}
} else if (isa<ObjCMethodDecl>(D)) {
@@ -162,7 +166,7 @@
PrintLinkageSpec(LSD);
} else if (FileScopeAsmDecl *AD = dyn_cast<FileScopeAsmDecl>(D)) {
Out << "asm(";
- AD->getAsmString()->printPretty(Out);
+ AD->getAsmString()->printPretty(Out, 0, Policy);
Out << ")\n";
} else if (NamedDecl *ND = dyn_cast<NamedDecl>(D)) {
Print(ND);
@@ -193,12 +197,12 @@
}
std::string Name = ND->getNameAsString();
// This forms: "int a".
- dyn_cast<ValueDecl>(ND)->getType().getAsStringInternal(Name);
+ dyn_cast<ValueDecl>(ND)->getType().getAsStringInternal(Name, Policy);
Out << Name;
if (VarDecl *Var = dyn_cast<VarDecl>(ND)) {
if (Var->getInit()) {
Out << " = ";
- Var->getInit()->printPretty(Out);
+ Var->getInit()->printPretty(Out, 0, Policy);
}
}
Out << ";\n";
@@ -252,7 +256,7 @@
std::string ParamStr;
if (HasBody) ParamStr = FD->getParamDecl(i)->getNameAsString();
- FT->getArgType(i).getAsStringInternal(ParamStr);
+ FT->getArgType(i).getAsStringInternal(ParamStr, Policy);
Proto += ParamStr;
}
@@ -266,7 +270,7 @@
Proto += "()";
}
- AFT->getResultType().getAsStringInternal(Proto);
+ AFT->getResultType().getAsStringInternal(Proto, Policy);
Out << Proto;
if (!FD->getBodyIfAvailable())
@@ -276,7 +280,7 @@
void DeclPrinter::PrintTypeDefDecl(TypedefDecl *TD) {
std::string S = TD->getNameAsString();
- TD->getUnderlyingType().getAsStringInternal(S);
+ TD->getUnderlyingType().getAsStringInternal(S, Policy);
Out << "typedef " << S << ";\n";
}
@@ -358,7 +362,7 @@
PrintObjCMethodDecl(OMD);
if (OMD->getBody()) {
Out << ' ';
- OMD->getBody()->printPretty(Out);
+ OMD->getBody()->printPretty(Out, 0, Policy);
Out << '\n';
}
}
@@ -371,7 +375,7 @@
PrintObjCMethodDecl(OMD);
if (OMD->getBody()) {
Out << ' ';
- OMD->getBody()->printPretty(Out);
+ OMD->getBody()->printPretty(Out, 0, Policy);
Out << '\n';
}
}
diff --git a/lib/Frontend/DocumentXML.cpp b/lib/Frontend/DocumentXML.cpp
index 80060f5..ac1d7d2 100644
--- a/lib/Frontend/DocumentXML.cpp
+++ b/lib/Frontend/DocumentXML.cpp
@@ -194,7 +194,7 @@
// don't use the get methods as they strip of typedef infos
if (const BuiltinType *BT = dyn_cast<BuiltinType>(i->first)) {
addSubNode("FundamentalType");
- addAttribute("name", BT->getName());
+ addAttribute("name", BT->getName(Ctx->getLangOptions().CPlusPlus));
}
else if (const PointerType *PT = dyn_cast<PointerType>(i->first)) {
addSubNode("PointerType");
diff --git a/lib/Frontend/RewriteBlocks.cpp b/lib/Frontend/RewriteBlocks.cpp
index 29f0578..6d0f10d 100644
--- a/lib/Frontend/RewriteBlocks.cpp
+++ b/lib/Frontend/RewriteBlocks.cpp
@@ -396,7 +396,7 @@
E = BD->param_end(); AI != E; ++AI) {
if (AI != BD->param_begin()) S += ", ";
ParamStr = (*AI)->getNameAsString();
- (*AI)->getType().getAsStringInternal(ParamStr);
+ (*AI)->getType().getAsStringInternal(ParamStr, Context->PrintingPolicy);
S += ParamStr;
}
if (FT->isVariadic()) {
@@ -413,7 +413,8 @@
E = BlockByRefDecls.end(); I != E; ++I) {
S += " ";
std::string Name = (*I)->getNameAsString();
- Context->getPointerType((*I)->getType()).getAsStringInternal(Name);
+ Context->getPointerType((*I)->getType()).getAsStringInternal(Name,
+ Context->PrintingPolicy);
S += Name + " = __cself->" + (*I)->getNameAsString() + "; // bound by ref\n";
}
// Next, emit a declaration for all "by copy" declarations.
@@ -434,7 +435,7 @@
if (isBlockPointerType((*I)->getType()))
S += "struct __block_impl *";
else
- (*I)->getType().getAsStringInternal(Name);
+ (*I)->getType().getAsStringInternal(Name, Context->PrintingPolicy);
S += Name + " = __cself->" + (*I)->getNameAsString() + "; // bound by copy\n";
}
std::string RewrittenStr = RewrittenBlockExprs[CE];
@@ -515,8 +516,8 @@
S += "struct __block_impl *";
Constructor += ", void *" + ArgName;
} else {
- (*I)->getType().getAsStringInternal(FieldName);
- (*I)->getType().getAsStringInternal(ArgName);
+ (*I)->getType().getAsStringInternal(FieldName, Context->PrintingPolicy);
+ (*I)->getType().getAsStringInternal(ArgName, Context->PrintingPolicy);
Constructor += ", " + ArgName;
}
S += FieldName + ";\n";
@@ -541,8 +542,10 @@
S += "struct __block_impl *";
Constructor += ", void *" + ArgName;
} else {
- Context->getPointerType((*I)->getType()).getAsStringInternal(FieldName);
- Context->getPointerType((*I)->getType()).getAsStringInternal(ArgName);
+ Context->getPointerType((*I)->getType()).getAsStringInternal(FieldName,
+ Context->PrintingPolicy);
+ Context->getPointerType((*I)->getType()).getAsStringInternal(ArgName,
+ Context->PrintingPolicy);
Constructor += ", " + ArgName;
}
S += FieldName + "; // by ref\n";
@@ -947,7 +950,8 @@
std::string FunkTypeStr;
// Get a pointer to the function type so we can cast appropriately.
- Context->getPointerType(QualType(Exp->getFunctionType(),0)).getAsStringInternal(FunkTypeStr);
+ Context->getPointerType(QualType(Exp->getFunctionType(),0))
+ .getAsStringInternal(FunkTypeStr, Context->PrintingPolicy);
// Rewrite the closure block with a compound literal. The first cast is
// to prevent warnings from the C compiler.
diff --git a/lib/Frontend/RewriteObjC.cpp b/lib/Frontend/RewriteObjC.cpp
index 79ae08c..55f0b40 100644
--- a/lib/Frontend/RewriteObjC.cpp
+++ b/lib/Frontend/RewriteObjC.cpp
@@ -944,9 +944,10 @@
if (isTopLevelBlockPointerType(PDecl->getType())) {
// Make sure we convert "t (^)(...)" to "t (*)(...)".
const BlockPointerType *BPT = PDecl->getType()->getAsBlockPointerType();
- Context->getPointerType(BPT->getPointeeType()).getAsStringInternal(Name);
+ Context->getPointerType(BPT->getPointeeType()).getAsStringInternal(Name,
+ Context->PrintingPolicy);
} else
- PDecl->getType().getAsStringInternal(Name);
+ PDecl->getType().getAsStringInternal(Name, Context->PrintingPolicy);
ResultStr += Name;
}
}
@@ -3600,7 +3601,7 @@
E = BD->param_end(); AI != E; ++AI) {
if (AI != BD->param_begin()) S += ", ";
ParamStr = (*AI)->getNameAsString();
- (*AI)->getType().getAsStringInternal(ParamStr);
+ (*AI)->getType().getAsStringInternal(ParamStr, Context->PrintingPolicy);
S += ParamStr;
}
if (FT->isVariadic()) {
@@ -3617,7 +3618,8 @@
E = BlockByRefDecls.end(); I != E; ++I) {
S += " ";
std::string Name = (*I)->getNameAsString();
- Context->getPointerType((*I)->getType()).getAsStringInternal(Name);
+ Context->getPointerType((*I)->getType()).getAsStringInternal(Name,
+ Context->PrintingPolicy);
S += Name + " = __cself->" + (*I)->getNameAsString() + "; // bound by ref\n";
}
// Next, emit a declaration for all "by copy" declarations.
@@ -3638,7 +3640,7 @@
if (isTopLevelBlockPointerType((*I)->getType()))
S += "struct __block_impl *";
else
- (*I)->getType().getAsStringInternal(Name);
+ (*I)->getType().getAsStringInternal(Name, Context->PrintingPolicy);
S += Name + " = __cself->" + (*I)->getNameAsString() + "; // bound by copy\n";
}
std::string RewrittenStr = RewrittenBlockExprs[CE];
@@ -3719,8 +3721,8 @@
S += "struct __block_impl *";
Constructor += ", void *" + ArgName;
} else {
- (*I)->getType().getAsStringInternal(FieldName);
- (*I)->getType().getAsStringInternal(ArgName);
+ (*I)->getType().getAsStringInternal(FieldName, Context->PrintingPolicy);
+ (*I)->getType().getAsStringInternal(ArgName, Context->PrintingPolicy);
Constructor += ", " + ArgName;
}
S += FieldName + ";\n";
@@ -3745,8 +3747,10 @@
S += "struct __block_impl *";
Constructor += ", void *" + ArgName;
} else {
- Context->getPointerType((*I)->getType()).getAsStringInternal(FieldName);
- Context->getPointerType((*I)->getType()).getAsStringInternal(ArgName);
+ Context->getPointerType((*I)->getType()).getAsStringInternal(FieldName,
+ Context->PrintingPolicy);
+ Context->getPointerType((*I)->getType()).getAsStringInternal(ArgName,
+ Context->PrintingPolicy);
Constructor += ", " + ArgName;
}
S += FieldName + "; // by ref\n";
diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp
index 411d5a1..1212d07 100644
--- a/lib/Sema/Sema.cpp
+++ b/lib/Sema/Sema.cpp
@@ -38,7 +38,7 @@
QualType Ty(QualType::getFromOpaquePtr(reinterpret_cast<void*>(Val)));
// FIXME: Playing with std::string is really slow.
- S = Ty.getAsString();
+ S = Ty.getAsString(Context.PrintingPolicy);
// If this is a sugared type (like a typedef, typeof, etc), then unwrap one
// level of the sugar so that the type is more obvious to the user.
diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp
index 42f36d1..3cac739 100644
--- a/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/lib/Sema/SemaTemplateInstantiate.cpp
@@ -149,7 +149,8 @@
std::string TemplateArgsStr
= TemplateSpecializationType::PrintTemplateArgumentList(
Active->TemplateArgs,
- Active->NumTemplateArgs);
+ Active->NumTemplateArgs,
+ Context.PrintingPolicy);
Diags.Report(FullSourceLoc(Active->PointOfInstantiation, SourceMgr),
diag::note_default_arg_instantiation_here)
<< (Template->getNameAsString() + TemplateArgsStr)