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

Revert "stdlib: make all collections sliceable, first steps"

Browse Source 
This reverts commit r27617.  Too late, it crashes the type checker now.

Swift SVN r27618
This commit is contained in:
Dmitri Hrybenko
2015-04-23 00:56:30 +00:00
parent 0cdf289c9c
commit 005c76ba07
5 changed files with 7 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
test/1_stdlib/Algorithm.swift.gyb
View File

@@ -2340,155 +2340,6 @@ SequenceTypeAlgorithms.test("CollectionType.generate()/CustomImplementation") {
}
}
//===----------------------------------------------------------------------===//
// CollectionType.subscript(range:), CollectionType.SubSlice
//===----------------------------------------------------------------------===//
struct MinimalCollectionWithDefaultSlicing : CollectionType {
init(count: Int) {
self._count = count
}
var startIndex: MinimalForwardIndex {
return MinimalForwardIndex(position: 0, startIndex: 0, endIndex: _count)
}
var endIndex: MinimalForwardIndex {
return MinimalForwardIndex(
position: _count, startIndex: 0, endIndex: _count)
}
subscript(i: MinimalForwardIndex) -> OpaqueValue<Int> {
return OpaqueValue(i.position + 1)
}
var _count: Int
}
func callGenericSlicing<C : CollectionType>(
collection: C,
bounds: Range<C.Index>
) -> C._prext_SubSlice {
return collection[bounds]
}
// FIXME: need separate tests for the Slice type itself.
SequenceTypeAlgorithms.test("subscript(range:)/DefaultImplementation") {
for count in [ 0, 5 ] {
let collection = MinimalCollectionWithDefaultSlicing(count: count)
if true {
// Check the return type of the function when called statically.
var slice = collection[collection.startIndex..<collection.endIndex]
expectType(
_prext_Slice<MinimalCollectionWithDefaultSlicing>.self,
&slice)
}
if true {
// Check the return type of the function when called generically.
var slice = callGenericSlicing(
collection,
collection.startIndex..<collection.endIndex)
expectType(
_prext_Slice<MinimalCollectionWithDefaultSlicing>.self,
&slice)
}
// FIXME: improve checkForwardCollection to check the SubSlice type.
checkForwardCollection(
Array(1..<count+1)._prext_map { OpaqueValue($0) },
collection,
{ $0.value == $1.value },
SourceLocStack().withCurrentLoc())
}
}
struct MinimalCollectionWithCustomSlicing : CollectionType {
init(count: Int) {
self._count = count
}
var startIndex: MinimalForwardIndex {
return MinimalForwardIndex(position: 0, startIndex: 0, endIndex: _count)
}
var endIndex: MinimalForwardIndex {
return MinimalForwardIndex(
position: _count, startIndex: 0, endIndex: _count)
}
subscript(i: MinimalForwardIndex) -> OpaqueValue<Int> {
return OpaqueValue(i.position + 1)
}
subscript(bounds: Range<MinimalForwardIndex>) -> CustomSlice {
return CustomSlice(
start: bounds.startIndex.position,
end: bounds.endIndex.position)
}
var _count: Int
}
struct CustomSlice : CollectionType {
init(start: Int, end: Int) {
self._start = start
self._end = end
}
var startIndex: MinimalForwardIndex {
return MinimalForwardIndex(
position: _start,
startIndex: _start,
endIndex: _end)
}
var endIndex: MinimalForwardIndex {
return MinimalForwardIndex(
position: _end,
startIndex: _start,
endIndex: _end)
}
subscript(i: MinimalForwardIndex) -> OpaqueValue<Int> {
return OpaqueValue(i.position + 1)
}
var _start: Int
var _end: Int
}
// FIXME: need separate tests for the Slice type itself.
SequenceTypeAlgorithms.test("subscript(range:)/CustomImplementation") {
for count in [ 0, 5 ] {
let collection = MinimalCollectionWithCustomSlicing(count: count)
if true {
// Check the return type of the function when called statically.
var slice = collection[collection.startIndex..<collection.endIndex]
expectType(CustomSlice.self, &slice)
}
if true {
// Check the return type of the function when called generically.
var slice = callGenericSlicing(
collection,
collection.startIndex..<collection.endIndex)
expectType(CustomSlice.self, &slice)
}
// FIXME: improve checkForwardCollection to check the SubSlice type.
checkForwardCollection(
Array(1..<count+1)._prext_map { OpaqueValue($0) },
collection,
{ $0.value == $1.value },
SourceLocStack().withCurrentLoc())
}
}
//===----------------------------------------------------------------------===//
// isEmpty
//===----------------------------------------------------------------------===//