averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #67653 from apple/egorzhdan/stream-delegate

Browse Source 
[cxx-interop] Import `NSStreamDelegate.stream` correctly
This commit is contained in:
Egor Zhdan
2023-08-02 20:45:29 +01:00
committed by GitHub
parent 713a0a04d7 6edde292f1
commit 42cbacfd15
6 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ClangImporter/ImportType.cpp
View File

@@ -2609,6 +2609,9 @@ ArgumentAttrs ClangImporter::Implementation::inferDefaultArgument(
if (isFirstParameter && camel_case::getFirstWord(baseNameStr) == "set")
return DefaultArgumentKind::None;
if (auto elaboratedTy = type->getAs<clang::ElaboratedType>())
type = elaboratedTy->desugar();
// Some nullable parameters default to 'nil'.
if (clangOptionality == OTK_Optional) {
// Nullable trailing closure parameters default to 'nil'.
@@ -2661,6 +2664,8 @@ ArgumentAttrs ClangImporter::Implementation::inferDefaultArgument(
return argumentAttrs;
if (camel_case::sameWordIgnoreFirstCase(word, "action"))
return argumentAttrs;
if (camel_case::sameWordIgnoreFirstCase(word, "event"))
return argumentAttrs;
if (camel_case::sameWordIgnoreFirstCase(word, "events") &&
next != camelCaseWords.rend() &&
camel_case::sameWordIgnoreFirstCase(*next, "control"))

6
test/Interop/Cxx/objc-correctness/Inputs/CFOptions.h Normal file
View File

@@ -0,0 +1,6 @@
#define __CF_OPTIONS_ATTRIBUTES __attribute__((flag_enum,enum_extensibility(open)))
#if (__cplusplus)
#define CF_OPTIONS(_type, _name) __attribute__((availability(swift,unavailable))) _type _name; enum __CF_OPTIONS_ATTRIBUTES : _name
#else
#define CF_OPTIONS(_type, _name) enum __CF_OPTIONS_ATTRIBUTES _name : _type _name; enum _name : _type
#endif

7
test/Interop/Cxx/objc-correctness/Inputs/NSOptionsMangling.h
View File

@@ -1,9 +1,4 @@
#define __CF_OPTIONS_ATTRIBUTES __attribute__((flag_enum,enum_extensibility(open)))
#if (__cplusplus)
#define CF_OPTIONS(_type, _name) __attribute__((availability(swift,unavailable))) _type _name; enum __CF_OPTIONS_ATTRIBUTES : _name
#else
#define CF_OPTIONS(_type, _name) enum __CF_OPTIONS_ATTRIBUTES _name : _type _name; enum _name : _type
#endif
#include "CFOptions.h"
typedef CF_OPTIONS(unsigned, UIControlState) { UIControlStateNormal = 0 };

25
test/Interop/Cxx/objc-correctness/Inputs/NSStreamDelegate.h Normal file
View File

@@ -0,0 +1,25 @@
#include "CFOptions.h"
typedef CF_OPTIONS(int, NSStreamEvent) {
NSStreamEventNone = 0,
NSStreamEventOpenCompleted = 1UL << 0,
NSStreamEventHasBytesAvailable = 1UL << 1,
NSStreamEventHasSpaceAvailable = 1UL << 2,
NSStreamEventErrorOccurred = 1UL << 3,
NSStreamEventEndEncountered = 1UL << 4
};
@protocol NSObject
@end
__attribute__((objc_root_class))
@interface NSObject <NSObject>
@end
@interface NSStream : NSObject
@end
@protocol NSStreamDelegate <NSObject>
@optional
- (void)stream:(NSStream *)aStream handleEvent:(NSStreamEvent)eventCode;
@end

5
test/Interop/Cxx/objc-correctness/Inputs/module.modulemap
View File

@@ -19,6 +19,11 @@ module NSNofiticationBridging {
requires cplusplus
}
module NSStreamDelegate {
header "NSStreamDelegate.h"
requires objc
}
module OSObject {
header "os-object.h"
requires objc

8
test/Interop/Cxx/objc-correctness/nsstreamdelegate.swift Normal file
View File

@@ -0,0 +1,8 @@
// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-objc-interop -enable-experimental-cxx-interop
// REQUIRES: objc_interop
import NSStreamDelegate
func foo<T: NSStreamDelegate>(_ delegate: T, stream: NSStream) {
delegate.stream!(stream, handle: NSStreamEvent.openCompleted)
}