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