diff options
| -rw-r--r-- | include/clang/AST/Type.h | 91 | ||||
| -rw-r--r-- | lib/AST/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | lib/AST/NestedNameSpecifier.cpp | 2 | ||||
| -rw-r--r-- | lib/AST/Type.cpp | 664 | ||||
| -rw-r--r-- | lib/AST/TypePrinter.cpp | 721 |
5 files changed, 723 insertions, 756 deletions
diff --git a/include/clang/AST/Type.h b/include/clang/AST/Type.h index 8727650031..e13792bc3a 100644 --- a/include/clang/AST/Type.h +++ b/include/clang/AST/Type.h @@ -892,8 +892,6 @@ public: QualType getCanonicalTypeInternal() const { return CanonicalType; } void dump() const; - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const = 0; static bool classof(const Type *) { return true; } }; @@ -979,9 +977,6 @@ public: return TypeKind >= Float && TypeKind <= LongDouble; } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - static bool classof(const Type *T) { return T->getTypeClass() == Builtin; } static bool classof(const BuiltinType *) { return true; } }; @@ -1004,9 +999,6 @@ public: bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - static bool classof(const Type *T) { return T->getTypeClass() == FixedWidthInt; } static bool classof(const FixedWidthIntType *) { return true; } }; @@ -1024,9 +1016,6 @@ class ComplexType : public Type, public llvm::FoldingSetNode { public: QualType getElementType() const { return ElementType; } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -1052,9 +1041,6 @@ class PointerType : public Type, public llvm::FoldingSetNode { friend class ASTContext; // ASTContext creates these. public: - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - QualType getPointeeType() const { return PointeeType; } bool isSugared() const { return false; } @@ -1087,9 +1073,6 @@ public: // Get the pointee type. Pointee is required to always be a function type. QualType getPointeeType() const { return PointeeType; } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -1173,9 +1156,6 @@ class LValueReferenceType : public ReferenceType { {} friend class ASTContext; // ASTContext creates these public: - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -1193,9 +1173,6 @@ class RValueReferenceType : public ReferenceType { } friend class ASTContext; // ASTContext creates these public: - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -1225,9 +1202,6 @@ public: const Type *getClass() const { return Class; } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -1318,9 +1292,6 @@ protected: friend class ASTContext; // ASTContext creates these. public: const llvm::APInt &getSize() const { return Size; } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -1352,9 +1323,6 @@ class IncompleteArrayType : public ArrayType { : ArrayType(IncompleteArray, et, can, sm, tq) {} friend class ASTContext; // ASTContext creates these. public: - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -1418,9 +1386,6 @@ public: SourceLocation getLBracketLoc() const { return Brackets.getBegin(); } SourceLocation getRBracketLoc() const { return Brackets.getEnd(); } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -1474,9 +1439,6 @@ public: SourceLocation getLBracketLoc() const { return Brackets.getBegin(); } SourceLocation getRBracketLoc() const { return Brackets.getEnd(); } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -1526,9 +1488,6 @@ public: QualType getElementType() const { return ElementType; } SourceLocation getAttributeLoc() const { return loc; } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -1571,9 +1530,6 @@ public: QualType getElementType() const { return ElementType; } unsigned getNumElements() const { return NumElements; } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -1649,9 +1605,6 @@ public: return unsigned(idx-1) < NumElements; return false; } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -1715,9 +1668,6 @@ class FunctionNoProtoType : public FunctionType, public llvm::FoldingSetNode { public: // No additional state past what FunctionType provides. - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -1828,9 +1778,6 @@ public: return exception_begin() + NumExceptions; } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -1872,9 +1819,6 @@ public: bool isSugared() const { return true; } QualType desugar() const; - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - static bool classof(const Type *T) { return T->getTypeClass() == Typedef; } static bool classof(const TypedefType *) { return true; } }; @@ -1895,9 +1839,6 @@ public: /// \brief Returns whether this type directly provides sugar. bool isSugared() const { return true; } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - static bool classof(const Type *T) { return T->getTypeClass() == TypeOfExpr; } static bool classof(const TypeOfExprType *) { return true; } }; @@ -1940,9 +1881,6 @@ public: /// \brief Returns whether this type directly provides sugar. bool isSugared() const { return true; } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - static bool classof(const Type *T) { return T->getTypeClass() == TypeOf; } static bool classof(const TypeOfType *) { return true; } }; @@ -1969,9 +1907,6 @@ public: /// \brief Returns whether this type directly provides sugar. bool isSugared() const { return !isDependentType(); } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - static bool classof(const Type *T) { return T->getTypeClass() == Decltype; } static bool classof(const DecltypeType *) { return true; } }; @@ -2016,9 +1951,6 @@ public: bool isBeingDefined() const { return decl.getInt(); } void setBeingDefined(bool Def) const { decl.setInt(Def? 1 : 0); } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - static bool classof(const Type *T) { return T->getTypeClass() >= TagFirst && T->getTypeClass() <= TagLast; } @@ -2133,9 +2065,6 @@ public: } } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - void Profile(llvm::FoldingSetNodeID &ID) { Profile(ID, getUnderlyingType(), getTagKind()); } @@ -2171,9 +2100,6 @@ public: bool isParameterPack() const { return ParameterPack; } IdentifierInfo *getName() const { return Name; } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -2227,9 +2153,6 @@ public: return getCanonicalTypeInternal(); } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return true; } QualType desugar() const { return getReplacementType(); } @@ -2325,9 +2248,6 @@ public: /// \precondition @c isArgType(Arg) const TemplateArgument &getArg(unsigned Idx) const; - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return !isDependentType(); } QualType desugar() const { return getCanonicalTypeInternal(); } @@ -2379,9 +2299,6 @@ public: /// \brief Returns whether this type directly provides sugar. bool isSugared() const { return true; } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - void Profile(llvm::FoldingSetNodeID &ID) { Profile(ID, NNS, NamedType); } @@ -2456,9 +2373,6 @@ public: return Name.dyn_cast<const TemplateSpecializationType *>(); } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -2509,9 +2423,6 @@ public: qual_iterator qual_end() const { return Protocols.end(); } bool qual_empty() const { return Protocols.size() == 0; } - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; - bool isSugared() const { return false; } QualType desugar() const { return QualType(this, 0); } @@ -2597,8 +2508,6 @@ public: void Profile(llvm::FoldingSetNodeID &ID); static void Profile(llvm::FoldingSetNodeID &ID, QualType T, ObjCProtocolDecl **protocols, unsigned NumProtocols); - virtual void getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const; static bool classof(const Type *T) { return T->getTypeClass() == ObjCObjectPointer; } diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt index e541406790..0f0b22d65f 100644 --- a/lib/AST/CMakeLists.txt +++ b/lib/AST/CMakeLists.txt @@ -30,6 +30,7 @@ add_clang_library(clangAST TemplateName.cpp Type.cpp TypeLoc.cpp + TypePrinter.cpp ) add_dependencies(clangAST ClangDiagnosticAST) diff --git a/lib/AST/NestedNameSpecifier.cpp b/lib/AST/NestedNameSpecifier.cpp index d969776aa0..e26c0bba49 100644 --- a/lib/AST/NestedNameSpecifier.cpp +++ b/lib/AST/NestedNameSpecifier.cpp @@ -167,7 +167,7 @@ NestedNameSpecifier::print(llvm::raw_ostream &OS, InnerPolicy); } else { // Print the type normally - T->getAsStringInternal(TypeStr, InnerPolicy); + TypeStr = QualType(T, 0).getAsString(InnerPolicy); } OS << TypeStr; break; diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp index ae78b89e4b..844589fd3e 100644 --- a/lib/AST/Type.cpp +++ b/lib/AST/Type.cpp @@ -906,539 +906,6 @@ QualType QualifierCollector::apply(const Type *T) const { return Context->getQualifiedType(T, *this); } - -//===----------------------------------------------------------------------===// -// Type Printing -//===----------------------------------------------------------------------===// - -void QualType::dump(const char *msg) const { - std::string R = "identifier"; - LangOptions LO; - getAsStringInternal(R, PrintingPolicy(LO)); - if (msg) - fprintf(stderr, "%s: %s\n", msg, R.c_str()); - else - fprintf(stderr, "%s\n", R.c_str()); -} -void QualType::dump() const { - dump(""); -} - -void Type::dump() const { - std::string S = "identifier"; - LangOptions LO; - getAsStringInternal(S, PrintingPolicy(LO)); - fprintf(stderr, "%s\n", S.c_str()); -} - - - -static void AppendTypeQualList(std::string &S, unsigned TypeQuals) { - if (TypeQuals & Qualifiers::Const) { - if (!S.empty()) S += ' '; - S += "const"; - } - if (TypeQuals & Qualifiers::Volatile) { - if (!S.empty()) S += ' '; - S += "volatile"; - } - if (TypeQuals & Qualifiers::Restrict) { - if (!S.empty()) S += ' '; - S += "restrict"; - } -} - -std::string Qualifiers::getAsString() const { - LangOptions LO; - return getAsString(PrintingPolicy(LO)); -} - -// Appends qualifiers to the given string, separated by spaces. Will -// prefix a space if the string is non-empty. Will not append a final -// space. -void Qualifiers::getAsStringInternal(std::string &S, - const PrintingPolicy&) const { - AppendTypeQualList(S, getCVRQualifiers()); - if (unsigned AddressSpace = getAddressSpace()) { - if (!S.empty()) S += ' '; - S += "__attribute__((address_space("; - S += llvm::utostr_32(AddressSpace); - S += ")))"; - } - if (Qualifiers::GC GCAttrType = getObjCGCAttr()) { - if (!S.empty()) S += ' '; - S += "__attribute__((objc_gc("; - if (GCAttrType == Qualifiers::Weak) - S += "weak"; - else - S += "strong"; - S += ")))"; - } -} - -std::string QualType::getAsString() const { - std::string S; - LangOptions LO; - getAsStringInternal(S, PrintingPolicy(LO)); - return S; -} - -void -QualType::getAsStringInternal(std::string &S, - const PrintingPolicy &Policy) const { - if (isNull()) { - S += "NULL TYPE"; - return; - } - - if (Policy.SuppressSpecifiers && getTypePtr()->isSpecifierType()) - return; - - // Print qualifiers as appropriate. - Qualifiers Quals = getQualifiers(); - if (!Quals.empty()) { - std::string TQS; - Quals.getAsStringInternal(TQS, Policy); - - if (!S.empty()) { - TQS += ' '; - TQS += S; - } - std::swap(S, TQS); - } - - getTypePtr()->getAsStringInternal(S, Policy); -} - -void BuiltinType::getAsStringInternal(std::string &S, - const PrintingPolicy &Policy) const { - if (S.empty()) { - S = getName(Policy.LangOpts); - } else { - // Prefix the basic type, e.g. 'int X'. - S = ' ' + S; - S = getName(Policy.LangOpts) + S; - } -} - -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"; - prefix += llvm::utostr_32(Width); - prefix += (char)(Signed ? 'S' : 'U'); - if (S.empty()) { - S = prefix; - } else { - // Prefix the basic type, e.g. 'int X'. - S = prefix + S; - } -} - - -void ComplexType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const { - ElementType->getAsStringInternal(S, Policy); - S = "_Complex " + S; -} - -void PointerType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const { - S = '*' + S; - - // Handle things like 'int (*A)[4];' correctly. - // FIXME: this should include vectors, but vectors use attributes I guess. - if (isa<ArrayType>(getPointeeType())) - S = '(' + S + ')'; - - getPointeeType().getAsStringInternal(S, Policy); -} - -void BlockPointerType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const { - S = '^' + S; - PointeeType.getAsStringInternal(S, Policy); -} - -void LValueReferenceType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const { - S = '&' + S; - - // Handle things like 'int (&A)[4];' correctly. - // FIXME: this should include vectors, but vectors use attributes I guess. - if (isa<ArrayType>(getPointeeTypeAsWritten())) - S = '(' + S + ')'; - - getPointeeTypeAsWritten().getAsStringInternal(S, Policy); -} - -void RValueReferenceType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const { - S = "&&" + S; - - // Handle things like 'int (&&A)[4];' correctly. - // FIXME: this should include vectors, but vectors use attributes I guess. - if (isa<ArrayType>(getPointeeTypeAsWritten())) - S = '(' + S + ')'; - - getPointeeTypeAsWritten().getAsStringInternal(S, Policy); -} - -void MemberPointerType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const { - std::string C; - Class->getAsStringInternal(C, Policy); - C += "::*"; - S = C + S; - - // Handle things like 'int (Cls::*A)[4];' correctly. - // FIXME: this should include vectors, but vectors use attributes I guess. - if (isa<ArrayType>(getPointeeType())) - S = '(' + S + ')'; - - getPointeeType().getAsStringInternal(S, Policy); -} - -void ConstantArrayType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const { - S += '['; - S += llvm::utostr(getSize().getZExtValue()); - S += ']'; - - getElementType().getAsStringInternal(S, Policy); -} - -void IncompleteArrayType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const { - S += "[]"; - - getElementType().getAsStringInternal(S, Policy); -} - -void VariableArrayType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const { - S += '['; - - if (getIndexTypeQualifiers().hasQualifiers()) { - AppendTypeQualList(S, getIndexTypeCVRQualifiers()); - S += ' '; - } - - if (getSizeModifier() == Static) - S += "static"; - else if (getSizeModifier() == Star) - S += '*'; - - if (getSizeExpr()) { - std::string SStr; - llvm::raw_string_ostream s(SStr); - getSizeExpr()->printPretty(s, 0, Policy); - S += s.str(); - } - S += ']'; - - getElementType().getAsStringInternal(S, Policy); -} - -void DependentSizedArrayType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const { - S += '['; - - if (getIndexTypeQualifiers().hasQualifiers()) { - AppendTypeQualList(S, getIndexTypeCVRQualifiers()); - S += ' '; - } - - if (getSizeModifier() == Static) - S += "static"; - else if (getSizeModifier() == Star) - S += '*'; - - if (getSizeExpr()) { - std::string SStr; - llvm::raw_string_ostream s(SStr); - getSizeExpr()->printPretty(s, 0, Policy); - S += s.str(); - } - S += ']'; - - getElementType().getAsStringInternal(S, Policy); -} - -void DependentSizedExtVectorType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const { - getElementType().getAsStringInternal(S, Policy); - - S += " __attribute__((ext_vector_type("; - if (getSizeExpr()) { - std::string SStr; - llvm::raw_string_ostream s(SStr); - getSizeExpr()->printPretty(s, 0, Policy); - S += s.str(); - } - S += ")))"; -} - -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, Policy); -} - -void ExtVectorType::getAsStringInternal(std::string &S, const PrintingPolicy &Policy) const { - S += " __attribute__((ext_vector_type("; - S += llvm::utostr_32(NumElements); - S += ")))"; - ElementType.getAsStringInternal(S, Policy); -} - -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, 0, Policy); - InnerString = "typeof " + s.str() + InnerString; -} - -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, Policy); - InnerString = "typeof(" + Tmp + ")" + InnerString; -} - -void DecltypeType::getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const { - if (!InnerString.empty()) // Prefix the basic type, e.g. 'decltype(t) X'. - InnerString = ' ' + InnerString; - std::string Str; - llvm::raw_string_ostream s(Str); - getUnderlyingExpr()->printPretty(s, 0, Policy); - InnerString = "decltype(" + s.str() + ")" + InnerString; -} - -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 += "()"; - if (getNoReturnAttr()) - S += " __attribute__((noreturn))"; - getResultType().getAsStringInternal(S, Policy); -} - -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 + ")"; - - S += "("; - std::string Tmp; - PrintingPolicy ParamPolicy(Policy); - ParamPolicy.SuppressSpecifiers = false; - for (unsigned i = 0, e = getNumArgs(); i != e; ++i) { - if (i) S += ", "; - getArgType(i).getAsStringInternal(Tmp, ParamPolicy); - S += Tmp; - Tmp.clear(); - } - - if (isVariadic()) { - if (getNumArgs()) - S += ", "; - S += "..."; - } else if (getNumArgs() == 0 && !Policy.LangOpts.CPlusPlus) { - // Do not emit int() if we have a proto, emit 'int(void)'. - S += "void"; - } - - S += ")"; - if (getNoReturnAttr()) - S += " __attribute__((noreturn))"; - getResultType().getAsStringInternal(S, Policy); -} - - -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().str() + InnerString; -} - -void TemplateTypeParmType::getAsStringInternal(std::string &InnerString, const PrintingPolicy &Policy) const { - if (!InnerString.empty()) // Prefix the basic type, e.g. 'parmname X'. - InnerString = ' ' + InnerString; - - if (!Name) - InnerString = "type-parameter-" + llvm::utostr_32(Depth) + '-' + - llvm::utostr_32(Index) + InnerString; - else - InnerString = Name->getName().str() + InnerString; -} - -void SubstTemplateTypeParmType::getAsStringInternal(std::string &InnerString, const PrintingPolicy &Policy) const { - getReplacementType().getAsStringInternal(InnerString, Policy); -} - -static void PrintTemplateArgument(std::string &Buffer, - const TemplateArgument &Arg, - const PrintingPolicy &Policy) { - switch (Arg.getKind()) { - case TemplateArgument::Null: - assert(false && "Null template argument"); - break; - - case TemplateArgument::Type: - Arg.getAsType().getAsStringInternal(Buffer, Policy); - break; - - case TemplateArgument::Declaration: - Buffer = cast<NamedDecl>(Arg.getAsDecl())->getNameAsString(); - break; - - case TemplateArgument::Integral: - Buffer = Arg.getAsIntegral()->toString(10, true); - break; - - case TemplateArgument::Expression: { - llvm::raw_string_ostream s(Buffer); - Arg.getAsExpr()->printPretty(s, 0, Policy); - break; - } - - case TemplateArgument::Pack: - assert(0 && "FIXME: Implement!"); - break; - } -} - -std::string -TemplateSpecializationType::PrintTemplateArgumentList( - const TemplateArgument *Args, - unsigned NumArgs, - const PrintingPolicy &Policy) { - std::string SpecString; - SpecString += '<'; - for (unsigned Arg = 0; Arg < NumArgs; ++Arg) { - if (Arg) - SpecString += ", "; - - // Print the argument into a string. - std::string ArgString; - PrintTemplateArgument(ArgString, Args[Arg], Policy); - - // If this is the first argument and its string representation - // begins with the global scope specifier ('::foo'), add a space - // to avoid printing the diagraph '<:'. - if (!Arg && !ArgString.empty() && ArgString[0] == ':') - SpecString += ' '; - - SpecString += ArgString; - } - - // If the last character of our string is '>', add another space to - // keep the two '>''s separate tokens. We don't *have* to do this in - // C++0x, but it's still good hygiene. - if (SpecString[SpecString.size() - 1] == '>') - SpecString += ' '; - - SpecString += '>'; - - return SpecString; -} - -// Sadly, repeat all that with TemplateArgLoc. -std::string TemplateSpecializationType:: -PrintTemplateArgumentList(const TemplateArgumentLoc *Args, unsigned NumArgs, - const PrintingPolicy &Policy) { - std::string SpecString; - SpecString += '<'; - for (unsigned Arg = 0; Arg < NumArgs; ++Arg) { - if (Arg) - SpecString += ", "; - - // Print the argument into a string. - std::string ArgString; - PrintTemplateArgument(ArgString, Args[Arg].getArgument(), Policy); - - // If this is the first argument and its string representation - // begins with the global scope specifier ('::foo'), add a space - // to avoid printing the diagraph '<:'. - if (!Arg && !ArgString.empty() && ArgString[0] == ':') - SpecString += ' '; - - SpecString += ArgString; - } - - // If the last character of our string is '>', add another space to - // keep the two '>''s separate tokens. We don't *have* to do this in - // C++0x, but it's still good hygiene. - if (SpecString[SpecString.size() - 1] == '>') - SpecString += ' '; - - SpecString += '>'; - - return SpecString; -} - -void -TemplateSpecializationType:: -getAsStringInternal(std::string &InnerString, const PrintingPolicy &Policy) const { - std::string SpecString; - - { - llvm::raw_string_ostream OS(SpecString); - Template.print(OS, Policy); - } - - SpecString += PrintTemplateArgumentList(getArgs(), getNumArgs(), Policy); - if (InnerString.empty()) - InnerString.swap(SpecString); - else - InnerString = SpecString + ' ' + InnerString; -} - -void QualifiedNameType::getAsStringInternal(std::string &InnerString, const PrintingPolicy &Policy) const { - std::string MyString; - - { - llvm::raw_string_ostream OS(MyString); - NNS->print(OS, Policy); - } - - std::string TypeStr; - PrintingPolicy InnerPolicy(Policy); - InnerPolicy.SuppressTagKind = true; - InnerPolicy.SuppressScope = true; - NamedType.getAsStringInternal(TypeStr, InnerPolicy); - - MyString += TypeStr; - if (InnerString.empty()) - InnerString.swap(MyString); - else - InnerString = MyString + ' ' + InnerString; -} - -void TypenameType::getAsStringInternal(std::string &InnerString, const PrintingPolicy &Policy) const { - std::string MyString; - - { - llvm::raw_string_ostream OS(MyString); - OS << "typename "; - NNS->print(OS, Policy); - - if (const IdentifierInfo *Ident = getIdentifier()) - OS << Ident->getName(); - else if (const TemplateSpecializationType *Spec = getTemplateId()) { - Spec->getTemplateName().print(OS, Policy, true); - OS << TemplateSpecializationType::PrintTemplateArgumentList( - Spec->getArgs(), - Spec->getNumArgs(), - Policy); - } - } - - if (InnerString.empty()) - InnerString.swap(MyString); - else - InnerString = MyString + ' ' + InnerString; -} - void ObjCInterfaceType::Profile(llvm::FoldingSetNodeID &ID, const ObjCInterfaceDecl *Decl, ObjCProtocolDecl **protocols, @@ -1454,134 +921,3 @@ void ObjCInterfaceType::Profile(llvm::FoldingSetNodeID &ID) { else Profile(ID, getDecl(), 0, 0); } - -void ObjCInterfaceType::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(); - if (getNumProtocols()) { - ObjCQIString += '<'; - bool isFirst = true; - for (qual_iterator I = qual_begin(), E = qual_end(); I != E; ++I) { - if (isFirst) - isFirst = false; - else - ObjCQIString += ','; - ObjCQIString += (*I)->getNameAsString(); - } - ObjCQIString += '>'; - } - InnerString = ObjCQIString + InnerString; -} - -void ObjCObjectPointerType::getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const { - std::string ObjCQIString; - - if (isObjCIdType() || isObjCQualifiedIdType()) - ObjCQIString = "id"; - else if (isObjCClassType() || isObjCQualifiedClassType()) - ObjCQIString = "Class"; - else - ObjCQIString = getInterfaceDecl()->getNameAsString(); - - if (!qual_empty()) { - ObjCQIString += '<'; - for (qual_iterator I = qual_begin(), E = qual_end(); I != E; ++I) { - ObjCQIString += (*I)->getNameAsString(); - if (I+1 != E) - ObjCQIString += ','; - } - ObjCQIString += '>'; - } - - PointeeType.getQualifiers().getAsStringInternal(ObjCQIString, Policy); - - if (!isObjCIdType() && !isObjCQualifiedIdType()) - ObjCQIString += " *"; // Don't forget the implicit pointer. - else if (!InnerString.empty()) // Prefix the basic type, e.g. 'typedefname X'. - InnerString = ' ' + InnerString; - - InnerString = ObjCQIString + InnerString; -} - -void ElaboratedType::getAsStringInternal(std::string &InnerString, - const PrintingPolicy &Policy) const { - std::string TypeStr; - PrintingPolicy InnerPolicy(Policy); - InnerPolicy.SuppressTagKind = true; - UnderlyingType.getAsStringInternal(InnerString, InnerPolicy); - - InnerString = std::string(getNameForTagKind(getTagKind())) + ' ' + InnerString; -} - -void TagType::getAsStringInternal(std::string &InnerString, const PrintingPolicy &Policy) const { - if (Policy.SuppressTag) - return; - - if (!InnerString.empty()) // Prefix the basic type, e.g. 'typedefname X'. - InnerString = ' ' + InnerString; - - const char *Kind = Policy.SuppressTagKind? 0 : getDecl()->getKindName(); - const char *ID; - if (const IdentifierInfo *II = getDecl()->getIdentifier()) - ID = II->getNameStart(); - else if (TypedefDecl *Typedef = getDecl()->getTypedefForAnonDecl()) { - Kind = 0; - assert(Typedef->getIdentifier() && "Typedef without identifier?"); - ID = Typedef->getIdentifier()->getNameStart(); - } else - ID = "<anonymous>"; - - // If this is a class template specialization, print the template - // arguments. - if (ClassTemplateSpecializationDecl *Spec - = dyn_cast<ClassTemplateSpecializationDecl>(getDecl())) { - const TemplateArgumentList &TemplateArgs = Spec->getTemplateArgs(); - std::string TemplateArgsStr - = TemplateSpecializationType::PrintTemplateArgumentList( - TemplateArgs.getFlatArgumentList(), - TemplateArgs.flat_size(), - Policy); - InnerString = TemplateArgsStr + InnerString; - } - - if (!Policy.SuppressScope) { - // Compute the full nested-name-specifier for this type. In C, - // this will always be empty. - std::string ContextStr; - for (DeclContext *DC = getDecl()->getDeclContext(); - !DC->isTranslationUnit(); DC = DC->getParent()) { - std::string MyPart; - if (NamespaceDecl *NS = dyn_cast<NamespaceDecl>(DC)) { - if (NS->getIdentifier()) - MyPart = NS->getNameAsString(); - } else if (ClassTemplateSpecializationDecl *Spec - = dyn_cast<ClassTemplateSpecializationDecl>(DC)) { - const TemplateArgumentList &TemplateArgs = Spec->getTemplateArgs(); - std::string TemplateArgsStr - = TemplateSpecializationType::PrintTemplateArgumentList( - TemplateArgs.getFlatArgumentList(), - TemplateArgs.flat_size(), - Policy); - MyPart = Spec->getIdentifier()->getName().str() + TemplateArgsStr; - } else if (TagDecl *Tag = dyn_cast<TagDecl>(DC)) { - if (TypedefDecl *Typedef = Tag->getTypedefForAnonDecl()) - MyPart = Typedef->getIdentifier()->getName(); - else if (Tag->getIdentifier()) - MyPart = Tag->getIdentifier()->getName(); - } - - if (!MyPart.empty()) - ContextStr = MyPart + "::" + ContextStr; - } - - if (Kind) - InnerString = std::string(Kind) + |