@@ -1499,9 +1499,9 @@ public func checkHashable<T : Hashable>(
1499
1499
[ lhs, rhs] , equalityOracle: { expectedEqual || $0 == $1 } , ${ trace} )
1500
1500
}
1501
1501
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') ) :
1505
1505
1506
1506
/// Test that the elements of `instances` satisfy
1507
1507
/// ${'some of ' if inc == 'dec' else ''}the semantic
@@ -1531,16 +1531,6 @@ public func check${inc.capitalize()}rementable<
1531
1531
var j = i
1532
1532
j. _ ${ successor} InPlace( )
1533
1533
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} )
1544
1534
}
1545
1535
}
1546
1536
}
@@ -1928,7 +1918,8 @@ public func checkSequence<
1928
1918
expectTrue ( end == buf + count, " _initializeTo returned the wrong value " )
1929
1919
var j = expected. startIndex
1930
1920
for i in 0 ..< ( end - buf) {
1931
- expectTrue ( sameValue ( expected [ j++ ] , buf [ i] ) )
1921
+ expectTrue ( sameValue ( expected [ j] , buf [ i] ) )
1922
+ j = j. successor ( )
1932
1923
}
1933
1924
buf. destroy ( end - buf)
1934
1925
buf. dealloc ( count)
@@ -2018,7 +2009,7 @@ public func check${traversal}Collection<
2018
2009
}
2019
2010
else {
2020
2011
for _ in 0 ..< n. toIntMax ( ) {
2021
- ++ i
2012
+ i += 1
2022
2013
}
2023
2014
}
2024
2015
return i
@@ -2064,9 +2055,9 @@ public func check${traversal}Collection<
2064
2055
for i in 0 ..< allIndices. count- 1 {
2065
2056
let successor1 = allIndices [ i] . successor ( )
2066
2057
var successor2 = allIndices [ i]
2067
- successor2++
2058
+ successor2 = successor2 . successor ( )
2068
2059
var successor3 = allIndices [ i]
2069
- ++ successor3
2060
+ successor3 = successor3 . successor ( )
2070
2061
for s in [ successor1, successor2, successor3 ] {
2071
2062
expectEqual ( allIndices [ i + 1 ] , s, ${ trace} )
2072
2063
expectEqual (
@@ -2088,8 +2079,8 @@ public func check${traversal}Collection<
2088
2079
}
2089
2080
for i in 1 ..< allIndices . count {
2090
2081
var index = allIndices [ i]
2091
- -- index
2092
- ++ index
2082
+ index = index . predecessor ( )
2083
+ index = index . successor ( )
2093
2084
expectEqual ( allIndices [ i] , index, ${ trace} )
2094
2085
expectEqual (
2095
2086
expectedArray [ i] , collection [ index] , ${ trace} , sameValue: sameValue)
@@ -2160,29 +2151,29 @@ public func checkSliceableWithBidirectionalIndex<
2160
2151
var start = sliceable. startIndex
2161
2152
for startNumericIndex in 0 ... expectedArray. count {
2162
2153
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 ( )
2167
2158
}
2168
2159
var end = start
2169
2160
for endNumericIndex in startNumericIndex... expectedArray. count {
2170
2161
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 ( )
2175
2166
}
2176
2167
let expectedSlice = expectedArray [ startNumericIndex..< endNumericIndex]
2177
2168
let slice = sliceable [ start..< end]
2178
2169
checkBidirectionalCollection ( expectedSlice, slice, ${ trace} )
2179
2170
2180
2171
if end != sliceable. endIndex {
2181
- ++ end
2172
+ end = end . successor ( )
2182
2173
}
2183
2174
}
2184
2175
if start != sliceable. endIndex {
2185
- ++ start
2176
+ end = end . successor ( )
2186
2177
}
2187
2178
}
2188
2179
}
0 commit comments