averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't require paretheses when mixing optional types and array types...

Browse Source 
... unless we actually hit one of the confusing cases involving
multi-dimensional arrays (e.g., Int[]?[]), at which point one needs to
write parentheses <rdar://problem/16737035>.



Swift SVN r18181
This commit is contained in:
Doug Gregor
2014-05-16 06:03:26 +00:00
parent 70dfa94160
commit b756fc29ec
6 changed files with 100 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
stdlib/objc/Foundation/NSStringAPI.swift
View File

@@ -411,7 +411,7 @@ extension String {
/// \brief a Helper function for the two completePathIntoString overloads below
func _completePathIntoString(
inout outputName: String?, caseSensitive: Bool,
matchesIntoArray: ObjCMutablePointer<NSArray?>, filterTypes: (String[])?) -> Int {
matchesIntoArray: ObjCMutablePointer<NSArray?>, filterTypes: String[]?) -> Int {
var nsOutputName: NSString? = .None
@@ -436,8 +436,8 @@ extension String {
/// returns the actual number of matching paths.
func completePathIntoString(
inout outputName: String?, caseSensitive: Bool,
inout matchesIntoArray: (String[])?,
filterTypes: (String[])? = .None
inout matchesIntoArray: String[]?,
filterTypes: String[]? = .None
) -> Int {
var nsMatches: NSArray? = .None
@@ -465,7 +465,7 @@ extension String {
func completePathIntoString(
inout outputName: String?,
caseSensitive: Bool,
filterTypes: (String[])? = .None
filterTypes: String[]? = .None
) -> Int {
return _completePathIntoString(
@@ -1006,7 +1006,7 @@ extension String {
/// range and requested tags within the receiving string.
func linguisticTagsInRange(
range: NSRange, scheme: String, options: NSLinguisticTaggerOptions,
orthography: NSOrthography?, inout tokenRanges: (NSRange[])?
orthography: NSOrthography?, inout tokenRanges: NSRange[]?
) -> String[] {
var tokenRanges_: NSArray? = .None
var result = self._ns.linguisticTagsInRange(