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

swift-api-digester: simplify some code. NFC (#10023)

Browse Source
This commit is contained in:
Xi Ge
2017-05-31 21:47:53 -07:00
committed by GitHub
parent fa70d90b5e
commit d20f4a8a3e
1 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2133,26 +2133,6 @@ private:
MapUSRToNode &operator=(MapUSRToNode &) = delete; MapUSRToNode &operator=(MapUSRToNode &) = delete;
}; };
static StringRef constructFullTypeName(NodePtr Node) {
assert(Node->getKind() == SDKNodeKind::TypeDecl);
std::vector<NodePtr> TypeChain;
for (auto C = Node; C->getKind() == SDKNodeKind::TypeDecl; C = C->getParent()) {
TypeChain.insert(TypeChain.begin(), C);
}
assert(TypeChain.front()->getParent()->getKind() == SDKNodeKind::Root);
llvm::SmallString<64> Buffer;
bool First = true;
for (auto N : TypeChain) {
if (First) {
First = false;
} else {
Buffer.append(".");
}
Buffer.append(N->getName());
}
return Node->getSDKContext().buffer(Buffer.str());
}
// Class to build up a diff of structurally different nodes, based on the given // Class to build up a diff of structurally different nodes, based on the given
// USR map for the left (original) side of the diff, based on parent types. // USR map for the left (original) side of the diff, based on parent types.
class TypeMemberDiffFinder : public SDKNodeVisitor { class TypeMemberDiffFinder : public SDKNodeVisitor {
@@ -2187,7 +2167,8 @@ class TypeMemberDiffFinder : public SDKNodeVisitor {
if (nodeParent->getKind() == SDKNodeKind::TypeDecl && if (nodeParent->getKind() == SDKNodeKind::TypeDecl &&
diffParent->getKind() == SDKNodeKind::TypeDecl && diffParent->getKind() == SDKNodeKind::TypeDecl &&
declNode->isStatic() && declNode->isStatic() &&
constructFullTypeName(nodeParent) != constructFullTypeName(diffParent)) nodeParent->getAs<SDKNodeDecl>()->getFullyQualifiedName() !=
diffParent->getAs<SDKNodeDecl>()->getFullyQualifiedName())
TypeMemberDiffs.insert({diffNode, node}); TypeMemberDiffs.insert({diffNode, node});
// Move from a getter/setter function to a property // Move from a getter/setter function to a property
else if (node->getKind() == SDKNodeKind::Getter && else if (node->getKind() == SDKNodeKind::Getter &&
@@ -3013,11 +2994,13 @@ static void findTypeMemberDiffs(NodePtr leftSDKRoot, NodePtr rightSDKRoot,
// SDK_CHANGE_TYPE_MEMBER(USR, new type context name, new printed name, self // SDK_CHANGE_TYPE_MEMBER(USR, new type context name, new printed name, self
// index, old printed name) // index, old printed name)
TypeMemberDiffItem item = { TypeMemberDiffItem item = {
right->getAs<SDKNodeDecl>()->getUsr(), constructFullTypeName(rightParent), right->getAs<SDKNodeDecl>()->getUsr(),
rightParent->getAs<SDKNodeDecl>()->getFullyQualifiedName(),
right->getPrintedName(), findSelfIndex(right), None, right->getPrintedName(), findSelfIndex(right), None,
leftParent->getKind() == SDKNodeKind::Root ? leftParent->getKind() == SDKNodeKind::Root ?
StringRef() : constructFullTypeName(leftParent), StringRef() : leftParent->getAs<SDKNodeDecl>()->getFullyQualifiedName(),
left->getPrintedName()}; left->getPrintedName()
};
out.emplace_back(item); out.emplace_back(item);
Detector.workOn(left, right); Detector.workOn(left, right);
} }