averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replacing the GenericTypeApplication node with more specific BoundGeneric{Class|Structure|Union} nodes

Browse Source 
Removing the TypeList node underneath a TypeList, a TypeList just needs to wrap a list of Type nodes



Swift SVN r7990
This commit is contained in:
Enrico Granata
2013-09-06 17:47:06 +00:00
parent 1ba2554fb2
commit b3576d8599
2 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
lib/Basic/Demangle.cpp
View File

@@ -978,6 +978,17 @@ private:
}
return Node::Kind::Unknown;
}
Node::Kind getTypeKind (NodePointer type) {
if (type->getKind() != Node::Kind::Type)
return Node::Kind::Unknown;
if (type->size() == 0)
return Node::Kind::Unknown;
NodePointer child = type->child_at(0);
if (child->getKind() == Node::Kind::Path)
return getDeclContextType(child);
return child->getKind();
}
bool demangleEntity(NodePointer decl) {
NodePointer context = demangleContext();
@@ -1254,24 +1265,33 @@ private:
}
if (c == 'G') {
NodePointer type_list = Node::makeNodePointer(Node::Kind::TypeList);
NodePointer type = demangleType();
if (!type)
NodePointer unboundType = demangleType();
if (!unboundType)
return nullptr;
NodePointer type_list_entry =
Node::makeNodePointer(Node::Kind::TypeListEntry);
type_list_entry->push_back_child(type);
type_list->push_back_child(type_list_entry);
while (Mangled.peek() != '_') {
type = demangleType();
NodePointer type = demangleType();
if (!type)
return nullptr;
type_list_entry = Node::makeNodePointer(Node::Kind::TypeListEntry);
type_list_entry->push_back_child(type);
type_list->push_back_child(type_list_entry);
type_list->push_back_child(type);
}
Mangled.next();
Node::Kind bound_type_kind = Node::Kind::Unknown;
switch (getTypeKind(unboundType)) {
case Node::Kind::Class:
bound_type_kind = Node::Kind::BoundGenericClass;
break;
case Node::Kind::Structure:
bound_type_kind = Node::Kind::BoundGenericStructure;
break;
case Node::Kind::Union:
bound_type_kind = Node::Kind::BoundGenericUnion;
break;
default:
assert(false && "trying to make a generic type application for a non class|struct|union");
}
NodePointer type_application =
Node::makeNodePointer(Node::Kind::GenericTypeApplication);
Node::makeNodePointer(bound_type_kind);
type_application->push_back_child(unboundType);
type_application->push_back_child(type_list);
return type_application;
}
@@ -1753,25 +1773,23 @@ void toString(NodePointer pointer, DemanglerPrinter &printer) {
toString(type, printer);
break;
}
case swift::Demangle::Node::Kind::GenericTypeApplication: {
NodePointer typelist = pointer->child_at(0);
case swift::Demangle::Node::Kind::BoundGenericClass:
case swift::Demangle::Node::Kind::BoundGenericStructure:
case swift::Demangle::Node::Kind::BoundGenericUnion: {
if (pointer->size() < 2)
break;
NodePointer typelist = pointer->child_at(1);
if (!typelist)
break;
NodePointer type0 = typelist->child_at(0);
NodePointer type0 = pointer->child_at(0);
if (!type0)
break;
toString(type0, printer);
printer << "<";
Node::size_type count = typelist->size();
for (Node::size_type i = 1; i < count;) {
toString(typelist->child_at(i), printer);
if (++i < count)
printer << ", ";
}
toStringChildren(typelist, printer, ", ");
printer << ">";
break;
}
case swift::Demangle::Node::Kind::TypeListEntry:
toStringChildren(pointer, printer);
break;
case swift::Demangle::Node::Kind::ObjCBlock: {
printer << "[objc_block] ";
NodePointer tuple = pointer->child_at(0);