Merge pull request #62931 from lorentey/character-recognizer-conformances-5.8

[5.8][stdlib] _CharacterRecognizer: Add Sendable, Equatable, CustomStringConvertible conformances

Author: lorentey

stdlib/public/core/StringGraphemeBreaking.swift

@@ -407,7 +407,7 @@ extension Unicode.Scalar {
   }
 }
 
-internal struct _GraphemeBreakingState {
+internal struct _GraphemeBreakingState: Sendable, Equatable {
   // When we're looking through an indic sequence, one of the requirements is
   // that there is at LEAST 1 Virama present between two linking consonants.
   // This value helps ensure that when we ultimately need to decide whether or
@@ -436,6 +436,18 @@ internal struct _GraphemeBreakingState {
   var shouldBreakRI = false
 }
 
+extension _GraphemeBreakingState: CustomStringConvertible {
+  var description: String {
+    var r = "["
+    if hasSeenVirama { r += "V" }
+    if isInEmojiSequence { r += "E" }
+    if isInIndicSequence { r += "I" }
+    if shouldBreakRI { r += "R" }
+    r += "]"
+    return r
+  }
+}
+
 extension Unicode {
   /// A state machine for recognizing character (i.e., extended grapheme
   /// cluster) boundaries in an arbitrary series of Unicode scalars.
@@ -448,7 +460,7 @@ extension Unicode {
   /// `String` splits its contents into `Character` values.
   @available(SwiftStdlib 5.8, *)
   public // SPI(Foundation) FIXME: We need API for this
-  struct _CharacterRecognizer {
+  struct _CharacterRecognizer: Sendable {
     internal var _previous: Unicode.Scalar
     internal var _state: _GraphemeBreakingState
 
@@ -547,6 +559,21 @@ extension Unicode {
   }
 }
 
+@available(SwiftStdlib 5.8, *)
+extension Unicode._CharacterRecognizer: Equatable {
+  public static func ==(left: Self, right: Self) -> Bool {
+    left._previous == right._previous && left._state == right._state
+  }
+}
+
+@available(SwiftStdlib 5.8, *)
+extension Unicode._CharacterRecognizer: CustomStringConvertible {
+  public var description: String {
+    return "\(_state)U+\(String(_previous.value, radix: 16, uppercase: true))"
+  }
+}
+
+
 extension _StringGuts {
   // Returns the stride of the grapheme cluster starting at offset `index`,
   // assuming it is on a grapheme cluster boundary.

test/stdlib/CharacterRecognizer.swift

@@ -114,3 +114,36 @@ if #available(SwiftStdlib 5.8, *) {
       """)
   }
 }
+
+if #available(SwiftStdlib 5.8, *) {
+  suite.test("Equatable") {
+    var r1 = Unicode._CharacterRecognizer()
+    var r2 = Unicode._CharacterRecognizer()
+    expectEqual(r1, r2)
+    expectTrue(r1.hasBreak(before: "a"))
+    expectNotEqual(r1, r2)
+    expectTrue(r2.hasBreak(before: "a"))
+    expectEqual(r1, r2)
+    expectTrue(r2.hasBreak(before: "\u{1f44f}")) // CLAPPING HANDS SIGN
+    expectNotEqual(r1, r2)
+    expectTrue(r1.hasBreak(before: "b"))
+    expectNotEqual(r1, r2)
+    expectFalse(r2.hasBreak(before: "\u{1f3fc}")) // EMOJI MODIFIER FITZPATRICK TYPE-3
+    expectNotEqual(r1, r2)
+    expectTrue(r2.hasBreak(before: "b"))
+    expectEqual(r1, r2) // breaks should reset state
+  }
+}
+
+if #available(SwiftStdlib 5.8, *) {
+  suite.test("CustomStringConvertible") {
+    var r = Unicode._CharacterRecognizer()
+    expectEqual("\(r)", "[]U+0")
+    expectTrue(r.hasBreak(before: "\u{1F1FA}")) // REGIONAL INDICATOR SYMBOL LETTER U
+    expectEqual("\(r)", "[]U+1F1FA")
+    expectFalse(r.hasBreak(before: "\u{1F1F8}")) // REGIONAL INDICATOR SYMBOL LETTER S
+    expectEqual("\(r)", "[R]U+1F1F8")
+    expectTrue(r.hasBreak(before: "$"))
+    expectEqual("\(r)", "[]U+24")
+  }
+}