Merge pull request swiftlang#333 from Azoy/rename-stringindex-evils-57

[5.7-04182022] Rename String.Index _encodedOffset

Author: rxwei

Sources/_StringProcessing/Unicode/Graphemes.swift

@@ -226,15 +226,15 @@ extension String {
     startingAt index: Int,
     nextScalar: (Int) -> (Unicode.Scalar, end: Int)
   ) -> Int {
-    _internalInvariant(index != endIndex._encodedOffset)
+    _internalInvariant(index != endIndex._encodedOffsetSP)
     var state = _GraphemeBreakingState()
     var index = index
 
     while true {
       let (scalar1, nextIdx) = nextScalar(index)
       index = nextIdx
 
-      guard index != endIndex._encodedOffset else {
+      guard index != endIndex._encodedOffsetSP else {
         break
       }
 
@@ -254,15 +254,15 @@ extension String {
     endingAt index: Int,
     previousScalar: (Int) -> (Unicode.Scalar, start: Int)
   ) -> Int {
-    _internalInvariant(index != startIndex._encodedOffset)
+    _internalInvariant(index != startIndex._encodedOffsetSP)
     var state = _GraphemeBreakingState()
     var index = index
 
     while true {
       let (scalar2, previousIdx) = previousScalar(index)
       index = previousIdx
 
-      guard index != startIndex._encodedOffset else {
+      guard index != startIndex._encodedOffsetSP else {
         break
       }
 
@@ -494,7 +494,7 @@ extension String {
   //                    know that we are in an emoji sequence so our initial
   //                    break question is answered as NO.
   internal func checkIfInEmojiSequence(_ index: Int) -> Bool {
-    var emojiIdx = String.Index(_encodedOffset: index)
+    var emojiIdx = String.Index(_encodedOffsetSP: index)
 
     guard emojiIdx != startIndex else {
       return false
@@ -551,7 +551,7 @@ extension String {
   //         | = Is a linking consonant and we've seen a virama, so this is a
   //             legitimate indic sequence, so do NOT break the initial question.
   internal func checkIfInIndicSequence(_ index: Int) -> Bool {
-    var indicIdx = String.Index(_encodedOffset: index)
+    var indicIdx = String.Index(_encodedOffsetSP: index)
 
     guard indicIdx != startIndex else {
       return false
@@ -639,7 +639,7 @@ extension String {
   internal func countRIs(
     _ index: Int
   ) -> Bool {
-    var riIdx = String.Index(_encodedOffset: index)
+    var riIdx = String.Index(_encodedOffsetSP: index)
 
     guard riIdx != startIndex else {
       return false

Sources/_StringProcessing/Unicode/NecessaryEvils.swift

@@ -90,12 +90,12 @@ extension UTF16 {
 }
 
 extension String.Index {
-  internal var _encodedOffset: Int {
+  internal var _encodedOffsetSP: Int {
     // The encoded offset is found in the top 48 bits.
     Int(unsafeBitCast(self, to: UInt64.self) >> 16)
   }
 
-  internal init(_encodedOffset offset: Int) {
+  internal init(_encodedOffsetSP offset: Int) {
     self = unsafeBitCast(offset << 16, to: Self.self)
   }
 }