Skip to content

[swift-4.0-branch][overlay] Port Foundation String extensions to StringProtocol #10947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 14, 2017
Merged

[swift-4.0-branch][overlay] Port Foundation String extensions to StringProtocol #10947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5101923
[stdlib] Eliminate over-constraint on StringProtocol
Jun 3, 2017
fd7b5c7
[overlay] Extracting static string extensions
Jun 15, 2017
1d6bb48
[overlay] Move unavailable declarations to StringProtocol
Jun 15, 2017
bf31646
[overlay] Port Foundation extensions from String to StringProtocol
Jun 15, 2017
f99d4af
[overlay] Mark Foundation String slicing methods as deprecated
Jul 6, 2017
a705116
[overlay] Generalize Foundation StringProtocol extensions
Jul 6, 2017
d7e4d20
[overlay] Move static unavailable members back to String
Jul 7, 2017
c2476f4
[overlay] Potentially better bridging to NSString in StringProtocol e…
Jul 7, 2017
832c5d6
[overlay] Use RangeExpression whenever possible instead of Range
Jul 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions stdlib/public/SDK/Foundation/NSRange.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,22 +140,20 @@ extension NSRange {
//===----------------------------------------------------------------------===//

extension NSRange {
public init<R: RangeExpression>(_ rangeExpression: R)
public init<R: RangeExpression>(_ region: R)
where R.Bound: FixedWidthInteger, R.Bound.Stride : SignedInteger {
let range = rangeExpression.relative(to: 0..<R.Bound.max)
let start: Int = numericCast(range.lowerBound)
let end: Int = numericCast(range.upperBound)
self = NSRange(location: start, length: end - start)
let r = region.relative(to: 0..<R.Bound.max)
location = numericCast(r.lowerBound)
length = numericCast(r.count)
}

public init<R: RangeExpression, S: StringProtocol>(_ rangeExpression: R, in string: S)
where R.Bound == String.Index, S.Index == String.Index {
let range = rangeExpression.relative(to: string)
let start = range.lowerBound.samePosition(in: string.utf16)
let end = range.upperBound.samePosition(in: string.utf16)
let location = string.utf16.distance(from: string.utf16.startIndex, to: start)
let length = string.utf16.distance(from: start, to: end)
self = NSRange(location: location, length: length)
public init<R: RangeExpression, S: StringProtocol>(_ region: R, in target: S)
where R.Bound == S.Index, S.Index == String.Index {
let r = region.relative(to: target)
self = NSRange(
location: r.lowerBound._utf16Index - target.startIndex._utf16Index,
length: r.upperBound._utf16Index - r.lowerBound._utf16Index
)
}

@available(swift, deprecated: 4, renamed: "Range.init(_:)")
Expand Down
Loading