Merge pull request #84 from kkebo/use-string-literal-2

kkebo · Jul 1, 2024 · b919988 · b919988
2 parents 6387067 + d3ab446
commit b919988
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Sources/Tokenizer/Str.swift b/Sources/Tokenizer/Str.swift
@@ -4,6 +4,10 @@ public typealias Char = Unicode.Scalar
 
 extension Str: @retroactive ExpressibleByStringLiteral {
     @inlinable public init(stringLiteral value: consuming String) {
+        guard !value.isEmpty else {
+            self = []
+            return
+        }
         self.init(value.unicodeScalars)
     }
 }

diff --git a/Sources/Tokenizer/Tokenizer.swift b/Sources/Tokenizer/Tokenizer.swift
@@ -19,12 +19,12 @@ public struct Tokenizer<Sink: ~Copyable & TokenSink>: ~Copyable {
         self.emitsAllErrors = emitsAllErrors
         self.state = .data
         self.reconsumeChar = nil
-        self.tempBuffer = []
-        self.currentComment = []
-        self.currentTagName = []
+        self.tempBuffer = ""
+        self.currentComment = ""
+        self.currentTagName = ""
         self.currentTagKind = .start
-        self.currentAttrName = []
-        self.currentAttrValue = []
+        self.currentAttrName = ""
+        self.currentAttrValue = ""
         self.currentAttrs = [:]
         self.lastStartTagName = nil
         self.currentDOCTYPE = .init()
@@ -1506,7 +1506,7 @@ public struct Tokenizer<Sink: ~Copyable & TokenSink>: ~Copyable {
     private mutating func clearPublicID() {
         switch self.currentDOCTYPE.publicID {
         case .some: self.currentDOCTYPE.publicID?.removeAll(keepingCapacity: true)
-        case .none: self.currentDOCTYPE.publicID = []
+        case .none: self.currentDOCTYPE.publicID = ""
         }
     }
 
@@ -1522,7 +1522,7 @@ public struct Tokenizer<Sink: ~Copyable & TokenSink>: ~Copyable {
     private mutating func clearSystemID() {
         switch self.currentDOCTYPE.systemID {
         case .some: self.currentDOCTYPE.systemID?.removeAll(keepingCapacity: true)
-        case .none: self.currentDOCTYPE.systemID = []
+        case .none: self.currentDOCTYPE.systemID = ""
         }
     }