Undo lazy

hughbe · Oct 6, 2020 · fa95635 · fa95635
1 parent 10bfa4f
commit fa95635
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Sources/CompoundFileReader/CompoundFile.swift b/Sources/CompoundFileReader/CompoundFile.swift
@@ -21,9 +21,9 @@ public class CompoundFile {
         miniSectorSize = UInt32(pow(2, Double(header.miniSectorShift)))
     }
 
-    public lazy var rootStorage: CompoundFileStorage = {
+    public var rootStorage: CompoundFileStorage {
         return getStorage(entryID: 0)!
-    }()
+    }
 
     public func getStorage(entryID: UInt32) -> CompoundFileStorage? {
         if entryID == 0xFFFFFFFF {

diff --git a/Sources/CompoundFileReader/CompoundFileStorage.swift b/Sources/CompoundFileReader/CompoundFileStorage.swift
@@ -16,7 +16,7 @@ public struct CompoundFileStorage: CustomDebugStringConvertible {
         return entry.name
     }
 
-    public lazy var children: [String: CompoundFileStorage] = {
+    public var children: [String: CompoundFileStorage] {
         guard let child = file.getStorage(entryID: entry.childID) else {
             return [:]
         }
@@ -25,7 +25,7 @@ public struct CompoundFileStorage: CustomDebugStringConvertible {
         result[child.name] = child
         child.addSiblings(to: &result)
         return result
-    }()
+    }
 
     private func addSiblings(to: inout [String: CompoundFileStorage]) {
         let leftID = entry.leftSiblingID