azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Objective-C protocol adopting Kotlin one when producing framework

Browse Source
This commit is contained in:
Svyatoslav Scherbina
2017-12-07 10:04:43 +03:00
committed by SvyatoslavScherbina
parent cf076ffff0
commit 7696f41f6c
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/cpp/ObjCExport.mm
+26 -9
View File
@@ -673,17 +673,34 @@ static void addDefinedSelectors(Class clazz, KStdUnorderedSet<SEL>& result) {
static KStdVector<const TypeInfo*> getProtocolsAsInterfaces(Class clazz) {
KStdVector<const TypeInfo*> result;
KStdUnorderedSet<Protocol*> handledProtocols;
KStdVector<Protocol*> protocolsToHandle;
unsigned int protocolCount;
Protocol** protocols = class_copyProtocolList(clazz, &protocolCount);
if (protocols == nullptr) return result;
for (int i = 0; i < protocolCount; ++i) {
Protocol* protocol = protocols[i];
const ObjCTypeAdapter* typeAdapter = findProtocolAdapter(protocol);
if (typeAdapter != nullptr) result.push_back(typeAdapter->kotlinTypeInfo);
{
unsigned int protocolCount;
Protocol** protocols = class_copyProtocolList(clazz, &protocolCount);
if (protocols != nullptr) {
protocolsToHandle.insert(protocolsToHandle.end(), protocols, protocols + protocolCount);
free(protocols);
}
}
while (!protocolsToHandle.empty()) {
Protocol* proto = protocolsToHandle[protocolsToHandle.size() - 1];
protocolsToHandle.pop_back();
if (handledProtocols.insert(proto).second) {
const ObjCTypeAdapter* typeAdapter = findProtocolAdapter(proto);
if (typeAdapter != nullptr) result.push_back(typeAdapter->kotlinTypeInfo);
unsigned int protocolCount;
Protocol** protocols = protocol_copyProtocolList(proto, &protocolCount);
if (protocols != nullptr) {
protocolsToHandle.insert(protocolsToHandle.end(), protocols, protocols + protocolCount);
free(protocols);
}
}
}
if (protocols != nullptr) free(protocols);
return result;
}