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] Change dynamic check to sanity check.

Browse Source 
Double-checking for CR-LF is redundant in
_internalExtraCheckGraphemeBreakBetween. Add in a sanity check and
omit the overly conservative CR check.
This commit is contained in:
Michael Ilseman
2017-05-31 13:19:16 -07:00
parent 6ee5745a3a
commit 44cccba22d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -297,6 +297,10 @@ extension String.CharacterView : BidirectionalCollection {
internal static func _internalExtraCheckGraphemeBreakBetween(
_ lhs: UInt16, _ rhs: UInt16
) -> Bool {
_sanityCheck(
lhs != _CR || rhs != _LF,
"CR-LF special case handled by _quickCheckGraphemeBreakBetween")
// Whether the given scalar, when it appears paired with another scalar
// satisfying this property, has a grapheme break between it and the other
// scalar.
@@ -316,10 +320,10 @@ extension String.CharacterView : BidirectionalCollection {
// Repeat sub-300 check, this is beneficial for common cases of Latin
// characters embedded within non-Latin script (e.g. newlines, spaces,
// proper nouns and/or jargon, punctuation).
case 0x0000...0x02ff:
// Conservatively exclude CR, though this might not be necessary from
// previous checks.
return x != _CR
//
// NOTE: CR-LF special case has already been checked.
case 0x0000...0x02ff: return true
// TODO: general punctuation
// Non-combining kana: