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

[stdlib] Mark index encodings in String.UTF8View & UTF16View

Browse Source
This commit is contained in:
Karoy Lorentey
2022-03-16 20:16:03 -07:00
parent 8ab2379946
commit 836bf9ad73
3 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
stdlib/public/core/StringUnicodeScalarView.swift
View File

@@ -114,7 +114,7 @@ extension String.UnicodeScalarView: BidirectionalCollection {
if _fastPath(_guts.isFastUTF8) {
let len = _guts.fastUTF8ScalarLength(startingAt: i._encodedOffset)
return i.encoded(offsetBy: len)._scalarAligned
return i.encoded(offsetBy: len)._scalarAligned._knownUTF8
}
return _foreignIndex(after: i)
@@ -143,11 +143,11 @@ extension String.UnicodeScalarView: BidirectionalCollection {
_precondition(i > startIndex, "String index is out of bounds")
if _fastPath(_guts.isFastUTF8) {
let len = _guts.withFastUTF8 { utf8 -> Int in
return _utf8ScalarLength(utf8, endingAt: i._encodedOffset)
let len = _guts.withFastUTF8 { utf8 in
_utf8ScalarLength(utf8, endingAt: i._encodedOffset)
}
_internalInvariant(len <= 4, "invalid UTF8")
return i.encoded(offsetBy: -len)._scalarAligned
return i.encoded(offsetBy: -len)._scalarAligned._knownUTF8
}
return _foreignIndex(before: i)
@@ -436,7 +436,8 @@ extension String.UnicodeScalarView {
let cu = _guts.foreignErrorCorrectedUTF16CodeUnit(at: i)
let len = UTF16.isLeadSurrogate(cu) ? 2 : 1
return i.encoded(offsetBy: len)._scalarAligned
let r = i.encoded(offsetBy: len)._scalarAligned
return _guts.internalMarkEncoding(r)
}
@usableFromInline @inline(never)
@@ -447,6 +448,7 @@ extension String.UnicodeScalarView {
let cu = _guts.foreignErrorCorrectedUTF16CodeUnit(at: priorIdx)
let len = UTF16.isTrailSurrogate(cu) ? 2 : 1
return i.encoded(offsetBy: -len)._scalarAligned
let r = i.encoded(offsetBy: -len)._scalarAligned
return _guts.internalMarkEncoding(r)
}
}