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

swift-api-digester: consider name alias type as a standalone node kind. (#5701)

Browse Source 
* swift-api-digester: consider name alias type as a standalone node kind.

* [test] Update the swift-api-digester dump for stdlib to honor new name alias node.
This commit is contained in:
Xi Ge
2016-11-09 16:44:27 -08:00
committed by GitHub
parent a1dbe066ad
commit 368247604f
5 changed files with 1925 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/swift-api-digester/swift-api-digester.cpp
View File

@@ -393,6 +393,7 @@ bool SDKNodeType::classof(const SDKNode *N) {
switch (N->getKind()) {
case SDKNodeKind::TypeNominal:
case SDKNodeKind::TypeFunc:
case SDKNodeKind::TypeNameAlias:
return true;
default:
return false;
@@ -413,6 +414,13 @@ public:
static bool classof(const SDKNode *N);
};
class SDKNodeTypeNameAlias : public SDKNodeType {
public:
SDKNodeTypeNameAlias(SDKNodeInitInfo Info) : SDKNodeType(Info,
SDKNodeKind::TypeNameAlias) {}
static bool classof(const SDKNode *N);
};
template <typename T> const T *
SDKNode::getAs() const {
if (T::classof(this))
@@ -639,6 +647,7 @@ bool SDKNodeDecl::classof(const SDKNode *N) {
case SDKNodeKind::Root:
case SDKNodeKind::TypeNominal:
case SDKNodeKind::TypeFunc:
case SDKNodeKind::TypeNameAlias:
return false;
}
}
@@ -871,6 +880,7 @@ bool SDKNode::operator==(const SDKNode &Other) const {
return false;
switch(getKind()) {
case SDKNodeKind::TypeNameAlias:
case SDKNodeKind::TypeNominal:
case SDKNodeKind::TypeFunc: {
auto Left = this->getAs<SDKNodeType>();
@@ -1077,8 +1087,11 @@ case SDKNodeKind::X: \
static NodeUniquePtr constructTypeNode(Type T) {
NodeUniquePtr Root = SDKNodeInitInfo(T).createSDKNode(SDKNodeKind::TypeNominal);
if (isa<NameAliasType>(T.getPointer()))
if (auto NAT = dyn_cast<NameAliasType>(T.getPointer())) {
NodeUniquePtr Root = SDKNodeInitInfo(T).createSDKNode(SDKNodeKind::TypeNameAlias);
Root->addChild(constructTypeNode(NAT->getCanonicalType()));
return Root;
}
if (auto Fun = T->getAs<AnyFunctionType>()) {
NodeUniquePtr Root = SDKNodeInitInfo(T).createSDKNode(SDKNodeKind::TypeFunc);
@@ -2072,7 +2085,8 @@ public:
case SDKNodeKind::Constructor:
case SDKNodeKind::TypeAlias:
case SDKNodeKind::TypeFunc:
case SDKNodeKind::TypeNominal: {
case SDKNodeKind::TypeNominal:
case SDKNodeKind::TypeNameAlias: {
// If matched nodes are both function/var/TypeAlias decls, mapping their
// parameters sequentially.
SequentialNodeMatcher(Left->getChildren(),