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

Protocol names end in "Type," "ible," or "able"

Browse Source 
Mechanically add "Type" to the end of any protocol names that don't end
in "Type," "ible," or "able."  Also, drop "Type" from the end of any
associated type names, except for those of the *LiteralConvertible
protocols.

There are obvious improvements to make in some of these names, which can
be handled with separate commits.

Fixes <rdar://problem/17165920> Protocols `Integer` etc should get
uglier names.

Swift SVN r19883
This commit is contained in:
Dave Abrahams
2014-07-12 17:29:57 +00:00
parent dff53defae
commit 6d1095f44e
201 changed files with 1658 additions and 1582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
stdlib/runtime/Casting.cpp
View File

@@ -1563,8 +1563,8 @@ struct _ConditionallyBridgedToObjectiveCWitnessTable {
} // unnamed namespace
extern "C" const ProtocolDescriptor _TMpSs20_BridgedToObjectiveC;
extern "C" const ProtocolDescriptor _TMpSs33_ConditionallyBridgedToObjectiveC;
extern "C" const ProtocolDescriptor _TMpSs24_BridgedToObjectiveCType;
extern "C" const ProtocolDescriptor _TMpSs37_ConditionallyBridgedToObjectiveCType;
//===--- Bridging helpers for the Swift stdlib ----------------------------===//
// Functions that must discover and possibly use an arbitrary type's
@@ -1573,14 +1573,14 @@ extern "C" const ProtocolDescriptor _TMpSs33_ConditionallyBridgedToObjectiveC;
//===----------------------------------------------------------------------===//
static const _BridgedToObjectiveCWitnessTable *
findBridgeWitness(const Metadata *T) {
auto w = swift_conformsToProtocol(T, &_TMpSs20_BridgedToObjectiveC, nullptr);
auto w = swift_conformsToProtocol(T, &_TMpSs24_BridgedToObjectiveCType, nullptr);
return reinterpret_cast<const _BridgedToObjectiveCWitnessTable *>(w);
}
static const _ConditionallyBridgedToObjectiveCWitnessTable *
findConditionalBridgeWitness(const Metadata *T) {
auto w = swift_conformsToProtocol(
T, &_TMpSs33_ConditionallyBridgedToObjectiveC, nullptr);
T, &_TMpSs37_ConditionallyBridgedToObjectiveCType, nullptr);
return reinterpret_cast<
const _ConditionallyBridgedToObjectiveCWitnessTable *>(w);