Skip to content

Commit fc6a406

Browse files
committed
Revert "Remove the last uses of ++/-- from the stdlib directory."
This reverts commit 0caebf2.
1 parent 976d39f commit fc6a406

File tree

1 file changed

+29
-20
lines changed

1 file changed

+29
-20
lines changed

stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,9 +1499,9 @@ public func checkHashable<T : Hashable>(
14991499
[lhs, rhs], equalityOracle: { expectedEqual || $0 == $1 }, ${trace})
15001500
}
15011501

1502-
% for inc, protocol, successor, end in (
1503-
% ('inc', '_Incrementable', 'successor', 'end'),
1504-
% ('dec', 'BidirectionalIndexType', 'predecessor', 'start')):
1502+
% for inc, protocol, op, successor, end in (
1503+
% ('inc', '_Incrementable', '++', 'successor', 'end'),
1504+
% ('dec', 'BidirectionalIndexType', '--', 'predecessor', 'start')):
15051505

15061506
/// Test that the elements of `instances` satisfy
15071507
/// ${'some of ' if inc == 'dec' else ''}the semantic
@@ -1531,6 +1531,16 @@ public func check${inc.capitalize()}rementable<
15311531
var j = i
15321532
j._${successor}InPlace()
15331533
expectEqual(j, next, ${trace})
1534+
1535+
// Post-${inc}rement works
1536+
j = i
1537+
expectEqual(j${op}, i, ${trace})
1538+
expectEqual(j, next, ${trace})
1539+
1540+
// Pre-${inc}rement works
1541+
j = i
1542+
expectEqual(${op}j, next, ${trace})
1543+
expectEqual(j, next, ${trace})
15341544
}
15351545
}
15361546
}
@@ -1918,8 +1928,7 @@ public func checkSequence<
19181928
expectTrue(end == buf + count, "_initializeTo returned the wrong value")
19191929
var j = expected.startIndex
19201930
for i in 0..<(end - buf) {
1921-
expectTrue(sameValue(expected[j], buf[i]))
1922-
j = j.successor()
1931+
expectTrue(sameValue(expected[j++], buf[i]))
19231932
}
19241933
buf.destroy(end - buf)
19251934
buf.dealloc(count)
@@ -2009,7 +2018,7 @@ public func check${traversal}Collection<
20092018
}
20102019
else {
20112020
for _ in 0..<n.toIntMax() {
2012-
i += 1
2021+
++i
20132022
}
20142023
}
20152024
return i
@@ -2055,9 +2064,9 @@ public func check${traversal}Collection<
20552064
for i in 0..<allIndices.count-1 {
20562065
let successor1 = allIndices[i].successor()
20572066
var successor2 = allIndices[i]
2058-
successor2 = successor2.successor()
2067+
successor2++
20592068
var successor3 = allIndices[i]
2060-
successor3 = successor3.successor()
2069+
++successor3
20612070
for s in [ successor1, successor2, successor3 ] {
20622071
expectEqual(allIndices[i + 1], s, ${trace})
20632072
expectEqual(
@@ -2079,8 +2088,8 @@ public func check${traversal}Collection<
20792088
}
20802089
for i in 1..<allIndices.count {
20812090
var index = allIndices[i]
2082-
index = index.predecessor()
2083-
index = index.successor()
2091+
--index
2092+
++index
20842093
expectEqual(allIndices[i], index, ${trace})
20852094
expectEqual(
20862095
expectedArray[i], collection[index], ${trace}, sameValue: sameValue)
@@ -2151,29 +2160,29 @@ public func checkSliceableWithBidirectionalIndex<
21512160
var start = sliceable.startIndex
21522161
for startNumericIndex in 0...expectedArray.count {
21532162
if start != sliceable.endIndex {
2154-
start = start.successor()
2155-
start = start.predecessor()
2156-
start = start.successor()
2157-
start = start.predecessor()
2163+
++start
2164+
--start
2165+
++start
2166+
--start
21582167
}
21592168
var end = start
21602169
for endNumericIndex in startNumericIndex...expectedArray.count {
21612170
if end != sliceable.endIndex {
2162-
end = end.successor()
2163-
end = end.predecessor()
2164-
end = end.successor()
2165-
end = end.predecessor()
2171+
++end
2172+
--end
2173+
++end
2174+
--end
21662175
}
21672176
let expectedSlice = expectedArray[startNumericIndex..<endNumericIndex]
21682177
let slice = sliceable[start..<end]
21692178
checkBidirectionalCollection(expectedSlice, slice, ${trace})
21702179

21712180
if end != sliceable.endIndex {
2172-
end = end.successor()
2181+
++end
21732182
}
21742183
}
21752184
if start != sliceable.endIndex {
2176-
end = end.successor()
2185+
++start
21772186
}
21782187
}
21792188
}

0 commit comments

Comments
 (0)