mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
793b3326af
The rule changes are as follows: * All functions (introduced with the 'func' keyword) have argument labels for arguments beyond the first, by default. Methods are no longer special in this regard. * The presence of a default argument no longer implies an argument label. The actual changes to the parser and printer are fairly simple; the rest of the noise is updating the standard library, overlays, tests, etc. With the standard library, this change is intended to be API neutral: I've added/removed #'s and _'s as appropriate to keep the user interface the same. If we want to separately consider using argument labels for more free functions now that the defaults in the language have shifted, we can tackle that separately. Fixes rdar://problem/17218256. Swift SVN r27704
125 lines
6.7 KiB
Swift
125 lines
6.7 KiB
Swift
// RUN: rm -rf %t
|
|
// RUN: mkdir -p %t
|
|
|
|
// XFAIL: linux
|
|
|
|
// This file deliberately does not use %clang-importer-sdk for most RUN lines.
|
|
// Instead, it generates custom overlay modules itself, and uses -I %t when it
|
|
// wants to use them.
|
|
|
|
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk -I %t) -emit-module -o %t %S/../Inputs/clang-importer-sdk/swift-modules/ObjectiveC.swift
|
|
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk -I %t) -emit-module -o %t %S/../Inputs/clang-importer-sdk/swift-modules/CoreGraphics.swift
|
|
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk -I %t) -emit-module -o %t %S/../Inputs/clang-importer-sdk/swift-modules/Foundation.swift
|
|
// RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -print-module -source-filename %s -module-to-print=ctypes -function-definitions=false -prefer-type-repr=true > %t.printed.txt
|
|
// RUN: FileCheck %s -check-prefix=TAG_DECLS_AND_TYPEDEFS -strict-whitespace < %t.printed.txt
|
|
// RUN: FileCheck %s -check-prefix=NEGATIVE -strict-whitespace < %t.printed.txt
|
|
|
|
// RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -print-module -source-filename %s -module-to-print=Foundation -function-definitions=false -prefer-type-repr=true > %t.printed.txt
|
|
// RUN: FileCheck %s -check-prefix=FOUNDATION -strict-whitespace < %t.printed.txt
|
|
|
|
// RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -print-module -source-filename %s -module-to-print=ctypes.bits -function-definitions=false -prefer-type-repr=true > %t.printed.txt
|
|
// RUN: FileCheck %s -check-prefix=CTYPESBITS -strict-whitespace < %t.printed.txt
|
|
|
|
// RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -print-module -source-filename %s -module-to-print=nullability -function-definitions=false -prefer-type-repr=true > %t.printed.txt
|
|
// RUN: FileCheck %s -check-prefix=CHECK-NULLABILITY -strict-whitespace < %t.printed.txt
|
|
|
|
// TAG_DECLS_AND_TYPEDEFS: {{^}}struct FooStruct1 {{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} var x: Int32{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} var y: Double{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} init(){{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} init(x: Int32, y: Double){{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}}}{{$}}
|
|
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}}struct FooStruct2 {{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} var x: Int32{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} var y: Double{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} init(){{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} init(x: Int32, y: Double){{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}}}{{$}}
|
|
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}}typealias FooStructTypedef1 = FooStruct2{{$}}
|
|
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}}struct FooStructTypedef2 {{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} var x: Int32{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} var y: Double{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} init(){{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} init(x: Int32, y: Double){{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}}}{{$}}
|
|
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}}struct FooStruct3 {{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} var x: Int32{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} var y: Double{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} init(){{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} init(x: Int32, y: Double){{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}}}{{$}}
|
|
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}}struct FooStruct4 {{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} var x: Int32{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} var y: Double{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} init(){{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} init(x: Int32, y: Double){{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}}}{{$}}
|
|
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}}struct FooStruct5 {{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} var x: Int32{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} var y: Double{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} init(){{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} init(x: Int32, y: Double){{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}}}{{$}}
|
|
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}}struct FooStruct6 {{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} var x: Int32{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} var y: Double{{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} init(){{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}} init(x: Int32, y: Double){{$}}
|
|
// TAG_DECLS_AND_TYPEDEFS-NEXT: {{^}}}{{$}}
|
|
|
|
// NEGATIVE-NOT: typealias FooStructTypedef2
|
|
|
|
// FOUNDATION-LABEL: {{^}}/// Aaa. NSArray. Bbb.{{$}}
|
|
// FOUNDATION-NEXT: {{^}}class NSArray : NSObject {{{$}}
|
|
// FOUNDATION-NEXT func objectAtIndex(index: Int) -> AnyObject!
|
|
|
|
// FOUNDATION-LABEL: {{^}}/// Aaa. NSRuncingMode. Bbb.{{$}}
|
|
// FOUNDATION-NEXT: {{^}}enum NSRuncingMode : UInt {{{$}}
|
|
// FOUNDATION-NEXT: {{^}} init?(rawValue: UInt){{$}}
|
|
// FOUNDATION-NEXT: {{^}} var rawValue: UInt { get }{{$}}
|
|
// FOUNDATION-NEXT: {{^}} case Mince{{$}}
|
|
// FOUNDATION-NEXT: {{^}} case Quince{{$}}
|
|
// FOUNDATION-NEXT: {{^}}}{{$}}
|
|
|
|
// FOUNDATION-LABEL: {{^}}/// Aaa. NSRuncingOptions. Bbb.{{$}}
|
|
// FOUNDATION-NEXT: {{^}}struct NSRuncingOptions : RawOptionSetType {{{$}}
|
|
// FOUNDATION-NEXT: {{^}} init(){{$}}
|
|
// FOUNDATION-NEXT: {{^}} init(_ rawValue: UInt){{$}}
|
|
// FOUNDATION-NEXT: {{^}} init(rawValue: UInt){{$}}
|
|
// FOUNDATION-NEXT: {{^}} let rawValue: UInt{{$}}
|
|
// FOUNDATION-NEXT: {{^}} static var EnableMince: NSRuncingOptions { get }{{$}}
|
|
// FOUNDATION-NEXT: {{^}} static var EnableQuince: NSRuncingOptions { get }{{$}}
|
|
// FOUNDATION-NEXT: {{^}} static var allZeros: NSRuncingOptions { get }{{$}}
|
|
// FOUNDATION-NEXT: {{^}} init(nilLiteral _: ()){{$}}
|
|
// FOUNDATION-NEXT: {{^}}}{{$}}
|
|
|
|
// FOUNDATION-LABEL: {{^}}/// Unavailable Global Functions{{$}}
|
|
// FOUNDATION-NEXT: @availability(*, unavailable)
|
|
// FOUNDATION-NEXT: NSSetZoneName(zone: NSZone, _ name: String)
|
|
|
|
// CTYPESBITS-NOT: FooStruct1
|
|
// CTYPESBITS: {{^}}typealias DWORD = Int32{{$}}
|
|
// CTYPESBITS-NEXT: {{^}}var MY_INT: Int32 { get }{{$}}
|
|
// CTYPESBITS-NOT: FooStruct1
|
|
|
|
// CHECK-NULLABILITY: func getId1() -> AnyObject?
|
|
// CHECK-NULLABILITY: var global_id: AnyObject?
|
|
// CHECK-NULLABILITY: class SomeClass {
|
|
// CHECK-NULLABILITY: class func methodA(obj: SomeClass?) -> AnyObject{{$}}
|
|
// CHECK-NULLABILITY: func methodA(obj: SomeClass?) -> AnyObject{{$}}
|
|
// CHECK-NULLABILITY: class func methodB(block: ((Int32, Int32) -> Int32)?) -> AnyObject{{$}}
|
|
// CHECK-NULLABILITY: func methodB(block: ((Int32, Int32) -> Int32)?) -> AnyObject{{$}}
|
|
// CHECK-NULLABILITY: func methodC() -> AnyObject?
|
|
// CHECK-NULLABILITY: var property: AnyObject?
|
|
// CHECK-NULLABILITY: func stringMethod() -> String{{$}}
|
|
// CHECK-NULLABILITY: func optArrayMethod() -> [AnyObject]?
|
|
// CHECK-NULLABILITY: }
|
|
// CHECK-NULLABILITY: func compare_classes(sc1: SomeClass, _ sc2: SomeClass, _ sc3: SomeClass!)
|