mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
b2cc34c241
If you want to make the parameter and argument label the same in
places where you don't get the argument label for free (i.e., the
first parameter of a function or a parameter of a subscript),
double-up the identifier:
func translate(dx dx: Int, dy: Int) { }
Make this a warning with Fix-Its to ease migration. Part of
rdar://problem/17218256.
Swift SVN r27715
117 lines
3.4 KiB
Swift
117 lines
3.4 KiB
Swift
// RUN: %target-parse-verify-swift
|
|
|
|
// The first function argument does not have a label; the others do.
|
|
func f1(a: Int, b: Int) { }
|
|
func f1(a: Int, d: Int) { } // okay: names differ
|
|
|
|
func f2(a: Int, b: Int) { } // expected-note{{'f2(_:b:)' previously declared here}}
|
|
func f2(z: Int, b: Int) { } // expected-error{{invalid redeclaration of 'f2(_:b:)'}}
|
|
|
|
class X {
|
|
// Initializer arguments are API by default.
|
|
init(x: Int) { }
|
|
init(y: Int) { } // okay
|
|
|
|
// Method arguments after the first are API by default
|
|
func f1(a: Int, b: Int) { }
|
|
func f1(a: Int, c: Int) { } // okay
|
|
|
|
func f2(a: Int, b: Int) { } // expected-note{{'f2(_:b:)' previously declared here}}
|
|
func f2(A: Int, b: Int) { } // expected-error{{invalid redeclaration of 'f2(_:b:)'}}
|
|
}
|
|
|
|
protocol P {
|
|
func g1(value: Int)
|
|
func g2(value: Int, other: Int)
|
|
func g3(value: Int, other: Int, third: Int) // expected-note{{requirement 'g3(_:other:third:)' declared here}}
|
|
static func g4(value: Int)
|
|
}
|
|
|
|
class PX : P {
|
|
func g1(x: Int) { } // okay
|
|
func g2(x: Int, other: Int) { } // okay
|
|
func g3(x: Int, y: Int, third: Int) { } // expected-error{{method 'g3(_:y:third:)' has different argument names from those required by protocol 'P' ('g3(_:other:third:)')}}
|
|
|
|
class func g4(x: Int) { }
|
|
}
|
|
|
|
// Default arguments have no effect on argument labels.
|
|
func f3(a: Int, b: Int = 5, c: Int = 6) { }
|
|
// expected-note@-1{{'f3(_:b:c:)' previously declared here}}
|
|
func f3(a: Int, b: Int, c: Int) { }
|
|
// expected-error@-1{{invalid redeclaration of 'f3(_:b:c:)'}}
|
|
|
|
class DefArg {
|
|
func f(a: Int = 17) { } // okay: no label implied
|
|
func f(a a: Int) { }
|
|
}
|
|
|
|
struct Subscripts1 {
|
|
subscript (i i: Int) -> Int {
|
|
get { return i }
|
|
}
|
|
|
|
subscript (j j: Int) -> Int {
|
|
get { return j }
|
|
}
|
|
}
|
|
|
|
struct Subscripts2 {
|
|
subscript (i: Int) -> Int { // expected-note{{'subscript' previously declared here}}
|
|
get { return i }
|
|
}
|
|
|
|
subscript (j: Int) -> Int { // expected-error{{invalid redeclaration of 'subscript'}}
|
|
get { return j }
|
|
}
|
|
}
|
|
|
|
|
|
func f4(a: Int)(_ b: Int) { }
|
|
func f5(a: Int)(b: Int) { }
|
|
|
|
func testFunctions(i: Int, x: X) {
|
|
f4(i)(i)
|
|
f4(i)(b: i) // expected-error{{extraneous argument label 'b:' in call}}
|
|
f5(i)(i) // expected-error{{missing argument label 'b:' in call}}
|
|
f5(i)(b: i)
|
|
}
|
|
|
|
struct Y {
|
|
func m0(a: Int)(_ b: Int) { }
|
|
func m1(a: Int)(b: Int) { }
|
|
|
|
func m2(a: Int)(_ b: Int, _ c: Int) { }
|
|
func m3(a: Int)(b: Int, c2 c: Int) { }
|
|
|
|
subscript (x: Int) -> Int {
|
|
get { return x }
|
|
}
|
|
|
|
subscript (y y: String) -> String {
|
|
get { return y }
|
|
}
|
|
}
|
|
|
|
func testMethods(i: Int, x: Y) {
|
|
x.m0(i)(i)
|
|
x.m0(i)(b: i) // expected-error{{extraneous argument label 'b:' in call}}
|
|
x.m1(i)(i) // expected-error{{missing argument label 'b:' in call}}
|
|
x.m1(i)(b: i)
|
|
x.m2(i)(i, c: i) // expected-error{{extraneous argument label 'c:' in call}}
|
|
x.m2(i)(i, i)
|
|
x.m3(i)(b: i, i) // expected-error{{missing argument label 'c2:' in call}}
|
|
x.m3(i)(b: i, c2: i)
|
|
}
|
|
|
|
func testSubscripts(i: Int, s: String, x: Y) {
|
|
var i2 = x[i]
|
|
var i3 = x[x: i] // expected-error{{extraneous argument label 'x:' in subscript}}
|
|
var s2 = x[y: s]
|
|
var s3 = x[s] // expected-error{{missing argument label 'y:' in subscript}}
|
|
}
|
|
|
|
// # is being removed
|
|
func pound(#a: Int, // expected-warning{{'#' has been removed from Swift; double-up 'a a' to make the argument label the same as the parameter name}}{{12-13=a }}
|
|
#b: Int) { } // expected-warning{{'#' has been removed from Swift; 'b' already has an argument label}}{{12-13=}}
|