perf: make CharRefTokenizer non-copyable

kkebo · Aug 13, 2024 · 8a84bc4 · 8a84bc4
1 parent a56809e
commit 8a84bc4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Sources/Tokenizer/CharRefTokenizer.swift b/Sources/Tokenizer/CharRefTokenizer.swift
@@ -20,7 +20,7 @@ enum CharRefProcessResult: ~Copyable {
     case doneChar(Char)
 }
 
-struct CharRefTokenizer {
+struct CharRefTokenizer: ~Copyable {
     private var state: CharRefState = .initial
     private var num: Int = 0
     private var numTooBig: Bool = false

diff --git a/Sources/Tokenizer/Optional+take.swift b/Sources/Tokenizer/Optional+take.swift
@@ -0,0 +1,7 @@
+extension Optional where Wrapped: ~Copyable {
+    @inlinable mutating func take() -> Self {
+        let value = self
+        self = nil
+        return value
+    }
+}
diff --git a/Sources/Tokenizer/Tokenizer.swift b/Sources/Tokenizer/Tokenizer.swift
@@ -43,7 +43,7 @@ public struct Tokenizer<Sink: ~Copyable & TokenSink>: ~Copyable {
     }
 
     private mutating func step(_ input: inout BufferQueue) -> ProcessResult {
-        if var charRefTokenizer {
+        if var charRefTokenizer = self.charRefTokenizer.take() {
             repeat {
                 switch charRefTokenizer.step(tokenizer: &self, input: &input) {
                 case .continue: continue
@@ -52,7 +52,6 @@ public struct Tokenizer<Sink: ~Copyable & TokenSink>: ~Copyable {
                 }
                 break
             } while true
-            self.charRefTokenizer = nil
         }
 
         return switch self.state {