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

Rename RawRepresentable.raw -> rawValue.

Browse Source 
Per API review with Ali. While we're here, give the initializer a corresponding 'rawValue' argument label, and change the associated type name to RawValue to match.

Swift SVN r21888
This commit is contained in:
Joe Groff
2014-09-11 20:13:47 +00:00
parent a952c556c9
commit 491e47cb83
22 changed files with 97 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
stdlib/core/CompilerProtocols.swift
View File

@@ -161,34 +161,34 @@ public struct GeneratorSequence<
}
public protocol RawRepresentable {
typealias Raw
init?(_: Raw)
var raw: Raw { get }
typealias RawValue
init?(rawValue: RawValue)
var rawValue: RawValue { get }
}
// Workaround for our lack of circular conformance checking. Allow == to be
// defined on _RawOptionSetType in order to satisfy the Equatable requirement of
// RawOptionSetType without a circularity our type-checker can't yet handle.
public protocol _RawOptionSetType: RawRepresentable, Equatable {
typealias Raw : BitwiseOperationsType, Equatable
init(_: Raw)
typealias RawValue: BitwiseOperationsType, Equatable
init(rawValue: RawValue)
}
public func == <T: _RawOptionSetType>(a: T, b: T) -> Bool {
return a.raw == b.raw
return a.rawValue == b.rawValue
}
public func & <T: _RawOptionSetType>(a: T, b: T) -> T {
return T(a.raw & b.raw)
return T(rawValue: a.rawValue & b.rawValue)
}
public func | <T: _RawOptionSetType>(a: T, b: T) -> T {
return T(a.raw | b.raw)
return T(rawValue: a.rawValue | b.rawValue)
}
public func ^ <T: _RawOptionSetType>(a: T, b: T) -> T {
return T(a.raw ^ b.raw)
return T(rawValue: a.rawValue ^ b.rawValue)
}
public prefix func ~ <T: _RawOptionSetType>(a: T) -> T {
return T(~a.raw)
return T(rawValue: ~a.rawValue)
}
// TODO: This is an incomplete implementation of our option sets vision.
@@ -198,7 +198,7 @@ public protocol RawOptionSetType : _RawOptionSetType, BitwiseOperationsType,
// implementations in protocols)
// The Clang importer synthesizes these for imported NS_OPTIONS.
/* init?(_ raw: Raw) { self.init(raw) } */
/* init?(rawValue: RawValue) { self.init(rawValue) } */
}
/// Conforming to this protocol allows a type to be usable with the 'nil'