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

Merge remote-tracking branch 'origin/swift-3-api-guidelines' into swift-3-omit-needless-words

Browse Source
This commit is contained in:
Doug Gregor
2015-12-17 11:35:58 -08:00
parent 2f5f94a12c 3fe0c60d7f
commit f245f18a09
499 changed files with 5428 additions and 5745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
stdlib/public/core/ShadowProtocols.swift
View File

@@ -28,7 +28,7 @@ public protocol _ShadowProtocol {}
/// A shadow for the `NSFastEnumeration` protocol.
@objc
public protocol _NSFastEnumerationType : _ShadowProtocol {
public protocol _NSFastEnumeration : _ShadowProtocol {
@objc(countByEnumeratingWithState:objects:count:)
func countByEnumeratingWith(
state: UnsafeMutablePointer<_SwiftNSFastEnumerationState>,
@@ -38,7 +38,7 @@ public protocol _NSFastEnumerationType : _ShadowProtocol {
/// A shadow for the `NSEnumerator` class.
@objc
public protocol _NSEnumeratorType : _ShadowProtocol {
public protocol _NSEnumerator : _ShadowProtocol {
init()
func nextObject() -> AnyObject?
}
@@ -48,7 +48,7 @@ public typealias _SwiftNSZone = OpaquePointer
/// A shadow for the `NSCopying` protocol.
@objc
public protocol _NSCopyingType : _ShadowProtocol {
public protocol _NSCopying : _ShadowProtocol {
func copy(zone zone: _SwiftNSZone) -> AnyObject
}
@@ -57,8 +57,8 @@ public protocol _NSCopyingType : _ShadowProtocol {
/// Covers a set of operations everyone needs to implement in order to
/// be a useful `NSArray` subclass.
@unsafe_no_objc_tagged_pointer @objc
public protocol _NSArrayCoreType :
_NSCopyingType, _NSFastEnumerationType {
public protocol _NSArrayCore :
_NSCopying, _NSFastEnumeration {
@objc(objectAtIndex:)
func objectAt(index: Int) -> AnyObject
@@ -79,8 +79,8 @@ public protocol _NSArrayCoreType :
/// Covers a set of operations everyone needs to implement in order to
/// be a useful `NSDictionary` subclass.
@objc
public protocol _NSDictionaryCoreType :
_NSCopyingType, _NSFastEnumerationType {
public protocol _NSDictionaryCore :
_NSCopying, _NSFastEnumeration {
// The following methods should be overridden when implementing an
// NSDictionary subclass.
@@ -95,7 +95,7 @@ public protocol _NSDictionaryCoreType :
@objc(objectForKey:)
func objectFor(aKey: AnyObject) -> AnyObject?
func keyEnumerator() -> _NSEnumeratorType
func keyEnumerator() -> _NSEnumerator
// We also override the following methods for efficiency.
@@ -115,12 +115,12 @@ public protocol _NSDictionaryCoreType :
/// stdlib.
///
/// `NSDictionary` operations, in addition to those on
/// `_NSDictionaryCoreType`, that we need to use from the core stdlib.
/// Distinct from `_NSDictionaryCoreType` because we don't want to be
/// `_NSDictionaryCore`, that we need to use from the core stdlib.
/// Distinct from `_NSDictionaryCore` because we don't want to be
/// forced to implement operations that `NSDictionary` already
/// supplies.
@unsafe_no_objc_tagged_pointer @objc
public protocol _NSDictionaryType : _NSDictionaryCoreType {
public protocol _NSDictionary : _NSDictionaryCore {
// Note! This API's type is different from what is imported by the clang
// importer.
func getObjects(objects: UnsafeMutablePointer<AnyObject>,
@@ -132,8 +132,8 @@ public protocol _NSDictionaryType : _NSDictionaryCoreType {
/// Covers a set of operations everyone needs to implement in order to
/// be a useful `NSSet` subclass.
@objc
public protocol _NSSetCoreType :
_NSCopyingType, _NSFastEnumerationType {
public protocol _NSSetCore :
_NSCopying, _NSFastEnumeration {
// The following methods should be overridden when implementing an
// NSSet subclass.
@@ -143,7 +143,7 @@ public protocol _NSSetCoreType :
var count: Int { get }
func member(object: AnyObject) -> AnyObject?
func objectEnumerator() -> _NSEnumeratorType
func objectEnumerator() -> _NSEnumerator
// We also override the following methods for efficiency.
@@ -160,18 +160,18 @@ public protocol _NSSetCoreType :
/// stdlib.
///
/// `NSSet` operations, in addition to those on
/// `_NSSetCoreType`, that we need to use from the core stdlib.
/// Distinct from `_NSSetCoreType` because we don't want to be
/// `_NSSetCore`, that we need to use from the core stdlib.
/// Distinct from `_NSSetCore` because we don't want to be
/// forced to implement operations that `NSSet` already
/// supplies.
@unsafe_no_objc_tagged_pointer @objc
public protocol _NSSetType : _NSSetCoreType {
public protocol _NSSet : _NSSetCore {
}
#else
public protocol _NSArrayCoreType {}
public protocol _NSDictionaryCoreType {}
public protocol _NSSetCoreType {}
public protocol _NSArrayCore {}
public protocol _NSDictionaryCore {}
public protocol _NSSetCore {}
#endif