[ObjCType] Add vararg translation
KT-66056
This commit is contained in:
committed by
Space Team
parent
dfd9aabf8e
commit
e65caee26b
+12
-2
@@ -1,12 +1,15 @@
|
|||||||
package org.jetbrains.kotlin.objcexport
|
package org.jetbrains.kotlin.objcexport
|
||||||
|
|
||||||
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
|
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
|
||||||
|
import org.jetbrains.kotlin.analysis.api.components.buildClassType
|
||||||
import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionLikeSymbol
|
import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionLikeSymbol
|
||||||
import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol
|
import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol
|
||||||
import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol
|
import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol
|
||||||
import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
|
import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
|
||||||
import org.jetbrains.kotlin.backend.konan.cKeywords
|
import org.jetbrains.kotlin.backend.konan.cKeywords
|
||||||
import org.jetbrains.kotlin.backend.konan.objcexport.*
|
import org.jetbrains.kotlin.backend.konan.objcexport.*
|
||||||
|
import org.jetbrains.kotlin.name.StandardClassIds
|
||||||
|
import org.jetbrains.kotlin.psi.KtParameter
|
||||||
|
|
||||||
context(KtAnalysisSession, KtObjCExportSession)
|
context(KtAnalysisSession, KtObjCExportSession)
|
||||||
internal fun KtFunctionLikeSymbol.translateToObjCParameters(baseMethodBridge: MethodBridge): List<ObjCParameter> {
|
internal fun KtFunctionLikeSymbol.translateToObjCParameters(baseMethodBridge: MethodBridge): List<ObjCParameter> {
|
||||||
@@ -41,8 +44,15 @@ internal fun KtFunctionLikeSymbol.translateToObjCParameters(baseMethodBridge: Me
|
|||||||
usedNames += uniqueName
|
usedNames += uniqueName
|
||||||
|
|
||||||
val type = when (bridge) {
|
val type = when (bridge) {
|
||||||
is MethodBridgeValueParameter.Mapped ->
|
is MethodBridgeValueParameter.Mapped -> {
|
||||||
parameter!!.returnType.translateToObjCType(bridge.bridge)
|
val returnType = parameter!!.returnType
|
||||||
|
if (parameter.isVararg) {
|
||||||
|
//vararg is a special case, [parameter.returnType] is T, we need Array<T>
|
||||||
|
buildClassType(StandardClassIds.Array) { argument(parameter.returnType) }.translateToObjCType(bridge.bridge)
|
||||||
|
} else {
|
||||||
|
returnType.translateToObjCType(bridge.bridge)
|
||||||
|
}
|
||||||
|
}
|
||||||
MethodBridgeValueParameter.ErrorOutParameter ->
|
MethodBridgeValueParameter.ErrorOutParameter ->
|
||||||
ObjCPointerType(ObjCNullableReferenceType(ObjCClassType("NSError")), nullable = true)
|
ObjCPointerType(ObjCNullableReferenceType(ObjCClassType("NSError")), nullable = true)
|
||||||
|
|
||||||
|
|||||||
+5
@@ -307,6 +307,11 @@ class ObjCExportHeaderGeneratorTest(private val generator: HeaderGenerator) {
|
|||||||
doTest(headersTestDataDir.resolve("specialFunctionNames"))
|
doTest(headersTestDataDir.resolve("specialFunctionNames"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `test - vararg`() {
|
||||||
|
doTest(headersTestDataDir.resolve("vararg"))
|
||||||
|
}
|
||||||
|
|
||||||
private fun doTest(root: File, configuration: Configuration = Configuration()) {
|
private fun doTest(root: File, configuration: Configuration = Configuration()) {
|
||||||
if (!root.isDirectory) fail("Expected ${root.absolutePath} to be directory")
|
if (!root.isDirectory) fail("Expected ${root.absolutePath} to be directory")
|
||||||
val generatedHeaders = generator.generateHeaders(root, configuration).toString()
|
val generatedHeaders = generator.generateHeaders(root, configuration).toString()
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
#import <Foundation/NSArray.h>
|
||||||
|
#import <Foundation/NSDictionary.h>
|
||||||
|
#import <Foundation/NSError.h>
|
||||||
|
#import <Foundation/NSObject.h>
|
||||||
|
#import <Foundation/NSSet.h>
|
||||||
|
#import <Foundation/NSString.h>
|
||||||
|
#import <Foundation/NSValue.h>
|
||||||
|
|
||||||
|
@class Array<T>;
|
||||||
|
|
||||||
|
@protocol Iterator;
|
||||||
|
|
||||||
|
NS_ASSUME_NONNULL_BEGIN
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wunknown-warning-option"
|
||||||
|
#pragma clang diagnostic ignored "-Wincompatible-property-type"
|
||||||
|
#pragma clang diagnostic ignored "-Wnullability"
|
||||||
|
|
||||||
|
#pragma push_macro("_Nullable_result")
|
||||||
|
#if !__has_feature(nullability_nullable_result)
|
||||||
|
#undef _Nullable_result
|
||||||
|
#define _Nullable_result _Nullable
|
||||||
|
#endif
|
||||||
|
|
||||||
|
__attribute__((objc_subclassing_restricted))
|
||||||
|
@interface FooKt : Base
|
||||||
|
+ (void)fooArgs:(Array<NSString *> *)args __attribute__((swift_name("foo(args:)")));
|
||||||
|
@end
|
||||||
|
|
||||||
|
__attribute__((objc_subclassing_restricted))
|
||||||
|
@interface Array<T> : Base
|
||||||
|
+ (instancetype)arrayWithSize:(int32_t)size init:(T _Nullable (^)(Int *))init __attribute__((swift_name("init(size:init:)")));
|
||||||
|
+ (instancetype)alloc __attribute__((unavailable));
|
||||||
|
+ (instancetype)allocWithZone:(struct _NSZone *)zone __attribute__((unavailable));
|
||||||
|
- (T _Nullable)getIndex:(int32_t)index __attribute__((swift_name("get(index:)")));
|
||||||
|
- (id<Iterator>)iterator __attribute__((swift_name("iterator()")));
|
||||||
|
- (void)setIndex:(int32_t)index value:(T _Nullable)value __attribute__((swift_name("set(index:value:)")));
|
||||||
|
@property (readonly) int32_t size __attribute__((swift_name("size")));
|
||||||
|
@end
|
||||||
|
|
||||||
|
@protocol Iterator
|
||||||
|
@required
|
||||||
|
- (BOOL)hasNext __attribute__((swift_name("hasNext()")));
|
||||||
|
- (id _Nullable)next __attribute__((swift_name("next()")));
|
||||||
|
@end
|
||||||
|
|
||||||
|
#pragma pop_macro("_Nullable_result")
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
NS_ASSUME_NONNULL_END
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
fun foo(vararg args: String) {}
|
||||||
Reference in New Issue
Block a user