mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
3d77855b31
Remove the semantic restrictions that prohibited extensions of
protocol types, and start making some systematic changes so that
protocol extensions start to make sense:
- Replace a lot of occurrences of isa<ProtocolDecl> and
dyn_cast<ProtocolDecl> on DeclContexts to use the new
DeclContext::isProtocolOrProtocolExtensionContext(), where we want
that behavior to apply equally to protocols and protocol extensions.
- Eliminate ProtocolDecl::getSelf() in favor of
DeclContext::getProtocolSelf(), which produces the appropriate
generic type parameter for the 'Self' of a protocol or protocol
extension. Update all of the callers of ProtocolDecl::getSelf()
appropriately.
- Update extension validation to appropriately form generic
parameter lists for protocol extensions.
- Methods in protocol extensions always use the witnesscc calling
convention.
At this point, we can type check and SILGen very basic definitions of
protocol extensions with methods that can call protocol requirements,
generic free functions, and other methods within the same protocol
extension.
Regresses four compiler crashers but improves three compiler
crashers... we'll call that "progress"; the four regressions all hit
the same assertion in the constraint system that will likely be
addressed as protocol extensions starts working.
Swift SVN r26579
104 lines
5.7 KiB
Swift
104 lines
5.7 KiB
Swift
// RUN: %target-parse-verify-swift
|
|
|
|
static func gf1() {} // expected-error {{static methods may only be declared on a type}}{{1-7=}}
|
|
class func gf2() {} // expected-error {{class methods may only be declared on a type}}{{1-6=}}
|
|
|
|
override static func gf3() {} // expected-error {{static methods may only be declared on a type}}{{10-16=}}
|
|
// expected-error@-1 {{'override' can only be specified on class members}}{{1-9=}}
|
|
override class func gf4() {} // expected-error {{class methods may only be declared on a type}}{{10-15=}}
|
|
// expected-error@-1 {{'override' can only be specified on class members}}{{1-9=}}
|
|
|
|
static override func gf5() {} // expected-error {{static methods may only be declared on a type}}{{1-7=}}
|
|
// expected-error@-1 {{'override' can only be specified on class members}}{{8-16=}}
|
|
class override func gf6() {} // expected-error {{class methods may only be declared on a type}}{{1-6=}}
|
|
// expected-error@-1 {{'override' can only be specified on class members}}{{7-15=}}
|
|
|
|
static gf7() {} // expected-error {{expected declaration}} expected-error {{braced block of statements is an unused closure}} expected-error{{begin with a closure}} expected-note{{discard the result}} expected-error{{type of expression is ambiguous without more context}}
|
|
class gf8() {} // expected-error {{expected '{' in class}} expected-error {{braced block of statements is an unused closure}} expected-error{{begin with a closure}} expected-note{{discard the result}} expected-error{{type of expression is ambiguous without more context}}
|
|
|
|
func inGlobalFunc() {
|
|
static func gf1() {} // expected-error {{static methods may only be declared on a type}}{{3-9=}}
|
|
class func gf2() {} // expected-error {{class methods may only be declared on a type}}{{3-8=}}
|
|
}
|
|
|
|
struct InMemberFunc {
|
|
func member() {
|
|
static func gf1() {} // expected-error {{static methods may only be declared on a type}}{{5-11=}}
|
|
class func gf2() {} // expected-error {{class methods may only be declared on a type}}{{5-10=}}
|
|
}
|
|
}
|
|
|
|
struct DuplicateStatic {
|
|
static static func f1() {} // expected-error{{'static' specified twice}}{{10-16=}}
|
|
static class func f2() {} // expected-error{{'class' specified twice}}{{10-15=}}
|
|
class static func f3() {} // expected-error{{'static' specified twice}}{{9-15=}} expected-error{{class methods are only allowed within classes; use 'static' to declare a static method}}{{3-8=static}}
|
|
class class func f4() {} // expected-error{{'class' specified twice}}{{9-14=}} expected-error{{class methods are only allowed within classes; use 'static' to declare a static method}}{{3-8=static}}
|
|
override static static func f5() {} // expected-error{{'static' specified twice}}{{19-25=}} expected-error{{'override' can only be specified on class members}}
|
|
static override static func f6() {} // expected-error{{'static' specified twice}}{{19-25=}} expected-error{{'override' can only be specified on class members}}
|
|
static static override func f7() {} // expected-error{{'static' specified twice}}{{10-16=}} expected-error{{'override' can only be specified on class members}}
|
|
static final func f8() {} // expected-error {{only classes and class members may be marked with 'final'}}
|
|
}
|
|
|
|
struct S { // expected-note {{extended type declared here}}
|
|
static func f1() {}
|
|
class func f2() {} // expected-error {{class methods are only allowed within classes; use 'static' to declare a static method}}
|
|
}
|
|
|
|
extension S {
|
|
static func ef1() {}
|
|
class func ef2() {} // expected-error {{class methods are only allowed within classes; use 'static' to declare a static method}}
|
|
}
|
|
|
|
enum E { // expected-note {{extended type declared here}}
|
|
static func f1() {}
|
|
class func f2() {} // expected-error {{class methods are only allowed within classes; use 'static' to declare a static method}}
|
|
static final func f3() {} // expected-error {{only classes and class members may be marked with 'final'}}
|
|
}
|
|
|
|
extension E {
|
|
static func f4() {}
|
|
class func f5() {} // expected-error {{class methods are only allowed within classes; use 'static' to declare a static method}}
|
|
}
|
|
|
|
class C {
|
|
static func f1() {} // expected-note {{overridden declaration is here}}
|
|
class func f2() {}
|
|
class func f3() {}
|
|
class func f4() {} // expected-note {{overridden declaration is here}}
|
|
class func f5() {} // expected-note {{overridden declaration is here}}
|
|
static final func f6() {} // expected-error {{static declarations are already final}}
|
|
}
|
|
|
|
extension C {
|
|
static func ef1() {}
|
|
class func ef2() {} // expected-note {{overridden declaration is here}}
|
|
class func ef3() {} // expected-note {{overridden declaration is here}}
|
|
class func ef4() {} // expected-note {{overridden declaration is here}}
|
|
class func ef5() {} // expected-note {{overridden declaration is here}}
|
|
}
|
|
|
|
class C_Derived : C {
|
|
override static func f1() {} // expected-error {{class method overrides a 'final' class method}}
|
|
override class func f2() {}
|
|
class override func f3() {}
|
|
|
|
override class func ef2() {} // expected-error {{declarations from extensions cannot be overridden yet}}
|
|
class override func ef3() {} // expected-error {{declarations from extensions cannot be overridden yet}}
|
|
}
|
|
|
|
extension C_Derived {
|
|
override class func f4() {} // expected-error {{declarations in extensions cannot override yet}}
|
|
class override func f5() {} // expected-error {{declarations in extensions cannot override yet}}
|
|
|
|
override class func ef4() {} // expected-error {{declarations in extensions cannot override yet}}
|
|
class override func ef5() {} // expected-error {{declarations in extensions cannot override yet}}
|
|
}
|
|
|
|
protocol P {
|
|
static func f1()
|
|
static func f2()
|
|
static func f3() {} // expected-error {{protocol methods may not have bodies}}
|
|
static final func f4() // expected-error {{only classes and class members may be marked with 'final'}}
|
|
}
|
|
|