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

stdlib: protocol extensions: de-underscore indices

Browse Source 
Swift SVN r28245
This commit is contained in:
Dmitri Hrybenko
2015-05-07 00:30:35 +00:00
parent f76ca6243e
commit e253881b02
30 changed files with 119 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
stdlib/public/SDK/Foundation/NSStringAPI.swift
View File

@@ -370,10 +370,10 @@ extension String {
// So let's do that; the switch should compile away anyhow.
return locale != nil ? _ns.compare(
aString, options: mask,
range: _toNSRange(range != nil ? range! : indices(self)), locale: locale)
range: _toNSRange(range != nil ? range! : self.indices), locale: locale)
: range != nil ? _ns.compare(
aString, options: mask, range: _toNSRange(range != nil ? range! : indices(self)))
aString, options: mask, range: _toNSRange(range != nil ? range! : self.indices))
: mask != nil ? _ns.compare(aString, options: mask)
@@ -1095,7 +1095,7 @@ extension String {
return _optionalRange(
_ns.rangeOfCharacterFromSet(
aSet, options: mask,
range: _toNSRange(aRange != nil ? aRange! : indices(self))))
range: _toNSRange(aRange != nil ? aRange! : self.indices)))
}
// - (NSRange)rangeOfComposedCharacterSequenceAtIndex:(NSUInteger)anIndex
@@ -1150,7 +1150,7 @@ extension String {
return _optionalRange(
locale != nil ? _ns.rangeOfString(
aString, options: mask,
range: _toNSRange(searchRange != nil ? searchRange! : indices(self)),
range: _toNSRange(searchRange != nil ? searchRange! : self.indices),
locale: locale
)
: searchRange != nil ? _ns.rangeOfString(
@@ -1351,7 +1351,7 @@ extension String {
? _ns.stringByReplacingOccurrencesOfString(
target,
withString: replacement, options: options,
range: _toNSRange(searchRange != nil ? searchRange! : indices(self))
range: _toNSRange(searchRange != nil ? searchRange! : self.indices)
)
: _ns.stringByReplacingOccurrencesOfString(target, withString: replacement)
}