Improve Synchronized.initialize method for Optionals

Alkenso · Dec 9, 2024 · a2c6a03 · a2c6a03
1 parent 6aa0301
commit a2c6a03
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/Sources/SpellbookFoundation/Threading & Concurrency/Atomic.swift b/Sources/SpellbookFoundation/Threading & Concurrency/Atomic.swift
@@ -47,18 +47,6 @@ public final class Atomic<Value> {
     public func exchange(_ value: Value) -> Value {
         storage.write { updateSwap(&$0, value) }
     }
-
-    public func initialize<T>(_ initialize: @autoclosure () -> T) -> T where Value == T? {
-        storage.write {
-            if let value = $0 {
-                return value
-            } else {
-                let newValue = initialize()
-                $0 = newValue
-                return newValue
-            }
-        }
-    }
 }
 
 extension Atomic where Value: AdditiveArithmetic {

diff --git a/Sources/SpellbookFoundation/Threading & Concurrency/Synchronized.swift b/Sources/SpellbookFoundation/Threading & Concurrency/Synchronized.swift
@@ -112,17 +112,21 @@ extension Synchronized {
         self.init(primitive, nil)
     }
 
-    public func initialize<T>(_ initialize: @autoclosure () throws -> T) rethrows -> T where Value == T? {
+    public func initialize<T>(produceValue: () throws -> T) rethrows -> T where Value == T? {
         try write {
             if let value = $0 {
                 return value
             } else {
-                let newValue = try initialize()
+                let newValue = try produceValue()
                 $0 = newValue
                 return newValue
             }
         }
     }
+
+    public func initialize<T>(_ value: T) -> T where Value == T? {
+        initialize { value }
+    }
 }
 
 public extension Synchronized where Value: AdditiveArithmetic {