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

fixup

Browse Source
This commit is contained in:
Dmitri Gribenko
2016-03-06 02:12:59 -08:00
parent ad1428e1d6
commit fc636b94f5
7 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
stdlib/public/core/StringCharacterView.swift
View File

@@ -150,7 +150,7 @@ extension String.CharacterView : BidirectionalCollection {
var gcb0 = graphemeClusterBreakProperty.getPropertyRawValue(
unicodeScalars[start].value)
start._successorInPlace()
unicodeScalars._nextInPlace(&start)
while start != end {
// FIXME(performance): consider removing this "fast path". A branch
@@ -165,7 +165,7 @@ extension String.CharacterView : BidirectionalCollection {
break
}
gcb0 = gcb1
start._successorInPlace()
unicodeScalars._nextInPlace(&start)
}
return start._position - startIndexUTF16
@@ -191,14 +191,14 @@ extension String.CharacterView : BidirectionalCollection {
var graphemeClusterStart = end
graphemeClusterStart._predecessorInPlace()
unicodeScalars._previousInPlace(&graphemeClusterStart)
var gcb0 = graphemeClusterBreakProperty.getPropertyRawValue(
unicodeScalars[graphemeClusterStart].value)
var graphemeClusterStartUTF16 = graphemeClusterStart._position
while graphemeClusterStart != start {
graphemeClusterStart._predecessorInPlace()
unicodeScalars._previousInPlace(&graphemeClusterStart)
let gcb1 = graphemeClusterBreakProperty.getPropertyRawValue(
unicodeScalars[graphemeClusterStart].value)
if segmenter.isBoundary(gcb1, gcb0) {
@@ -257,7 +257,8 @@ extension String.CharacterView : RangeReplaceableCollection {
>(
bounds: Range<Index>, with newElements: C
) {
let rawSubRange = bounds.startIndex._base._position
let rawSubRange: Range<Int> =
bounds.startIndex._base._position
..< bounds.endIndex._base._position
let lazyUTF16 = newElements.lazy.flatMap { $0.utf16 }
_core.replaceSubrange(rawSubRange, with: lazyUTF16)