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

[stdlib] Adopt conditional conformance for Indices, Slice, ReversedCollection (#12913)

Browse Source 
* Refactor Indices and Slice to use conditional conformance

* Replace ReversedRandomAccessCollection with a conditional extension

* Refactor some types into struct+extensions

* Revise Slice documentation

* Fix test cases for adoption of conditional conformances.

* [RangeReplaceableCollection] Eliminate unnecessary slicing subscript operator.

* Add -enable-experimental-conditional-conformances to test.

* Gruesome workaround for crasher in MutableSlice tests
This commit is contained in:
Ben Cohen
2017-11-30 09:10:22 -08:00
committed by GitHub
parent eea5e5db47
commit c4f0b5fe94
25 changed files with 347 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
stdlib/public/core/Substring.swift.gyb
View File

@@ -94,17 +94,17 @@ public struct Substring : StringProtocol {
public typealias SubSequence = Substring
@_versioned // FIXME(sil-serialize-all)
internal var _slice: RangeReplaceableBidirectionalSlice<String>
internal var _slice: Slice<String>
/// Creates an empty substring.
@_inlineable // FIXME(sil-serialize-all)
public init() {
_slice = RangeReplaceableBidirectionalSlice()
_slice = Slice()
}
@_inlineable // FIXME(sil-serialize-all)
@_versioned // FIXME(sil-serialize-all)
internal init(_slice: RangeReplaceableBidirectionalSlice<String>) {
internal init(_slice: Slice<String>) {
self._slice = _slice
}
@@ -116,7 +116,7 @@ public struct Substring : StringProtocol {
/// upper bounds of `bounds` must be valid indices of `base`.
@_inlineable // FIXME(sil-serialize-all)
public init(_base base: String, _ bounds: Range<Index>) {
_slice = RangeReplaceableBidirectionalSlice(base: base, bounds: bounds)
_slice = Slice(base: base, bounds: bounds)
}
@_inlineable // FIXME(sil-serialize-all)
@@ -434,7 +434,7 @@ extension Substring {
@_fixed_layout // FIXME(sil-serialize-all)
public struct ${View} {
@_versioned // FIXME(sil-serialize-all)
internal var _slice: ${RangeReplaceable}BidirectionalSlice<String.${View}>
internal var _slice: Slice<String.${View}>
}
}
@@ -446,7 +446,7 @@ extension Substring.${View} : BidirectionalCollection {
@_inlineable // FIXME(sil-serialize-all)
@_versioned // FIXME(sil-serialize-all)
internal init(_ base: String.${View}, _bounds: Range<Index>) {
_slice = ${RangeReplaceable}BidirectionalSlice(
_slice = Slice(
base: String(base._core).${property},
bounds: _bounds)
}
@@ -537,7 +537,7 @@ extension String {
// FIXME: The other String views should be RangeReplaceable too.
extension Substring.UnicodeScalarView : RangeReplaceableCollection {
@_inlineable // FIXME(sil-serialize-all)
public init() { _slice = RangeReplaceableBidirectionalSlice.init() }
public init() { _slice = Slice.init() }
@_inlineable // FIXME(sil-serialize-all)
public mutating func replaceSubrange<C : Collection>(
@@ -661,7 +661,7 @@ extension String {
@available(swift, introduced: 4)
public subscript(r: Range<Index>) -> Substring {
return Substring(
_slice: RangeReplaceableBidirectionalSlice(base: self, bounds: r))
_slice: Slice(base: self, bounds: r))
}
@_inlineable // FIXME(sil-serialize-all)