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

Rename ErrorType to ErrorProtocol

Browse Source
This commit is contained in:
Dmitri Gribenko
2015-11-03 18:58:39 -08:00
committed by Max Moiseev
parent 99d3f96c6d
commit feacbc4433
123 changed files with 1121 additions and 1118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
unittests/runtime/Metadata.cpp
View File

@@ -335,14 +335,14 @@ ProtocolDescriptor ProtocolB{
.withDispatchStrategy(ProtocolDispatchStrategy::Swift)
};
ProtocolDescriptor ProtocolErrorType{
"_TMp8Metadata17ProtocolErrorType",
ProtocolDescriptor ProtocolErrorProtocol{
"_TMp8Metadata21ProtocolErrorProtocol",
nullptr,
ProtocolDescriptorFlags()
.withSwift(true)
.withClassConstraint(ProtocolClassConstraint::Any)
.withDispatchStrategy(ProtocolDispatchStrategy::Swift)
.withSpecialProtocol(SpecialProtocol::ErrorType)
.withSpecialProtocol(SpecialProtocol::ErrorProtocol)
};
ProtocolDescriptor ProtocolClassConstrained{
@@ -477,22 +477,22 @@ TEST(MetadataTest, getExistentialMetadata) {
return mixedWitnessTable;
});
const ValueWitnessTable *ExpectedErrorTypeValueWitnesses;
const ValueWitnessTable *ExpectedErrorProtocolValueWitnesses;
#if SWIFT_OBJC_INTEROP
ExpectedErrorTypeValueWitnesses = &_TWVBO;
ExpectedErrorProtocolValueWitnesses = &_TWVBO;
#else
ExpectedErrorTypeValueWitnesses = &_TWVBo;
ExpectedErrorProtocolValueWitnesses = &_TWVBo;
#endif
RaceTest_ExpectEqual<const ExistentialTypeMetadata *>(
[&]() -> const ExistentialTypeMetadata * {
auto special
= test_getExistentialMetadata({&ProtocolErrorType});
= test_getExistentialMetadata({&ProtocolErrorProtocol});
EXPECT_EQ(MetadataKind::Existential, special->getKind());
EXPECT_EQ(1U, special->Flags.getNumWitnessTables());
EXPECT_EQ(SpecialProtocol::ErrorType,
EXPECT_EQ(SpecialProtocol::ErrorProtocol,
special->Flags.getSpecialProtocol());
EXPECT_EQ(ExpectedErrorTypeValueWitnesses,
EXPECT_EQ(ExpectedErrorProtocolValueWitnesses,
special->getValueWitnesses());
return special;
});
@@ -500,13 +500,13 @@ TEST(MetadataTest, getExistentialMetadata) {
RaceTest_ExpectEqual<const ExistentialTypeMetadata *>(
[&]() -> const ExistentialTypeMetadata * {
auto special
= test_getExistentialMetadata({&ProtocolErrorType, &ProtocolA});
= test_getExistentialMetadata({&ProtocolErrorProtocol, &ProtocolA});
EXPECT_EQ(MetadataKind::Existential, special->getKind());
EXPECT_EQ(2U, special->Flags.getNumWitnessTables());
// Compositions of special protocols aren't special.
EXPECT_EQ(SpecialProtocol::None,
special->Flags.getSpecialProtocol());
EXPECT_NE(ExpectedErrorTypeValueWitnesses,
EXPECT_NE(ExpectedErrorProtocolValueWitnesses,
special->getValueWitnesses());
return special;
});