[SE-0046] Implements consistent function parameter labels by discarding extraneous parameter names and adding _ where necessary

Author: manavgabhawala

CHANGELOG.md

@@ -3,6 +3,26 @@ Note: This is in reverse chronological order, so newer entries are added to the
 Swift 3.0
 -------
 
+* [SE-0046] (https://github.com/apple/swift-evolution/blob/master/proposals/0046-first-label.md) Function parameters now have consistent labelling across all function parameters. With this update the first parameter declarations will now match the existing behavior of the second and later parameters. This change makes the language simpler. 
+
+    Functions that were written and called as follows 
+    ```swift
+      func foo(x: Int, y: Int) {
+      }
+      foo(1, y: 2)
+      
+      func bar(a a: Int, b: Int) {
+      } 
+      bar(a: 3, b: 4)
+    ```
+    will now be written as (to achieve the same behavior):
+    ```swift
+        func foo(_ x: Int, y: Int) {}
+        foo(1, y: 2)
+        func bar(a: Int, b: Int) {} 
+        bar(a: 3, b: 4)
+    ```
+
 * [SE-0037](https://github.com/apple/swift-evolution/blob/master/proposals/0037-clarify-comments-and-operators.md)
   Comments are now treated as whitespace when determining whether an operator is
   prefix, postfix, or binary. For example, these now work:

benchmark/single-source/Ackermann.swift

@@ -14,14 +14,14 @@
 // for performance measuring.
 import TestsUtils
 
-func ackermann(M : Int, _ N : Int) -> Int {
+func ackermann(_ M: Int, _ N : Int) -> Int {
   if (M == 0) { return N + 1 }
   if (N == 0) { return ackermann(M - 1, 1) }
   return ackermann(M - 1, ackermann(M, N - 1))
 }
 
 @inline(never)
-func Ackermann(M : Int, _ N : Int) -> Int {
+func Ackermann(_ M: Int, _ N : Int) -> Int {
   // This if prevents optimizer from computing return value of Ackermann(3,9)
   // at compile time.
   if False() { return 0 }
@@ -33,7 +33,7 @@ func Ackermann(M : Int, _ N : Int) -> Int {
 let ref_result = [5, 13, 29, 61, 125, 253, 509, 1021, 2045, 4093, 8189, 16381, 32765, 65533, 131069];
 
 @inline(never)
-public func run_Ackermann(N: Int) {
+public func run_Ackermann(_ N: Int) {
   let (m, n) = (3, 9)
   var result = 0
   for _ in 1...N {

benchmark/single-source/AngryPhonebook.swift

@@ -31,7 +31,7 @@ var words = [
   "Bobby", "Dylan", "Johnny", "Phillip", "Craig"]
 
 @inline(never)
-public func run_AngryPhonebook(N: Int) {
+public func run_AngryPhonebook(_ N: Int) {
   // Permute the names.
   for _ in 1...N {
     for firstname in words {

benchmark/single-source/Array2D.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @inline(never)
-public func run_Array2D(N: Int) {
+public func run_Array2D(_ N: Int) {
   var A: [[Int]] = []
   for _ in 0 ..< 1024 {
     var B: [Int] = []

benchmark/single-source/ArrayAppend.swift

@@ -15,7 +15,7 @@
 import TestsUtils
 
 @inline(never)
-public func run_ArrayAppend(N: Int) {
+public func run_ArrayAppend(_ N: Int) {
   for _ in 0..<N {
     for _ in 0..<10 {
        var nums = [Int]()
@@ -27,7 +27,7 @@ public func run_ArrayAppend(N: Int) {
 }
 
 @inline(never)
-public func run_ArrayAppendReserved(N: Int) {
+public func run_ArrayAppendReserved(_ N: Int) {
   for _ in 0..<N {
     for _ in 0..<10 {
        var nums = [Int]()

benchmark/single-source/ArrayInClass.swift

@@ -17,7 +17,7 @@ class ArrayContainer {
     arr = [Int] (repeating: 0, count: 100_000)
   }
 
-  func runLoop(N: Int) {
+  func runLoop(_ N: Int) {
     for _ in 0 ..< N {
       for i in 0 ..< arr.count {
         arr[i] = arr[i] + 1
@@ -32,7 +32,7 @@ func getArrayContainer() -> ArrayContainer {
 }
 
 @inline(never)
-public func run_ArrayInClass(N: Int) {
+public func run_ArrayInClass(_ N: Int) {
   let a = getArrayContainer()
   a.runLoop(N)
 }

benchmark/single-source/ArrayLiteral.swift

@@ -21,7 +21,7 @@ func makeArray() -> [Int] {
 }
 
 @inline(never)
-public func run_ArrayLiteral(N: Int) {
+public func run_ArrayLiteral(_ N: Int) {
   for _ in 1...10000*N {
     makeArray()
   }
@@ -34,7 +34,7 @@ func addLiteralArray() -> Int {
 }
 
 @inline(never)
-public func run_ArrayValueProp(N: Int) {
+public func run_ArrayValueProp(_ N: Int) {
   var res = 123
   for _ in 1...10000*N {
     res += addLiteralArray()
@@ -75,7 +75,7 @@ func addLiteralArray4() -> Int {
 }
 
 @inline(never)
-public func run_ArrayValueProp2(N: Int) {
+public func run_ArrayValueProp2(_ N: Int) {
   var res = 123
   for _ in 1...10000*N {
     res += addLiteralArray2()
@@ -85,7 +85,7 @@ public func run_ArrayValueProp2(N: Int) {
 }
 
 @inline(never)
-public func run_ArrayValueProp3(N: Int) {
+public func run_ArrayValueProp3(_ N: Int) {
   var res = 123
   for _ in 1...10000*N {
     res += addLiteralArray3()
@@ -95,7 +95,7 @@ public func run_ArrayValueProp3(N: Int) {
 }
 
 @inline(never)
-public func run_ArrayValueProp4(N: Int) {
+public func run_ArrayValueProp4(_ N: Int) {
   var res = 123
   for _ in 1...10000*N {
     res += addLiteralArray4()

benchmark/single-source/ArrayOfGenericPOD.swift

@@ -58,7 +58,7 @@ func genStructArray() {
 }
 
 @inline(never)
-public func run_ArrayOfGenericPOD(N: Int) {
+public func run_ArrayOfGenericPOD(_ N: Int) {
   for _ in 0...N {
     genEnumArray()
     genIOUArray()

benchmark/single-source/ArrayOfGenericRef.swift

@@ -86,7 +86,7 @@ func genRefStructArray() {
 }
 
 @inline(never)
-public func run_ArrayOfGenericRef(N: Int) {
+public func run_ArrayOfGenericRef(_ N: Int) {
   for _ in 0...N {
     genPODRefArray()
     genCommonRefArray()

benchmark/single-source/ArrayOfPOD.swift

@@ -53,7 +53,7 @@ func genStructArray() {
 }
 
 @inline(never)
-public func run_ArrayOfPOD(N: Int) {
+public func run_ArrayOfPOD(_ N: Int) {
   for _ in 0...N {
     genIntArray()
     genEnumArray()

benchmark/single-source/ArrayOfRef.swift

@@ -97,7 +97,7 @@ func genRefStructArray() {
 }
 
 @inline(never)
-public func run_ArrayOfRef(N: Int) {
+public func run_ArrayOfRef(_ N: Int) {
   for _ in 0...N {
     genPODRefArray()
     genCommonRefArray()

benchmark/single-source/ArraySubscript.swift

@@ -14,13 +14,13 @@
 import TestsUtils
 
 @inline(never)
-public func run_ArraySubscript(N: Int) {
+public func run_ArraySubscript(_ N: Int) {
   SRand()
 
   let numArrays = 200*N
   let numArrayElements = 100
 
-  func bound(x: Int) -> Int { return min(x, numArrayElements-1) }
+  func bound(_ x: Int) -> Int { return min(x, numArrayElements-1) }
 
   var arrays = [[Int]](repeating: [], count: numArrays)
   for i in 0..<numArrays {

benchmark/single-source/BitCount.swift

@@ -16,7 +16,7 @@
 import Foundation
 import TestsUtils
 
-func countBitSet(num: Int) -> Int {
+func countBitSet(_ num: Int) -> Int {
   let bits = sizeof(Int) * 8
   var cnt : Int = 0
   var mask: Int = 1
@@ -30,7 +30,7 @@ func countBitSet(num: Int) -> Int {
 }
 
 @inline(never)
-public func run_BitCount(N: Int) {
+public func run_BitCount(_ N: Int) {
   for _ in 1...100*N {
     // Check some results.
     CheckResults(countBitSet(1) == 1, "Incorrect results in BitCount.")

benchmark/single-source/ByteSwap.swift

@@ -17,7 +17,7 @@ import Foundation
 import TestsUtils
 
 // a naive O(n) implementation of byteswap.
-func byteswap_n(a: UInt64) -> UInt64 {
+func byteswap_n(_ a: UInt64) -> UInt64 {
   return ((a & 0x00000000000000FF) << 56) |
       ((a & 0x000000000000FF00) << 40) |
       ((a & 0x0000000000FF0000) << 24) |
@@ -29,7 +29,7 @@ func byteswap_n(a: UInt64) -> UInt64 {
 }
 
 // a O(logn) implementation of byteswap.
-func byteswap_logn(a: UInt64) -> UInt64 {
+func byteswap_logn(_ a: UInt64) -> UInt64 {
   var a = a
   a = (a & 0x00000000FFFFFFFF) << 32 | (a & 0xFFFFFFFF00000000) >> 32
   a = (a & 0x0000FFFF0000FFFF) << 16 | (a & 0xFFFF0000FFFF0000) >> 16
@@ -38,7 +38,7 @@ func byteswap_logn(a: UInt64) -> UInt64 {
 }
 
 @inline(never)
-public func run_ByteSwap(N: Int) {
+public func run_ByteSwap(_ N: Int) {
   for _ in 1...100*N {
     // Check some results.
     CheckResults(byteswap_logn(byteswap_n(2457)) == 2457, "Incorrect results in ByteSwap.")

benchmark/single-source/Calculator.swift

@@ -14,7 +14,7 @@ import TestsUtils
 import Foundation
 
 @inline(never)
-func my_atoi_impl(input : String) -> Int {
+func my_atoi_impl(_ input : String) -> Int {
   switch input {
     case "0": return 0
     case "1": return 1
@@ -31,7 +31,7 @@ func my_atoi_impl(input : String) -> Int {
 }
 
 @inline(never)
-public func run_Calculator(N: Int) {
+public func run_Calculator(_ N: Int) {
   var c = 0
   for _ in 1...N*5000 {
       c += my_atoi_impl("10")

benchmark/single-source/CaptureProp.swift

@@ -10,21 +10,21 @@
 //
 //===----------------------------------------------------------------------===//
 
-func sum(x:Int, y:Int) -> Int {
+func sum(_ x:Int, y:Int) -> Int {
   return x + y
 }
 
 @inline(never)
 func benchCaptureProp<S : Sequence
 >(
-  s:S, _ f:(S.Iterator.Element, S.Iterator.Element)->S.Iterator.Element) -> S.Iterator.Element {
+  _ s: S, _ f:(S.Iterator.Element, S.Iterator.Element)->S.Iterator.Element) -> S.Iterator.Element {
 
   var it = s.makeIterator()
   let initial = it.next()!
   return IteratorSequence(it).reduce(initial, combine: f)
 }
 
-public func run_CaptureProp(N: Int) {
+public func run_CaptureProp(_ N: Int) {
   let a = 1...10_000
   for _ in 1...100*N {
     benchCaptureProp(a, sum)

benchmark/single-source/Chars.swift

@@ -14,7 +14,7 @@
 import TestsUtils
 
 @inline(never)
-public func run_Chars(N: Int) {
+public func run_Chars(_ N: Int) {
   // Permute some characters.
   let alphabet: [Character] = [
     "A", "B", "C", "D", "E", "F", "G",

benchmark/single-source/ClassArrayGetter.swift

@@ -16,15 +16,15 @@ class Box {
 }
 
 @inline(never)
-func sumArray(a: [Box]) -> Int {
+func sumArray(_ a: [Box]) -> Int {
   var s = 0
   for i in 0..<a.count {
     s += a[i].v
   }
   return s
 }
 
-public func run_ClassArrayGetter(N: Int) {
+public func run_ClassArrayGetter(_ N: Int) {
   let aSize = 10_000
   var a: [Box] = []
   a.reserveCapacity(aSize)

benchmark/single-source/DeadArray.swift

@@ -14,23 +14,23 @@
 import TestsUtils
 
 @inline(__always)
-func debug(m:String) {}
+func debug(_ m:String) {}
 
 private var Count = 0
 
 @inline(never)
 func bar() { Count += 1 }
 
 @inline(never)
-func runLoop(var1: Int, var2: Int) {
+func runLoop(_ var1: Int, var2: Int) {
   for _ in 0..<100_000 {
     debug("Var1: \(var1) Var2: \(var2)")
     bar()
   }
 }
 
 @inline(never)
-public func run_DeadArray(N: Int) {
+public func run_DeadArray(_ N: Int) {
   for _ in 1...N {
     Count = 0
     runLoop(0, var2: 0)

benchmark/single-source/DictTest2.swift

@@ -13,7 +13,7 @@
 import TestsUtils
 
 @inline(never)
-public func run_Dictionary2(N: Int) {
+public func run_Dictionary2(_ N: Int) {
   let size = 500
   let ref_result = 199
   var res = 0
@@ -57,7 +57,7 @@ func ==<T: Equatable>(lhs: Box<T>,  rhs: Box<T>) -> Bool {
 }
 
 @inline(never)
-public func run_Dictionary2OfObjects(N: Int) {
+public func run_Dictionary2OfObjects(_ N: Int) {
   let size = 500
   let ref_result = 199
   var res = 0

benchmark/single-source/DictTest3.swift

@@ -13,7 +13,7 @@
 import TestsUtils
 
 @inline(never)
-public func run_Dictionary3(N: Int) {
+public func run_Dictionary3(_ N: Int) {
   let size1 = 100
   let reps = 20
   let ref_result = "1 99 20 1980"
@@ -64,7 +64,7 @@ func ==<T: Equatable>(lhs: Box<T>,  rhs: Box<T>) -> Bool {
 }
 
 @inline(never)
-public func run_Dictionary3OfObjects(N: Int) {
+public func run_Dictionary3OfObjects(_ N: Int) {
   let size1 = 100
   let reps = 20
   let ref_result = "1 99 20 1980"

benchmark/single-source/DictionaryBridge.swift

@@ -52,7 +52,7 @@ class Stuff {
 }
 
 @inline(never)
-public func run_DictionaryBridge(N: Int) {
+public func run_DictionaryBridge(_ N: Int) {
     for _ in 1...100*N {
         _ = Stuff()
     }

benchmark/single-source/DictionaryLiteral.swift

@@ -20,7 +20,7 @@ func makeDictionary() -> [Int: Int] {
 }
 
 @inline(never)
-public func run_DictionaryLiteral(N: Int) {
+public func run_DictionaryLiteral(_ N: Int) {
   for _ in 1...10000*N {
       makeDictionary()
   }