Revert "Move the testsuite off ++/-- completely."

This reverts commit bc65836.

Author: gottesmm

test/1_stdlib/Collection.swift

@@ -114,10 +114,9 @@ func isPalindrome2<
     if (b == --e) { 
       break
     }
-    if seq[b] != seq[e] {
+    if seq[b++] != seq[e] {
       return false
     }
-    b = b.successor()
   }
   return true
 }

test/1_stdlib/ExistentialCollection.swift

@@ -70,11 +70,7 @@ tests.test("AnyGenerator") {
   expectEqual(["0", "1", "2", "3", "4"], Array(countStrings()))
 
   var x = 7
-  let g = AnyGenerator<Int> {
-    if x >= 15 { return nil }
-    x += 1
-    return x-1
-  }
+  let g = AnyGenerator { x < 15 ? x++ : nil }
   expectEqual([ 7, 8, 9, 10, 11, 12, 13, 14 ], Array(g))
 }
 
@@ -100,32 +96,32 @@ struct InstrumentedIndex<I : RandomAccessIndexType> : RandomAccessIndexType {
   }
 
   func successor() -> InstrumentedIndex {
-    callCounts["successor"]! += 1
+    ++callCounts["successor"]!
     return InstrumentedIndex(base.successor())
   }
 
   mutating func _successorInPlace() {
-    callCounts["_successorInPlace"]! += 1
+    ++callCounts["_successorInPlace"]!
     base._successorInPlace()
   }
 
   func predecessor() -> InstrumentedIndex {
-    callCounts["predecessor"]! += 1
+    ++callCounts["predecessor"]!
     return InstrumentedIndex(base.predecessor())
   }
 
   mutating func _predecessorInPlace() {
-    callCounts["_predecessorInPlace"]! += 1
+    ++callCounts["_predecessorInPlace"]!
     base._predecessorInPlace()
   }
 
   func advancedBy(distance: Distance) -> InstrumentedIndex {
-    callCounts["advancedBy"]! += 1
+    ++callCounts["advancedBy"]!
     return InstrumentedIndex(base.advancedBy(distance))
   }
 
   func distanceTo(other: InstrumentedIndex) -> Distance {
-    callCounts["distanceTo"]! += 1
+    ++callCounts["distanceTo"]!
     return base.distanceTo(other.base)
   }
 }
