Skip to content

Commit 5037182

Browse files
author
Max Moiseev
committed
reverse() => reversed()
1 parent e175a84 commit 5037182

16 files changed

+49
-49
lines changed

stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public struct SourceLocStack {
105105
func _printStackTrace(stackTrace: SourceLocStack?) {
106106
guard let s = stackTrace where !s.locs.isEmpty else { return }
107107
print("stacktrace:")
108-
for (i, loc) in s.locs.reverse().enumerated {
108+
for (i, loc) in s.locs.reversed().enumerated {
109109
let comment = (loc.comment != nil) ? " ; \(loc.comment!)" : ""
110110
print(" #\(i): \(loc.file):\(loc.line)\(comment)")
111111
}

stdlib/public/core/Reverse.swift

+10-10
Original file line numberDiff line numberDiff line change
@@ -123,17 +123,17 @@ extension _ReverseCollection
123123
/// A Collection that presents the elements of its `Base` collection
124124
/// in reverse order.
125125
///
126-
/// - Note: This type is the result of `x.reverse()` where `x` is a
126+
/// - Note: This type is the result of `x.reversed()` where `x` is a
127127
/// collection having bidirectional indices.
128128
///
129-
/// The `reverse()` method is always lazy when applied to a collection
129+
/// The `reversed()` method is always lazy when applied to a collection
130130
/// with bidirectional indices, but does not implicitly confer
131131
/// laziness on algorithms applied to its result. In other words, for
132132
/// ordinary collections `c` having bidirectional indices:
133133
///
134-
/// * `c.reverse()` does not create new storage
135-
/// * `c.reverse().map(f)` maps eagerly and returns a new array
136-
/// * `c.lazy.reverse().map(f)` maps lazily and returns a `LazyMapCollection`
134+
/// * `c.reversed()` does not create new storage
135+
/// * `c.reversed().map(f)` maps eagerly and returns a new array
136+
/// * `c.lazy.reversed().map(f)` maps lazily and returns a `LazyMapCollection`
137137
///
138138
/// - See also: `ReverseRandomAccessCollection`
139139
public struct ReverseCollection<
@@ -163,7 +163,7 @@ public struct ReverseCollection<
163163
/// A Collection that presents the elements of its `Base` collection
164164
/// in reverse order.
165165
///
166-
/// - Note: This type is the result of `x.reverse()` where `x` is a
166+
/// - Note: This type is the result of `x.reversed()` where `x` is a
167167
/// collection having random access indices.
168168
/// - See also: `ReverseCollection`
169169
public struct ReverseRandomAccessCollection<
@@ -197,7 +197,7 @@ extension Collection where Index : BidirectionalIndex {
197197
///
198198
/// - Complexity: O(1)
199199
@warn_unused_result
200-
public func reverse() -> ReverseCollection<Self> {
200+
public func reversed() -> ReverseCollection<Self> {
201201
return ReverseCollection(self)
202202
}
203203
}
@@ -207,7 +207,7 @@ extension Collection where Index : RandomAccessIndex {
207207
///
208208
/// - Complexity: O(1)
209209
@warn_unused_result
210-
public func reverse() -> ReverseRandomAccessCollection<Self> {
210+
public func reversed() -> ReverseRandomAccessCollection<Self> {
211211
return ReverseRandomAccessCollection(self)
212212
}
213213
}
@@ -218,7 +218,7 @@ where Index : BidirectionalIndex, Elements.Index : BidirectionalIndex {
218218
///
219219
/// - Complexity: O(1)
220220
@warn_unused_result
221-
public func reverse() -> LazyCollection<
221+
public func reversed() -> LazyCollection<
222222
ReverseCollection<Elements>
223223
> {
224224
return ReverseCollection(elements).lazy
@@ -231,7 +231,7 @@ where Index : RandomAccessIndex, Elements.Index : RandomAccessIndex {
231231
///
232232
/// - Complexity: O(1)
233233
@warn_unused_result
234-
public func reverse() -> LazyCollection<
234+
public func reversed() -> LazyCollection<
235235
ReverseRandomAccessCollection<Elements>
236236
> {
237237
return ReverseRandomAccessCollection(elements).lazy

stdlib/public/core/SequenceAlgorithms.swift.gyb

+2-2
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ extension Sequence {
355355
}
356356

357357
//===----------------------------------------------------------------------===//
358-
// reverse()
358+
// reversed()
359359
//===----------------------------------------------------------------------===//
360360

361361
extension Sequence {
@@ -364,7 +364,7 @@ extension Sequence {
364364
///
365365
/// Complexity: O(`self.length`).
366366
@warn_unused_result
367-
public func reverse() -> [${GElement}] {
367+
public func reversed() -> [${GElement}] {
368368
// FIXME(performance): optimize to 1 pass? But Array(self) can be
369369
// optimized to a memcpy() sometimes. Those cases are usually collections,
370370
// though.

test/1_stdlib/Collection.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ print("")
6565
// <rdar://problem/15772601> Type checking failure
6666
// CHECK: raboof
6767
let i = foobar.indices
68-
let r = i.lazy.reverse()
68+
let r = i.lazy.reversed()
6969
for a in PermutationGenerator(elements: foobar, indices: r) {
7070

7171
print(a, terminator: "")
@@ -82,7 +82,7 @@ func isPalindrome0<
8282

8383
var a = seq.indices
8484
var i = seq.indices
85-
var ir = i.lazy.reverse()
85+
var ir = i.lazy.reversed()
8686
var b = ir.iterator()
8787
for i in a {
8888
if seq[i] != seq[b.next()!] {
@@ -105,7 +105,7 @@ func isPalindrome1<
105105
>(seq: S) -> Bool {
106106

107107
var a = PermutationGenerator(elements: seq, indices: seq.indices)
108-
var b = seq.lazy.reverse().iterator()
108+
var b = seq.lazy.reversed().iterator()
109109
for nextChar in a {
110110
if nextChar != b.next()! {
111111
return false
@@ -122,7 +122,7 @@ func isPalindrome1_5<
122122
S.Iterator.Element: Equatable
123123
>(seq: S) -> Bool {
124124

125-
var b = seq.lazy.reverse().iterator()
125+
var b = seq.lazy.reversed().iterator()
126126
for nextChar in seq {
127127
if nextChar != b.next()! {
128128
return false
@@ -187,7 +187,7 @@ func isPalindrome4<
187187
// FIXME: separate ri from the expression below pending
188188
// <rdar://problem/15772601> Type checking failure
189189
var i = seq.indices
190-
let ri = i.lazy.reverse()
190+
let ri = i.lazy.reversed()
191191
var b = PermutationGenerator(elements: seq, indices: ri)
192192
for nextChar in a {
193193
if nextChar != b.next()! {

test/1_stdlib/ExistentialCollection.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -211,20 +211,20 @@ tests.test("ForwardCollection") {
211211

212212
tests.test("BidirectionalCollection") {
213213
let a0: ContiguousArray = [1, 2, 3, 5, 8, 13, 21]
214-
let fc0 = AnyForwardCollection(a0.lazy.reverse())
214+
let fc0 = AnyForwardCollection(a0.lazy.reversed())
215215

216216
let bc0_ = AnyBidirectionalCollection(fc0) // upgrade!
217217
expectNotEmpty(bc0_)
218218
let bc0 = bc0_!
219219
expectTrue(fc0 === bc0)
220220

221-
let fc1 = AnyForwardCollection(a0.lazy.reverse()) // new collection
221+
let fc1 = AnyForwardCollection(a0.lazy.reversed()) // new collection
222222
expectFalse(fc1 === fc0)
223223

224224
let fc2 = AnyForwardCollection(bc0) // downgrade
225225
expectTrue(fc2 === bc0)
226226

227-
let a1 = ContiguousArray(bc0.lazy.reverse())
227+
let a1 = ContiguousArray(bc0.lazy.reversed())
228228
expectEqual(a0, a1)
229229
for e in a0 {
230230
let i = bc0.indexOf(e)
@@ -247,7 +247,7 @@ tests.test("BidirectionalCollection") {
247247

248248
tests.test("RandomAccessCollection") {
249249
let a0: ContiguousArray = [1, 2, 3, 5, 8, 13, 21]
250-
let fc0 = AnyForwardCollection(a0.lazy.reverse())
250+
let fc0 = AnyForwardCollection(a0.lazy.reversed())
251251
let rc0_ = AnyRandomAccessCollection(fc0) // upgrade!
252252
expectNotEmpty(rc0_)
253253
let rc0 = rc0_!
@@ -259,7 +259,7 @@ tests.test("RandomAccessCollection") {
259259
let fc1 = AnyBidirectionalCollection(rc0) // downgrade
260260
expectTrue(fc1 === rc0)
261261

262-
let a1 = ContiguousArray(rc0.lazy.reverse())
262+
let a1 = ContiguousArray(rc0.lazy.reversed())
263263
expectEqual(a0, a1)
264264
for e in a0 {
265265
let i = rc0.indexOf(e)

test/1_stdlib/Lazy.swift.gyb

+9-9
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,12 @@ LazyTestSuite.test("LazyCollection.array") {
287287
}
288288

289289
% if ReversedType is not None:
290-
LazyTestSuite.test("LazyCollection.reverse") {
290+
LazyTestSuite.test("LazyCollection.reversed") {
291291
let base = Minimal${traversal}Collection(
292292
elements: [ 0, 30, 10, 90 ].map(OpaqueValue.init),
293293
underestimatedLength: .Value(42))
294294
let lazyCollection = base.lazy
295-
var reversed = lazyCollection.reverse()
295+
var reversed = lazyCollection.reversed()
296296
expectType(
297297
LazyCollection<${ReversedType}<Minimal${traversal}Collection<OpaqueValue<Int>>>>.self,
298298
&reversed)
@@ -301,7 +301,7 @@ LazyTestSuite.test("LazyCollection.reverse") {
301301
[ 90, 10, 30, 0 ].map(OpaqueValue.init) as [OpaqueValue<Int>],
302302
reversed) { $0.value == $1.value }
303303

304-
var reversedTwice = reversed.reverse()
304+
var reversedTwice = reversed.reversed()
305305
expectType(
306306
LazyCollection<${ReversedType}<${ReversedType}<Minimal${traversal}Collection<OpaqueValue<Int>>>>>.self,
307307
&reversedTwice)
@@ -592,23 +592,23 @@ tests.test("ReverseCollection") {
592592
let r = 0..<12
593593
checkRandomAccessCollection(
594594
expected,
595-
r.reverse())
595+
r.reversed())
596596

597597
// Check that the reverse collection is still eager
598598
do {
599599
var calls = 0
600-
_ = r.reverse().map { _ in ++calls }
600+
_ = r.reversed().map { _ in ++calls }
601601
expectEqual(r.length, calls)
602602
}
603603

604604
checkBidirectionalCollection(
605605
"raboof".characters,
606-
"foobar".characters.reverse())
606+
"foobar".characters.reversed())
607607

608608
// Check that the reverse collection is still eager
609609
do {
610610
var calls = 0
611-
_ = "foobar".characters.reverse().map { _ in ++calls }
611+
_ = "foobar".characters.reversed().map { _ in ++calls }
612612
expectEqual("foobar".characters.length, calls)
613613
}
614614
}
@@ -633,7 +633,7 @@ tests.test("ReverseCollection/Lazy") {
633633
typealias LazyReversedBase = LazyCollection<
634634
ReverseRandomAccessCollection<Base>>
635635

636-
let reversed = base.reverse()
636+
let reversed = base.reversed()
637637
ExpectType<LazyReversedBase>.test(reversed)
638638

639639
var calls = 0
@@ -655,7 +655,7 @@ tests.test("ReverseCollection/Lazy") {
655655
typealias LazyReversedBase = LazyCollection<
656656
ReverseCollection<Base>>
657657

658-
let reversed = base.reverse()
658+
let reversed = base.reversed()
659659
ExpectType<LazyReversedBase>.test(reversed)
660660

661661
var calls = 0

test/1_stdlib/NSStringAPI.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -2051,8 +2051,8 @@ func checkHasPrefixHasSuffix(
20512051
let expectHasPrefix = lhsNFDGraphemeClusters.startsWith(
20522052
rhsNFDGraphemeClusters, isEquivalent: (==))
20532053
let expectHasSuffix =
2054-
lhsNFDGraphemeClusters.lazy.reverse().startsWith(
2055-
rhsNFDGraphemeClusters.lazy.reverse(), isEquivalent: (==))
2054+
lhsNFDGraphemeClusters.lazy.reversed().startsWith(
2055+
rhsNFDGraphemeClusters.lazy.reversed(), isEquivalent: (==))
20562056

20572057
expectEqual(expectHasPrefix, lhs.hasPrefix(rhs), stackTrace: stackTrace)
20582058
expectEqual(

test/1_stdlib/Range.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ var RangeTestSuite = TestSuite("Range")
3333
RangeTestSuite.test("ReverseRange") {
3434
// We no longer have a ReverseRange, but we can still make sure that
3535
// lazy reversal works correctly.
36-
expectEqualSequence((0..<10).lazy.reverse(), [9, 8, 7, 6, 5, 4, 3, 2, 1, 0])
36+
expectEqualSequence((0..<10).lazy.reversed(), [9, 8, 7, 6, 5, 4, 3, 2, 1, 0])
3737
}
3838

3939
func isEquatable<E : Equatable>(e: E) {}

test/Constraints/generics.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ func f1<
143143
S: Collection
144144
where S.Index: BidirectionalIndex
145145
>(seq: S) {
146-
let x = (seq.indices).lazy.reverse()
146+
let x = (seq.indices).lazy.reversed()
147147
SomeIterator(elements: seq, indices: x) // expected-warning{{unused}}
148-
SomeIterator(elements: seq, indices: seq.indices.reverse()) // expected-warning{{unused}}
148+
SomeIterator(elements: seq, indices: seq.indices.reversed()) // expected-warning{{unused}}
149149
}
150150

151151
// <rdar://problem/16078944>

test/IDE/complete_from_stdlib.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ func testArchetypeReplacement2<BAR : Equatable>(a: [BAR]) {
146146
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: min({#(isOrderedBefore): (Equatable, Equatable) throws -> Bool##(Equatable, Equatable) throws -> Bool#})[' rethrows'][#Equatable?#]{{; name=.+}}
147147
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: max({#(isOrderedBefore): (Equatable, Equatable) throws -> Bool##(Equatable, Equatable) throws -> Bool#})[' rethrows'][#Equatable?#]{{; name=.+}}
148148
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: reduce({#(initial): T#}, {#combine: (T, Equatable) throws -> T##(T, Equatable) throws -> T#})[' rethrows'][#T#]{{; name=.+}}
149-
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: reverse()[#ReverseCollection<[Equatable]>#]{{; name=.+}}
150-
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: reverse()[#ReverseRandomAccessCollection<[Equatable]>#]{{; name=.+}}
149+
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: reversed()[#ReverseCollection<[Equatable]>#]{{; name=.+}}
150+
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: reversed()[#ReverseRandomAccessCollection<[Equatable]>#]{{; name=.+}}
151151
// PRIVATE_NOMINAL_MEMBERS_6-DAG: Decl[InstanceMethod]/Super: flatMap({#(transform): (Equatable) throws -> Sequence##(Equatable) throws -> Sequence#})[' rethrows'][#[S.Iterator.Element]#]{{; name=.+}}
152152

153153
func testArchetypeReplacement3 (a : [Int]) {

test/Interpreter/SDK/Accelerate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ extension vU1024: IntegerLiteralConvertible, CustomStringConvertible, Equatable
2828
(intermediate, digit) = quorem(intermediate, 10)
2929
digits.append(Character(UnicodeScalar(Int(digit) + 48)))
3030
} while intermediate != 0
31-
return String(digits.reverse())
31+
return String(digits.reversed())
3232
}
3333
}
3434

test/Interpreter/algorithms.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fib()
1919

2020
// From: <rdar://problem/17796401>
2121
// FIXME: <rdar://problem/21993692> type checker too slow
22-
let two_oneA = [1, 2, 3, 4].lazy.reverse()
22+
let two_oneA = [1, 2, 3, 4].lazy.reversed()
2323
let two_one = Array(two_oneA.filter { $0 % 2 == 0 }.map { $0 / 2 })
2424
print(two_one)
2525
// CHECK: [2, 1]

validation-test/compiler_crashers_2_fixed/0019-rdar21511651.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ extension Collection
416416

417417

418418

419-
/// The lazy `Collection` returned by `reverse(c)` where `c` is a
419+
/// The lazy `Collection` returned by `c.reversed()` where `c` is a
420420
/// `Collection` with an `Index` conforming to `${IndexProtocol}`.
421421
public struct _prext_ReverseCollection<Base : Collection>
422422
: Collection, __prext_ReverseCollection {

validation-test/stdlib/ArrayNew.swift.gyb

+1-1
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ ArrayTestSuite.test("${Kind}/popLast") {
335335
while let element = a.popLast() {
336336
popped.append(element)
337337
}
338-
expectEqualSequence([1010, 2020, 3030], popped.reverse())
338+
expectEqualSequence([1010, 2020, 3030], popped.reversed())
339339
expectTrue(a.isEmpty)
340340
}
341341
}

validation-test/stdlib/Concatenate.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ for (expected, source) in samples {
4747
ConcatenateTests.test("reverse-\(source)") {
4848
// FIXME: separate 'expected' and 'reversed' variables are a workaround
4949
// for: <rdar://problem/20789500>
50-
let expected = ContiguousArray(expected.lazy.reverse())
51-
let reversed = source.flatten().reverse()
50+
let expected = ContiguousArray(expected.lazy.reversed())
51+
let reversed = source.flatten().reversed()
5252
checkBidirectionalCollection(expected, reversed)
5353
}
5454

validation-test/stdlib/SequenceType.swift.gyb

+4-4
Original file line numberDiff line numberDiff line change
@@ -639,14 +639,14 @@ SequenceTypeTests.test("reduce") {
639639
}
640640

641641
//===----------------------------------------------------------------------===//
642-
// reverse()
642+
// reversed()
643643
//===----------------------------------------------------------------------===//
644644

645645
SequenceTypeTests.test("reverse/Sequence") {
646646
for test in reverseTests {
647647
let s = MinimalSequence<OpaqueValue<Int>>(
648648
elements: test.sequence.map(OpaqueValue.init))
649-
var result = s.reverse()
649+
var result = s.reversed()
650650
expectType([OpaqueValue<Int>].self, &result)
651651
expectEqual(
652652
test.expected, result.map { $0.value },
@@ -659,7 +659,7 @@ SequenceTypeTests.test("reverse/WhereIndexIsBidirectional,BidirectionalReverseVi
659659
for test in reverseTests {
660660
let s = MinimalBidirectionalCollection<OpaqueValue<Int>>(
661661
elements: test.sequence.map(OpaqueValue.init))
662-
var result = s.reverse()
662+
var result = s.reversed()
663663
expectType(
664664
ReverseCollection<MinimalBidirectionalCollection<OpaqueValue<Int>>>.self,
665665
&result)
@@ -678,7 +678,7 @@ SequenceTypeTests.test("reverse/WhereIndexIsRandomAccess,RandomAccessReverseView
678678
for test in reverseTests {
679679
let s = MinimalRandomAccessCollection<OpaqueValue<Int>>(
680680
elements: test.sequence.map(OpaqueValue.init))
681-
var result = s.reverse()
681+
var result = s.reversed()
682682
expectType(
683683
ReverseRandomAccessCollection<MinimalRandomAccessCollection<OpaqueValue<Int>>>.self,
684684
&result)

0 commit comments

Comments
 (0)