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

[ObjCType] Add basic implementation of base method, fix tests

Browse Source 
KT-65687
This commit is contained in:
eugene.levenetc
2024-02-22 15:28:22 +01:00
committed by Space Team
parent 1c2570ed7e
commit 078f0ff6e1
18 changed files with 471 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/objcexport-header-generator/testData/headers/multipleInheritance/!multipleInheritance.h
Vendored
+82
View File
@@ -0,0 +1,82 @@
#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 A<T>, B<T>;
@protocol RootA, RootB;
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
/**
* inheritance chain: A > B > C
*/
@interface A<T> : Base
/**
* inheritance chain: A > B > C
*/
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
/**
* inheritance chain: A > B > C
*/
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (T _Nullable)foo __attribute__((swift_name("foo()")));
@end
@interface B<T> : A<Int *>
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (Int *)foo __attribute__((swift_name("foo()")));
@end
@interface C : B<Int *>
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (Int *)foo __attribute__((swift_name("foo()")));
@end
/**
* inheritance tree:
* RootA RootB
* \ /
* Tree
*/
@protocol RootA
@required
- (id _Nullable)fooA __attribute__((swift_name("fooA()")));
@end
@protocol RootB
@required
- (id _Nullable)fooB __attribute__((swift_name("fooB()")));
@end
__attribute__((objc_subclassing_restricted))
@interface Tree : Base <RootA, RootB>
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (Int *)fooA __attribute__((swift_name("fooA()")));
- (NSString *)fooB __attribute__((swift_name("fooB()")));
@end
#pragma pop_macro("_Nullable_result")
#pragma clang diagnostic pop
NS_ASSUME_NONNULL_END
native/objcexport-header-generator/testData/headers/multipleInheritance/Foo.kt
Vendored
+33
View File
@@ -0,0 +1,33 @@
/**
* inheritance chain: A > B > C
*/
abstract class A<T> {
abstract fun foo(): T
}
open class B<T> : A<Int>() {
override fun foo(): Int = 42
}
open class C : B<Int>() {
override fun foo(): Int = 42
}
/**
* inheritance tree:
* RootA RootB
* \ /
* Tree
*/
interface RootA<T> {
fun fooA(): T
}
interface RootB<T> {
fun fooB(): T
}
class Tree : RootA<Int>, RootB<String> {
override fun fooA(): Int = 42
override fun fooB(): String = "42"
}
native/objcexport-header-generator/testData/headers/privateGenericSuperInterface/!privateGenericSuperInterface.h
Vendored
+30
View File
@@ -0,0 +1,30 @@
#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>
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 PublicClass : Base
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (int32_t)foo __attribute__((swift_name("foo()")));
@end
#pragma pop_macro("_Nullable_result")
#pragma clang diagnostic pop
NS_ASSUME_NONNULL_END
native/objcexport-header-generator/testData/headers/privateGenericSuperInterface/Foo.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
private interface PrivateInterface<T> {
fun foo(): T
}
class PublicClass : PrivateInterface<Int> {
override fun foo(): Int = error("stub")
}
native/objcexport-header-generator/testData/headers/privateSuperInterface/!privateSuperInterface.h
Vendored
+30
View File
@@ -0,0 +1,30 @@
#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>
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 PublicB : Base
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (void)foo __attribute__((swift_name("foo()")));
@end
#pragma pop_macro("_Nullable_result")
#pragma clang diagnostic pop
NS_ASSUME_NONNULL_END
native/objcexport-header-generator/testData/headers/privateSuperInterface/Foo.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
private interface PrivateA {
fun foo()
}
class PublicB : PrivateA {
override fun foo() = Unit
}
native/objcexport-header-generator/testData/headers/privateSuperInterfaceWithCovariantOverride/!privateSuperInterfaceWithCovariantOverride.h
Vendored
+30
View File
@@ -0,0 +1,30 @@
#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>
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 PublicB : Base
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (NSString *)foo __attribute__((swift_name("foo()")));
@end
#pragma pop_macro("_Nullable_result")
#pragma clang diagnostic pop
NS_ASSUME_NONNULL_END
native/objcexport-header-generator/testData/headers/privateSuperInterfaceWithCovariantOverride/Foo.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
private interface PrivateA {
fun foo(): Any
}
class PublicB : PrivateA {
override fun foo() : String = error("stub")
}
native/objcexport-header-generator/testData/headers/superClassWithCovariantOverride/!superClassWithCovariantOverride.h
Vendored
+38
View File
@@ -0,0 +1,38 @@
#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 Bar;
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
@interface Bar : Base
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (id)foo __attribute__((swift_name("foo()")));
@end
__attribute__((objc_subclassing_restricted))
@interface Foo : Bar
- (instancetype)init __attribute__((swift_name("init()"))) __attribute__((objc_designated_initializer));
+ (instancetype)new __attribute__((availability(swift, unavailable, message="use object initializers instead")));
- (NSString *)foo __attribute__((swift_name("foo()")));
@end
#pragma pop_macro("_Nullable_result")
#pragma clang diagnostic pop
NS_ASSUME_NONNULL_END
native/objcexport-header-generator/testData/headers/superClassWithCovariantOverride/Foo.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
abstract class Bar {
abstract fun foo(): Any
}
class Foo : Bar() {
override fun foo(): String = error("stub")
}