Skip to content

Commit 685b4ed

Browse files
committed
Reapply: Remove the last uses of ++/-- from the stdlib directory.
This reverts commit fc6a406.
1 parent e9a435d commit 685b4ed

File tree

1 file changed

+20
-29
lines changed

1 file changed

+20
-29
lines changed

stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb

Lines changed: 20 additions & 29 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, op, successor, end in (
1503-
% ('inc', '_Incrementable', '++', 'successor', 'end'),
1504-
% ('dec', 'BidirectionalIndexType', '--', 'predecessor', 'start')):
1502+
% for inc, protocol, 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,16 +1531,6 @@ 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})
15441534
}
15451535
}
15461536
}
@@ -1928,7 +1918,8 @@ public func checkSequence<
19281918
expectTrue(end == buf + count, "_initializeTo returned the wrong value")
19291919
var j = expected.startIndex
19301920
for i in 0..<(end - buf) {
1931-
expectTrue(sameValue(expected[j++], buf[i]))
1921+
expectTrue(sameValue(expected[j], buf[i]))
1922+
j = j.successor()
19321923
}
19331924
buf.destroy(end - buf)
19341925
buf.dealloc(count)
@@ -2018,7 +2009,7 @@ public func check${traversal}Collection<
20182009
}
20192010
else {
20202011
for _ in 0..<n.toIntMax() {
2021-
++i
2012+
i += 1
20222013
}
20232014
}
20242015
return i
@@ -2064,9 +2055,9 @@ public func check${traversal}Collection<
20642055
for i in 0..<allIndices.count-1 {
20652056
let successor1 = allIndices[i].successor()
20662057
var successor2 = allIndices[i]
2067-
successor2++
2058+
successor2 = successor2.successor()
20682059
var successor3 = allIndices[i]
2069-
++successor3
2060+
successor3 = successor3.successor()
20702061
for s in [ successor1, successor2, successor3 ] {
20712062
expectEqual(allIndices[i + 1], s, ${trace})
20722063
expectEqual(
@@ -2088,8 +2079,8 @@ public func check${traversal}Collection<
20882079
}
20892080
for i in 1..<allIndices.count {
20902081
var index = allIndices[i]
2091-
--index
2092-
++index
2082+
index = index.predecessor()
2083+
index = index.successor()
20932084
expectEqual(allIndices[i], index, ${trace})
20942085
expectEqual(
20952086
expectedArray[i], collection[index], ${trace}, sameValue: sameValue)
@@ -2160,29 +2151,29 @@ public func checkSliceableWithBidirectionalIndex<
21602151
var start = sliceable.startIndex
21612152
for startNumericIndex in 0...expectedArray.count {
21622153
if start != sliceable.endIndex {
2163-
++start
2164-
--start
2165-
++start
2166-
--start
2154+
start = start.successor()
2155+
start = start.predecessor()
2156+
start = start.successor()
2157+
start = start.predecessor()
21672158
}
21682159
var end = start
21692160
for endNumericIndex in startNumericIndex...expectedArray.count {
21702161
if end != sliceable.endIndex {
2171-
++end
2172-
--end
2173-
++end
2174-
--end
2162+
end = end.successor()
2163+
end = end.predecessor()
2164+
end = end.successor()
2165+
end = end.predecessor()
21752166
}
21762167
let expectedSlice = expectedArray[startNumericIndex..<endNumericIndex]
21772168
let slice = sliceable[start..<end]
21782169
checkBidirectionalCollection(expectedSlice, slice, ${trace})
21792170

21802171
if end != sliceable.endIndex {
2181-
++end
2172+
end = end.successor()
21822173
}
21832174
}
21842175
if start != sliceable.endIndex {
2185-
++start
2176+
end = end.successor()
21862177
}
21872178
}
21882179
}

0 commit comments

Comments
 (0)