feat: Str conforms to ExpressibleByStringLiteral

kkebo · May 16, 2024 · 94ba18f · 94ba18f
1 parent 0638b6b
commit 94ba18f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/Sources/Tokenizer/Str.swift b/Sources/Tokenizer/Str.swift
@@ -2,12 +2,22 @@ public typealias Str = [Char]
 public typealias StrSlice = ArraySlice<Char>
 public typealias Char = Unicode.Scalar
 
-extension Str {
-    static func == (lhs: Self, rhs: String) -> Bool {
-        guard lhs.count == rhs.count else { return false }
-        for (l, r) in zip(lhs, rhs.unicodeScalars) {
-            guard l == r else { return false }
-        }
-        return true
+extension Str: @retroactive ExpressibleByStringLiteral {
+    @inlinable public init(stringLiteral value: StringLiteralType) {
+        self = .init(value.unicodeScalars)
     }
 }
+
+extension Str: @retroactive ExpressibleByUnicodeScalarLiteral {
+    @inlinable public init(unicodeScalarLiteral value: UnicodeScalarLiteralType) {
+        self = .init(value.unicodeScalars)
+    }
+}
+
+extension Str: @retroactive ExpressibleByExtendedGraphemeClusterLiteral {
+    @inlinable public init(extendedGraphemeClusterLiteral value: ExtendedGraphemeClusterLiteralType) {
+        self = .init(value.unicodeScalars)
+    }
+}
+
+extension Str: @retroactive ExpressibleByStringInterpolation {}
diff --git a/Sources/Tokenizer/Tokenizer.swift b/Sources/Tokenizer/Tokenizer.swift
@@ -1270,12 +1270,12 @@ public struct Tokenizer<Sink: ~Copyable & TokenSink>: ~Copyable {
     @inline(__always)
     private mutating func startsExact(
         _ input: inout BufferQueue,
-        with pattern: consuming some StringProtocol
+        with pattern: consuming Str
     ) -> Bool? {
         guard !input.buffers.isEmpty else { return nil }
         var bufIndex = 0
         var i = 0
-        for pc in pattern.unicodeScalars {
+        for pc in pattern {
             guard bufIndex < input.buffers.count else { return nil }
             let buf = input.buffers[bufIndex]
             let c = buf[buf.startIndex + i]
@@ -1296,12 +1296,12 @@ public struct Tokenizer<Sink: ~Copyable & TokenSink>: ~Copyable {
     @inline(__always)
     private mutating func starts(
         _ input: inout BufferQueue,
-        with pattern: consuming some StringProtocol
+        with pattern: consuming Str
     ) -> Bool? {
         guard !input.buffers.isEmpty else { return nil }
         var bufIndex = 0
         var i = 0
-        for pc in pattern.unicodeScalars {
+        for pc in pattern {
             guard bufIndex < input.buffers.count else { return nil }
             let buf = input.buffers[bufIndex]
             let c = buf[buf.startIndex + i]