@@ -171,11 +167,10 @@ tests.test("ForwardIndex") {
   i = i.successor()
   expectEqual(1, callCounts["successor"])
   expectEqual(0, callCounts["_successorInPlace"])
-  i._successorInPlace()
+  ++i
   expectEqual(1, callCounts["successor"])
   expectEqual(1, callCounts["_successorInPlace"])
-  var x = i
-  i = i.successor()
+  var x = i++
   expectEqual(2, callCounts["successor"])
   expectEqual(1, callCounts["_successorInPlace"])
   _blackHole(x)
@@ -189,11 +184,10 @@ tests.test("BidirectionalIndex") {
   i = i.predecessor()
   expectEqual(1, callCounts["predecessor"])
   expectEqual(0, callCounts["_predecessorInPlace"])
-  i._predecessorInPlace()
+  --i
   expectEqual(1, callCounts["predecessor"])
   expectEqual(1, callCounts["_predecessorInPlace"])
-  var x = i
-  i = i.predecessor()
+  var x = i--
   expectEqual(2, callCounts["predecessor"])
   expectEqual(1, callCounts["_predecessorInPlace"])
   _blackHole(x)

test/1_stdlib/Mirror.swift

@@ -63,15 +63,13 @@ func find(substring: String, within domain: String) -> String.Index? {
   if (domainCount < substringCount) { return nil }
   var sliceStart = domain.startIndex
   var sliceEnd = domain.startIndex.advancedBy(substringCount)
-  var i = 0
-  while true {
+  for var i = 0;; ++i {
     if domain[sliceStart..<sliceEnd] == substring {
       return sliceStart
     }
     if i == domainCount - substringCount { break }
-    sliceStart = sliceStart.successor()
-    sliceEnd = sliceEnd.successor()
-    i += 1
+    ++sliceStart
+    ++sliceEnd
   }
   return nil
 }

test/1_stdlib/StringTraps.swift

@@ -29,10 +29,10 @@ StringTraps.test("startIndex/predecessor")
   .code {
   var s = "abc"
   var i = s.startIndex
-  i = i.successor()
-  i = i.predecessor()
+  ++i
+  --i
   expectCrashLater()
-  i = i.predecessor()
+  --i
 }
 
 StringTraps.test("endIndex/successor")
@@ -42,11 +42,11 @@ StringTraps.test("endIndex/successor")
   .code {
   var s = "abc"
   var i = s.startIndex
-  i = i.successor()
-  i = i.successor()
-  i = i.successor()
+  ++i
+  ++i
+  ++i
   expectCrashLater()
-  i = i.successor()
+  ++i
 }
 
 StringTraps.test("subscript(_:)/endIndex")
@@ -56,9 +56,9 @@ StringTraps.test("subscript(_:)/endIndex")
   .code {
   var s = "abc"
   var i = s.startIndex
-  i = i.successor()
-  i = i.successor()
-  i = i.successor()
+  ++i
+  ++i
+  ++i
   expectCrashLater()
   s[i]
 }
@@ -70,11 +70,11 @@ StringTraps.test("UTF8ViewEndIndexSuccessor")
   .code {
   var s = "abc"
   var i = s.utf8.startIndex
-  i = i.successor()
-  i = i.successor()
-  i = i.successor()
+  ++i
+  ++i
+  ++i
   expectCrashLater()
-  i = i.successor()
+  ++i
 }
 
 StringTraps.test("UTF8ViewSubscript/endIndex")
@@ -84,9 +84,9 @@ StringTraps.test("UTF8ViewSubscript/endIndex")
   .code {
   var s = "abc"
   var i = s.utf8.startIndex
-  i = i.successor()
-  i = i.successor()
-  i = i.successor()
+  ++i
+  ++i
+  ++i
   expectCrashLater()
   s.utf8[i]
 }
@@ -98,7 +98,7 @@ StringTraps.test("UTF16ViewSubscript/DecrementedStartIndex")
   .code {
   var s = "abc"
   var i = s.utf16.startIndex
-  i = i.predecessor()
+  --i
   expectCrashLater()
   s.utf16[i]
 }
@@ -110,9 +110,9 @@ StringTraps.test("UTF16ViewSubscript/endIndex")
   .code {
   var s = "abc"
   var i = s.utf16.startIndex
-  i = i.successor()
-  i = i.successor()
-  i = i.successor()
+  ++i
+  ++i
+  ++i
   expectCrashLater()
   s.utf16[i]
 }

test/Prototypes/CollectionsMoveIndices.swift

@@ -178,7 +178,7 @@ extension MyForwardCollectionType {
       "Only BidirectionalIndexType can be advanced by a negative amount")
 
     var i = i
-    for var offset: Index.Distance = 0; offset != n; offset = offset + 1 {
+    for var offset: Index.Distance = 0; offset != n; ++offset {
       _nextInPlace(&i)
     }
     return i
@@ -194,7 +194,7 @@ extension MyForwardCollectionType {
       "Only BidirectionalIndexType can be advanced by a negative amount")
 
     var i = i
-    for var offset: Index.Distance = 0; offset != n && i != limit; offset = offset + 1 {
+    for var offset: Index.Distance = 0; offset != n && i != limit; ++offset {
       _nextInPlace(&i)
     }
     return i
@@ -215,7 +215,7 @@ extension MyForwardCollectionType {
     var start = start
     var count: Index.Distance = 0
     while start != end {
-      count = count + 1
+      ++count
       _nextInPlace(&start)
     }
     return count
@@ -376,7 +376,7 @@ extension MyBidirectionalCollectionType {
       return _advanceForward(i, by: n)
     }
     var i = i
-    for var offset: Index.Distance = n; offset != 0; offset = offset + 1 {
+    for var offset: Index.Distance = n; offset != 0; ++offset {
       _previousInPlace(&i)
     }
     return i
@@ -388,8 +388,7 @@ extension MyBidirectionalCollectionType {
       return _advanceForward(i, by: n, limit: limit)
     }
     var i = i
-    for var offset: Index.Distance = n; offset != 0 && i != limit;
-        offset = offset + 1 {
+    for var offset: Index.Distance = n; offset != 0 && i != limit; ++offset {
       _previousInPlace(&i)
     }
     return i

test/decl/ext/protocol.swift

@@ -361,7 +361,7 @@ struct MyIndexedGenerator<C : _MyCollection> : GeneratorType {
   mutating func next() -> C._Element? {
     if index == container.myEndIndex { return nil }
     let result = container[index]
-    index = index.successor()
+    ++index
     return result
   }
 }
@@ -373,7 +373,7 @@ struct OtherIndexedGenerator<C : _MyCollection> : GeneratorType {
   mutating func next() -> C._Element? {
     if index == container.myEndIndex { return nil }
     let result = container[index]
-    index = index.successor()
+    ++index
     return result
   }
 }