Merge pull request #270 from hamin/cleaning-up-cstyle-loops

A small step towards removing C-style loops

Author: gribozavr

stdlib/public/core/CString.swift

@@ -60,7 +60,7 @@ public func _persistCString(s: UnsafePointer<CChar>) -> [CChar]? {
   }
   let length = Int(_swift_stdlib_strlen(s))
   var result = [CChar](count: length + 1, repeatedValue: 0)
-  for var i = 0; i < length; ++i {
+  for i in 0..<length {
     // FIXME: this will not compile on platforms where 'CChar' is unsigned.
     result[i] = s[i]
   }

stdlib/public/core/Character.swift

@@ -120,7 +120,7 @@ public struct Character :
   @warn_unused_result
   static func _smallSize(value: UInt64) -> Int {
     var mask: UInt64 = 0xFF
-    for var i = 0; i < 8; ++i {
+    for i in 0..<8 {
       if (value & mask) == mask {
         return i
       }

stdlib/public/core/Prespecialized.swift

@@ -29,8 +29,8 @@ struct _Prespecialize {
         a[0] = a[j]
       }
 
-      for var i1 = 0; i1 < a.count; ++i1 {
-        for var i2 = 0; i2 < a.count; ++i2 {
+      for i1 in 0..<a.count {
+        for i2 in 0..<a.count{
           a[i1] = a[i2]
         }
       }

utils/benchmark/Phonebook/Phonebook.swift

@@ -56,8 +56,8 @@ for first in words {
 
 func benchStringSort() {
   let start = __mach_absolute_time__()
-  for (var i = 0; i < 100; i++) {
-    var t = Names;
+  for i in 0..<100 {
+    var t = Names
     sort(&t)
   }
   let delta = __mach_absolute_time__() - start

utils/benchmark/RC4/RC4.swift

@@ -58,7 +58,7 @@ func benchRC4_internal(messageLen : Int, iterations : Int) {
   var LongData : UInt8[] = new UInt8[messageLen]
 
   // Generate a long message.
-  for (var i = 0; i < messageLen; i++) {
+  for i in  0..<messageLen {
     LongData[i] = SecretData[i % SecretData.count]
   }
 
@@ -67,7 +67,7 @@ func benchRC4_internal(messageLen : Int, iterations : Int) {
 
   let start = __mach_absolute_time__()
 
-  for (var i = 0; i < iterations; i++) {
+  for i in 0..<iterations {
     Enc.encrypt(&LongData)
   }
 

validation-test/stdlib/OpenCLSDKOverlay.swift

@@ -97,7 +97,7 @@ tests.test("clSetKernelArgsListAPPLE") {
   //
   var i = 0
   var count = DATA_SIZE
-  for i = 0; i < count; i++ {
+  for i in 0..<count {
     data[i] = Float(rand()) / Float(RAND_MAX)
   }