Convert more tests off of ++ and --

Author: lattner

test/Parse/optional_chain_lvalues.swift

@@ -25,7 +25,7 @@ mutT?.mutateT()
 immT?.mutateT() // expected-error{{cannot use mutating member on immutable value: 'immT' is a 'let' constant}}
 mutT?.mutS?.mutateS()
 mutT?.immS?.mutateS() // expected-error{{cannot use mutating member on immutable value: 'immS' is a 'let' constant}}
-mutT?.mutS?.x++
+mutT?.mutS?.x += 1
 mutT?.mutS?.y++ // expected-error{{cannot pass immutable value to mutating operator: 'y' is a 'let' constant}}
 
 // Prefix operators don't chain

test/SILGen/statements.swift

@@ -166,7 +166,7 @@ func for_loops1(x: Int, c: Bool) {
    x += 1
   }
 
-  for var i = 0; i < 100; ++i { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
+  for var i = 0; i < 100; i += 1 { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
   }
 
   for let i = 0; i < 100; i { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}

test/SILGen/unreachable_code.swift

@@ -16,36 +16,36 @@ func testUnreachableAfterIfReturn(a: Bool) -> Int {
 }
 
 func testUnreachableForAfterContinue(b: Bool) {
-  for (var i:Int = 0; i<10; i++) { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
+  for (var i:Int = 0; i<10; i+=1) { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
     var y: Int = 300
-    y++;
+    y += 1
     if b {
       break
-      y++; // expected-warning {{code after 'break' will never be executed}}
+      y += 1 // expected-warning {{code after 'break' will never be executed}}
     }
     continue
-    y--; // expected-warning {{code after 'continue' will never be executed}}
+    y -= 1 // expected-warning {{code after 'continue' will never be executed}}
   }
 }
 
 func testUnreachableWhileAfterContinue(b: Bool) {
   var i:Int = 0
   while (i<10) { 
     var y: Int = 300
-    y++;
+    y += 1
     if b {
       break
-      y++; // expected-warning {{code after 'break' will never be executed}}
+      y += 1 // expected-warning {{code after 'break' will never be executed}}
     }
     continue
-    i++; // expected-warning {{code after 'continue' will never be executed}}
+    i += 1 // expected-warning {{code after 'continue' will never be executed}}
   }
 }
 
 func testBreakAndContinue() {
   var i = 0
   var m = 0
-  for (i = 0; i < 10; ++i) { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
+  for (i = 0; i < 10; i += 1) { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
     m += 1
     if m == 15 {
       break

test/SILOptimizer/definite_init_diagnostics.swift

@@ -1046,7 +1046,7 @@ struct StructMutatingMethodTest {
   let y : Int
   init() {
     x = 42
-    ++x     // expected-error {{mutating operator '++' may not be used on immutable value 'self.x'}}
+    x += 1     // expected-error {{mutating operator '+=' may not be used on immutable value 'self.x'}}
 
     y = 12
     myTransparentFunction(&y)  // expected-error {{immutable value 'self.y' may not be passed inout}}

test/SILOptimizer/diagnostic_constant_propagation.swift

@@ -242,130 +242,66 @@ func testDivision() {
 
 func testPostIncOverflow() {
   var   s_max = Int.max
-  s_max++  // expected-error {{arithmetic operation '9223372036854775807 + 1' (on signed 64-bit integer type) results in an overflow}}
+  s_max += 1  // expected-error {{arithmetic operation '9223372036854775807 + 1' (on type 'Int') results in an overflow}}
 
   var   u_max = UInt.max
-  u_max++ // expected-error {{arithmetic operation '18446744073709551615 + 1' (on unsigned 64-bit integer type) results in an overflow}}
+  u_max += 1 // expected-error {{arithmetic operation '18446744073709551615 + 1' (on type 'UInt') results in an overflow}}
 
   var  s8_max = Int8.max
-  s8_max++ // expected-error {{arithmetic operation '127 + 1' (on signed 8-bit integer type) results in an overflow}}
+  s8_max += 1 // expected-error {{arithmetic operation '127 + 1' (on type 'Int8') results in an overflow}}
 
   var  u8_max = UInt8.max
-  u8_max++ // expected-error {{arithmetic operation '255 + 1' (on unsigned 8-bit integer type) results in an overflow}}
+  u8_max += 1 // expected-error {{arithmetic operation '255 + 1' (on type 'UInt8') results in an overflow}}
 
   var s16_max = Int16.max
-  s16_max++ // expected-error {{arithmetic operation '32767 + 1' (on signed 16-bit integer type) results in an overflow}}
+  s16_max += 1 // expected-error {{arithmetic operation '32767 + 1' (on type 'Int16') results in an overflow}}
 
   var u16_max = UInt16.max
-  u16_max++ // expected-error {{arithmetic operation '65535 + 1' (on unsigned 16-bit integer type) results in an overflow}}
+  u16_max += 1 // expected-error {{arithmetic operation '65535 + 1' (on type 'UInt16') results in an overflow}}
 
   var s32_max = Int32.max
-  s32_max++ // expected-error {{arithmetic operation '2147483647 + 1' (on signed 32-bit integer type) results in an overflow}}
+  s32_max += 1 // expected-error {{arithmetic operation '2147483647 + 1' (on type 'Int32') results in an overflow}}
 
   var u32_max = UInt32.max
-  u32_max++ // expected-error {{arithmetic operation '4294967295 + 1' (on unsigned 32-bit integer type) results in an overflow}}
+  u32_max += 1 // expected-error {{arithmetic operation '4294967295 + 1' (on type 'UInt32') results in an overflow}}
 
   var s64_max = Int64.max
-  s64_max++ // expected-error {{arithmetic operation '9223372036854775807 + 1' (on signed 64-bit integer type) results in an overflow}}
+  s64_max += 1 // expected-error {{arithmetic operation '9223372036854775807 + 1' (on type 'Int64') results in an overflow}}
 
   var u64_max = UInt64.max
-  u64_max++ // expected-error {{arithmetic operation '18446744073709551615 + 1' (on unsigned 64-bit integer type) results in an overflow}}
-}
-
-func testPreIncOverflow() {
-  var   s_max = Int.max
-  ++s_max  // expected-error {{arithmetic operation '9223372036854775807 + 1' (on signed 64-bit integer type) results in an overflow}}
-
-  var   u_max = UInt.max
-  ++u_max // expected-error {{arithmetic operation '18446744073709551615 + 1' (on unsigned 64-bit integer type) results in an overflow}}
-
-  var  s8_max = Int8.max
-  ++s8_max // expected-error {{arithmetic operation '127 + 1' (on signed 8-bit integer type) results in an overflow}}
-
-  var  u8_max = UInt8.max
-  ++u8_max // expected-error {{arithmetic operation '255 + 1' (on unsigned 8-bit integer type) results in an overflow}}
-
-  var s16_max = Int16.max
-  ++s16_max // expected-error {{arithmetic operation '32767 + 1' (on signed 16-bit integer type) results in an overflow}}
-
-  var u16_max = UInt16.max
-  ++u16_max // expected-error {{arithmetic operation '65535 + 1' (on unsigned 16-bit integer type) results in an overflow}}
-
-  var s32_max = Int32.max
-  ++s32_max // expected-error {{arithmetic operation '2147483647 + 1' (on signed 32-bit integer type) results in an overflow}}
-
-  var u32_max = UInt32.max
-  ++u32_max // expected-error {{arithmetic operation '4294967295 + 1' (on unsigned 32-bit integer type) results in an overflow}}
-
-  var s64_max = Int64.max
-  ++s64_max // expected-error {{arithmetic operation '9223372036854775807 + 1' (on signed 64-bit integer type) results in an overflow}}
-
-  var u64_max = UInt64.max
-  ++u64_max // expected-error {{arithmetic operation '18446744073709551615 + 1' (on unsigned 64-bit integer type) results in an overflow}}
+  u64_max += 1 // expected-error {{arithmetic operation '18446744073709551615 + 1' (on type 'UInt64') results in an overflow}}
 }
 
 func testPostDecOverflow() {
   var   s_min = Int.min
-  s_min--  // expected-error {{arithmetic operation '-9223372036854775808 - 1' (on signed 64-bit integer type) results in an overflow}}
-
-  var   u_min = UInt.min
-  u_min-- // expected-error {{arithmetic operation '0 - 1' (on unsigned 64-bit integer type) results in an overflow}}
-
-  var  s8_min = Int8.min
-  s8_min-- // expected-error {{arithmetic operation '-128 - 1' (on signed 8-bit integer type) results in an overflow}}
-
-  var  u8_min = UInt8.min
-  u8_min-- // expected-error {{arithmetic operation '0 - 1' (on unsigned 8-bit integer type) results in an overflow}}
-
-  var s16_min = Int16.min
-  s16_min-- // expected-error {{arithmetic operation '-32768 - 1' (on signed 16-bit integer type) results in an overflow}}
-
-  var u16_min = UInt16.min
-  u16_min-- // expected-error {{arithmetic operation '0 - 1' (on unsigned 16-bit integer type) results in an overflow}}
-
-  var s32_min = Int32.min
-  s32_min-- // expected-error {{arithmetic operation '-2147483648 - 1' (on signed 32-bit integer type) results in an overflow}}
-
-  var u32_min = UInt32.min
-  u32_min-- // expected-error {{arithmetic operation '0 - 1' (on unsigned 32-bit integer type) results in an overflow}}
-
-  var s64_min = Int64.min
-  s64_min-- // expected-error {{arithmetic operation '-9223372036854775808 - 1' (on signed 64-bit integer type) results in an overflow}}
-
-  var u64_min = UInt64.min
-  u64_min-- // expected-error {{arithmetic operation '0 - 1' (on unsigned 64-bit integer type) results in an overflow}}
-}
-
-func testPreDecOverflow() {
-  var   s_min = Int.min
-  --s_min  // expected-error {{arithmetic operation '-9223372036854775808 - 1' (on signed 64-bit integer type) results in an overflow}}
+  s_min -= 1  // expected-error {{arithmetic operation '-9223372036854775808 - 1' (on type 'Int') results in an overflow}}
 
   var   u_min = UInt.min
-  --u_min // expected-error {{arithmetic operation '0 - 1' (on unsigned 64-bit integer type) results in an overflow}}
+  u_min -= 1 // expected-error {{arithmetic operation '0 - 1' (on type 'UInt') results in an overflow}}
 
   var  s8_min = Int8.min
-  --s8_min // expected-error {{arithmetic operation '-128 - 1' (on signed 8-bit integer type) results in an overflow}}
+  s8_min -= 1 // expected-error {{arithmetic operation '-128 - 1' (on type 'Int8') results in an overflow}}
 
   var  u8_min = UInt8.min
-  --u8_min // expected-error {{arithmetic operation '0 - 1' (on unsigned 8-bit integer type) results in an overflow}}
+  u8_min -= 1 // expected-error {{arithmetic operation '0 - 1' (on type 'UInt8') results in an overflow}}
 
   var s16_min = Int16.min
-  --s16_min // expected-error {{arithmetic operation '-32768 - 1' (on signed 16-bit integer type) results in an overflow}}
+  s16_min -= 1 // expected-error {{arithmetic operation '-32768 - 1' (on type 'Int16') results in an overflow}}
 
   var u16_min = UInt16.min
-  --u16_min // expected-error {{arithmetic operation '0 - 1' (on unsigned 16-bit integer type) results in an overflow}}
+  u16_min -= 1 // expected-error {{arithmetic operation '0 - 1' (on type 'UInt16') results in an overflow}}
 
   var s32_min = Int32.min
-  --s32_min // expected-error {{arithmetic operation '-2147483648 - 1' (on signed 32-bit integer type) results in an overflow}}
+  s32_min -= 1 // expected-error {{arithmetic operation '-2147483648 - 1' (on type 'Int32') results in an overflow}}
 
   var u32_min = UInt32.min
-  --u32_min // expected-error {{arithmetic operation '0 - 1' (on unsigned 32-bit integer type) results in an overflow}}
+  u32_min -= 1 // expected-error {{arithmetic operation '0 - 1' (on type 'UInt32') results in an overflow}}
 
   var s64_min = Int64.min
-  --s64_min // expected-error {{arithmetic operation '-9223372036854775808 - 1' (on signed 64-bit integer type) results in an overflow}}
+  s64_min -= 1 // expected-error {{arithmetic operation '-9223372036854775808 - 1' (on type 'Int64') results in an overflow}}
 
   var u64_min = UInt64.min
-  --u64_min // expected-error {{arithmetic operation '0 - 1' (on unsigned 64-bit integer type) results in an overflow}}
+  u64_min -= 1 // expected-error {{arithmetic operation '0 - 1' (on type 'UInt64') results in an overflow}}
 }
 
 func testAssumeNonNegative() {

test/SILOptimizer/return.swift

@@ -25,7 +25,7 @@ func multipleBlocksSingleMissing(b: Bool) -> (String, Int) {
 func multipleBlocksAllMissing(x: Int) -> Int {
   var y : Int = x + 1 
   while (y > 0 ) {
-    --y
+    y -= 1
     break
   }
   var x = 0
@@ -81,7 +81,7 @@ func whileLoop(flag: Bool) -> Int {
     if b == 3 {
       return 3
     }
-    b++  
+    b += 1
   }
 } //expected-error {{missing return in a function expected to return 'Int'}}
 
@@ -91,7 +91,7 @@ func whileTrueLoop() -> Int {
     if b == 3 {
       return 3
     }
-    b++  
+    b += 1
   } // no-error
 }
 

test/SILOptimizer/unreachable_code.swift

@@ -40,7 +40,7 @@ func whileTrueReachable(v: Int) -> () {
     }
     x += 1
   }
-  x--  
+  x -= 1
 }
 
 func whileTrueTwoPredecessorsEliminated() -> () {
@@ -119,9 +119,9 @@ func testSwitchEnum(xi: Int) -> Int {
   case .One:
     userCode() // expected-note {{will never be executed}}
   case .Two:
-    x--  
+    x -= 1
   case .Three:
-    x--  
+    x -= 1
   }
 
   switch cond { // no warning
@@ -221,7 +221,7 @@ func testSwitchOptionalBool (b:Bool?, xi: Int) -> Int {
   case .Some(true):
     x += 1
   case .None:
-    x-- 
+    x -= 1 
   } // expected-error{{switch must be exhaustive}}
 
   return xi

test/Sema/immutability.swift

@@ -317,7 +317,7 @@ func testSubscriptNoGetter(iis: SubscriptNoGetter) {
 func testSelectorStyleArguments1(x: Int, bar y: Int) {
   var x = x
   var y = y
-  ++x; ++y
+  x += 1; y += 1
 }
 
 func testSelectorStyleArguments2(x: Int,

test/expr/closure/closures.swift

@@ -136,9 +136,9 @@ class ExplicitSelfRequiredTest {
   var x = 42
   func method() -> Int {
     // explicit closure requires an explicit "self." base.
-    doStuff({ ++self.x })
-    doStuff({ ++x })    // expected-error {{reference to property 'x' in closure requires explicit 'self.' to make capture semantics explicit}} {{17-17=self.}}
-    doVoidStuff({ ++x })    // expected-error {{reference to property 'x' in closure requires explicit 'self.' to make capture semantics explicit}} {{21-21=self.}}
+    doVoidStuff({ self.x += 1 })
+    doStuff({ x+1 })    // expected-error {{reference to property 'x' in closure requires explicit 'self.' to make capture semantics explicit}} {{15-15=self.}}
+    doVoidStuff({ x += 1 })    // expected-error {{reference to property 'x' in closure requires explicit 'self.' to make capture semantics explicit}} {{19-19=self.}}
 
     // Methods follow the same rules as properties, uses of 'self' must be marked with "self."
     doStuff { method() }  // expected-error {{call to method 'method' in closure requires explicit 'self.' to make capture semantics explicit}} {{15-15=self.}}

test/stmt/statements.swift

@@ -121,22 +121,22 @@ SomeGeneric<Int>
 func for_loop() {
   var x = 0
   for ;; { } // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
-  for x = 1; x != 42; ++x { } // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
+  for x = 1; x != 42; x += 1 { } // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
   for infloopbooltest(); x != 12; infloopbooltest() {} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
 
   for ; { } // expected-error {{expected ';' in 'for' statement}}
 
-  for var y = 1; y != 42; ++y {} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
-  for (var y = 1; y != 42; ++y) {} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
+  for var y = 1; y != 42; y += 1 {} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
+  for (var y = 1; y != 42; y += 1) {} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
   var z = 10
-  for (; z != 0; --z) {} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
-  for (z = 10; z != 0; --z) {} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
-  for var (a,b) = (0,12); a != b; --b {++a} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
-  for (var (a,b) = (0,12); a != b; --b) {++a} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
+  for (; z != 0; z -= 1) {} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
+  for (z = 10; z != 0; z -= 1) {} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
+  for var (a,b) = (0,12); a != b; b -= 1 {a += 1} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
+  for (var (a,b) = (0,12); a != b; b -= 1) {a += 1} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
   var j, k : Int
-  for ((j,k) = (0,10); j != k; --k) {} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
-  for var i = 0, j = 0; i * j < 10; i++, j++ {} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
-  for j = 0, k = 52; j < k; ++j, --k { } // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
+  for ((j,k) = (0,10); j != k; k -= 1) {} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
+  for var i = 0, j = 0; i * j < 10; i += 1, j += 1 {} // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
+  for j = 0, k = 52; j < k; j += 1, k -= 1 { } // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
   // rdar://19540536
   // expected-error@+4{{expected var declaration in a 'for' statement}}
   // expected-error@+3{{expression resolves to an unused function}}
@@ -187,7 +187,7 @@ func tuple_assign() {
 func missing_semicolons() {
   var w = 321
   func g() {}
-  g() ++w             // expected-error{{consecutive statements}} {{6-6=;}}
+  g() w += 1             // expected-error{{consecutive statements}} {{6-6=;}}
   var z = w"hello"    // expected-error{{consecutive statements}} {{12-12=;}}
   class  C {}class  C2 {} // expected-error{{consecutive statements}} {{14-14=;}}
   struct S {}struct S2 {} // expected-error{{consecutive statements}} {{14-14=;}}
@@ -427,12 +427,12 @@ func testThrowNil() throws {
 func for_ignored_lvalue_init() {
   var i = 0
   for i;  // expected-error {{expression resolves to an unused l-value}} expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
-    i < 10; ++i {}
+    i < 10; i += 1 {}
 }
 
 // rdar://problem/18643692
 func for_loop_multi_iter() {
-  for (var i = 0, x = 0; i < 10; i++, // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
+  for (var i = 0, x = 0; i < 10; i += 1, // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
        x) { // expected-error {{expression resolves to an unused l-value}}
     x -= 1
   }