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

[String] Cleanup normalization code.

Browse Source 
Clean up some of the code surrounding the normalized code unit
iterator.
This commit is contained in:
Michael Ilseman
2018-09-24 11:42:59 -07:00
parent f1a35bd1c9
commit c51aa5988f
4 changed files with 62 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,44 +10,6 @@
//
//===----------------------------------------------------------------------===//
extension _StringGuts {
@usableFromInline @inline(__always)
internal func fastUTF8Scalar(startingAt i: Int) -> Unicode.Scalar {
return fastUTF8ScalarAndLength(startingAt: i).0
}
@usableFromInline @inline(__always)
internal func fastUTF8ScalarAndLength(startingAt i: Int) -> (Unicode.Scalar, Int) {
_sanityCheck(isFastUTF8)
return self.withFastUTF8 { utf8 in
return utf8.utf8ScalarAndLength(startingAt: i)
}
}
}
extension UnsafeBufferPointer where Element == UInt8 {
@usableFromInline @inline(__always)
internal func utf8ScalarAndLength(startingAt i: Int) -> (Unicode.Scalar, Int) {
let cu0 = self[i]
assert(!_isContinuation(cu0))
let length = Swift._utf8ScalarLength(cu0)
let scalar: Unicode.Scalar
switch length {
case 1: scalar = _decodeUTF8(cu0)
case 2: scalar = _decodeUTF8(cu0, self[i &+ 1])
case 3: scalar = _decodeUTF8(cu0, self[i &+ 1], self[i &+ 2])
case 4: scalar = _decodeUTF8(cu0, self[i &+ 1], self[i &+ 2], self[i &+ 3])
default: Builtin.unreachable()
}
return (scalar, length)
}
@usableFromInline @inline(__always)
internal func utf8Scalar(startingAt i: Int) -> Unicode.Scalar {
return utf8ScalarAndLength(startingAt: i).0
}
}
extension String.UnicodeScalarView {
#if !INTERNAL_CHECKS_ENABLED
@inlinable @inline(__always) internal func _invariantCheck() {}