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: detect simple parameter/return type update from String to StringRepresentableStruct.

Browse Source
This commit is contained in:
Xi Ge
2018-04-08 13:24:10 -07:00
parent d9f7d1414e
commit e15c197823
7 changed files with 80 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -516,6 +516,7 @@ public:
// When the type node represents a function parameter, this function returns
// whether the parameter has a default value.
bool hasDefaultArgument() const { return HasDefaultArg; }
bool isTopLevelType() const { return !isa<SDKNodeType>(getParent()); }
static bool classof(const SDKNode *N);
};
@@ -2730,7 +2731,7 @@ class ChangeRefinementPass : public SDKTreeDiffPass, public SDKNodeVisitor {
return false;
// We only care if this the top-level type node.
if (!isa<SDKNodeDecl>(L->getParent()) || !isa<SDKNodeDecl>(R->getParent()))
if (!L->isTopLevelType() || !R->isTopLevelType())
return false;
StringRef KeyChangedTo;
if (L->getTypeKind() == KnownTypeKind::Optional &&
@@ -2771,7 +2772,7 @@ class ChangeRefinementPass : public SDKTreeDiffPass, public SDKNodeVisitor {
if (!IsVisitingLeft)
return false;
// We only care if this the top-level type node.
if (!isa<SDKNodeDecl>(L->getParent()) || !isa<SDKNodeDecl>(R->getParent()))
if (!L->isTopLevelType() || !R->isTopLevelType())
return false;
StringRef KeyChangedTo;
if (L->getTypeKind() == KnownTypeKind::Optional &&
@@ -2794,6 +2795,35 @@ class ChangeRefinementPass : public SDKTreeDiffPass, public SDKNodeVisitor {
return false;
}
bool detectSimpleStringRepresentableUpdate(SDKNodeType *L, SDKNodeType *R) {
if (!IsVisitingLeft)
return false;
if (!L->isTopLevelType() || !R->isTopLevelType())
return false;
StringRef KeyChangedTo;
bool HasOptional = L->getTypeKind() == KnownTypeKind::Optional &&
R->getTypeKind() == KnownTypeKind::Optional;
if (HasOptional) {
// Detect String? changes to StringRepresentableStruct? change.
KeyChangedTo =
getStringRepresentableChange(L->getOnlyChild()->getAs<SDKNodeType>(),
R->getOnlyChild()->getAs<SDKNodeType>());
} else {
// Detect String changes to StringRepresentableStruct change.
KeyChangedTo = getStringRepresentableChange(L, R);
}
if (!KeyChangedTo.empty()) {
L->annotate(NodeAnnotation::TypeRewrittenRight, KeyChangedTo);
if (HasOptional) {
L->annotate(NodeAnnotation::SimpleOptionalStringRepresentableUpdate);
} else {
L->annotate(NodeAnnotation::SimpleStringRepresentableUpdate);
}
return true;
}
return false;
}
bool isUnhandledCase(SDKNodeType *Node) {
auto Counter = UpdateMap.findUpdateCounterpart(Node)->getAs<SDKNodeType>();
return Node->getTypeKind() == KnownTypeKind::Void ||
@@ -2826,6 +2856,7 @@ public:
detectUnmanagedUpdate(Node, Counter)||
detectDictionaryKeyChange(Node, Counter) ||
detectArrayMemberChange(Node, Counter) ||
detectSimpleStringRepresentableUpdate(Node, Counter) ||
detectTypeRewritten(Node, Counter);
(void) Result;
return;
@@ -2938,6 +2969,8 @@ class DiffItemEmitter : public SDKNodeVisitor {
case NodeAnnotation::OptionalArrayMemberUpdate:
case NodeAnnotation::DictionaryKeyUpdate:
case NodeAnnotation::OptionalDictionaryKeyUpdate:
case NodeAnnotation::SimpleStringRepresentableUpdate:
case NodeAnnotation::SimpleOptionalStringRepresentableUpdate:
case NodeAnnotation::TypeRewritten:
return Node->getAnnotateComment(NodeAnnotation::TypeRewrittenRight);
case NodeAnnotation::ModernizeEnum:
@@ -2999,6 +3032,8 @@ class DiffItemEmitter : public SDKNodeVisitor {
NodeAnnotation::OptionalDictionaryKeyUpdate,
NodeAnnotation::ArrayMemberUpdate,
NodeAnnotation::OptionalArrayMemberUpdate,
NodeAnnotation::SimpleStringRepresentableUpdate,
NodeAnnotation::SimpleOptionalStringRepresentableUpdate,
});
}