diff --git a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/LMInstantiator.swift b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/LMInstantiator.swift index 0efc45ae..811ad3c2 100644 --- a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/LMInstantiator.swift +++ b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/LMInstantiator.swift @@ -88,7 +88,7 @@ extension vChewingLM { // MARK: - 工具函式 - public var isLanguageModelLoaded: Bool { lmCore.isLoaded() } + public var isLanguageModelLoaded: Bool { lmCore.isLoaded } public func loadLanguageModel(path: String) { if FileManager.default.isReadableFile(atPath: path) { lmCore.open(path) @@ -98,7 +98,7 @@ extension vChewingLM { } } - public var isCNSDataLoaded: Bool { vChewingLM.LMInstantiator.lmCNS.isLoaded() } + public var isCNSDataLoaded: Bool { vChewingLM.LMInstantiator.lmCNS.isLoaded } public func loadCNSData(path: String) { if FileManager.default.isReadableFile(atPath: path) { vChewingLM.LMInstantiator.lmCNS.open(path) @@ -108,7 +108,7 @@ extension vChewingLM { } } - public var isMiscDataLoaded: Bool { lmMisc.isLoaded() } + public var isMiscDataLoaded: Bool { lmMisc.isLoaded } public func loadMiscData(path: String) { if FileManager.default.isReadableFile(atPath: path) { lmMisc.open(path) @@ -118,7 +118,7 @@ extension vChewingLM { } } - public var isSymbolDataLoaded: Bool { vChewingLM.LMInstantiator.lmSymbols.isLoaded() } + public var isSymbolDataLoaded: Bool { vChewingLM.LMInstantiator.lmSymbols.isLoaded } public func loadSymbolData(path: String) { if FileManager.default.isReadableFile(atPath: path) { vChewingLM.LMInstantiator.lmSymbols.open(path) diff --git a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmAssociates.swift b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmAssociates.swift index 177edea9..1d98bd36 100644 --- a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmAssociates.swift +++ b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmAssociates.swift @@ -24,7 +24,7 @@ extension vChewingLM { rangeMap = [:] } - public func isLoaded() -> Bool { + public var isLoaded: Bool { !rangeMap.isEmpty } @@ -40,7 +40,7 @@ extension vChewingLM { } @discardableResult public mutating func open(_ path: String) -> Bool { - if isLoaded() { + if isLoaded { return false } @@ -72,7 +72,7 @@ extension vChewingLM { } public mutating func close() { - if isLoaded() { + if isLoaded { rangeMap.removeAll() } } diff --git a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmCoreEX.swift b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmCoreEX.swift index c7d52716..0dbe5db5 100644 --- a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmCoreEX.swift +++ b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmCoreEX.swift @@ -53,7 +53,7 @@ extension vChewingLM { } /// 檢測資料庫辭典內是否已經有載入的資料。 - public func isLoaded() -> Bool { + public var isLoaded: Bool { !rangeMap.isEmpty } @@ -61,7 +61,7 @@ extension vChewingLM { /// - parameters: /// - path: 給定路徑。 @discardableResult public mutating func open(_ path: String) -> Bool { - if isLoaded() { + if isLoaded { return false } @@ -95,7 +95,7 @@ extension vChewingLM { /// 將當前語言模組的資料庫辭典自記憶體內卸除。 public mutating func close() { - if isLoaded() { + if isLoaded { rangeMap.removeAll() } } diff --git a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmCoreNS.swift b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmCoreNS.swift index 02fa5706..bfe8fb07 100644 --- a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmCoreNS.swift +++ b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmCoreNS.swift @@ -54,7 +54,7 @@ extension vChewingLM { } /// 檢測資料庫辭典內是否已經有載入的資料。 - public func isLoaded() -> Bool { + public var isLoaded: Bool { !rangeMap.isEmpty } @@ -62,7 +62,7 @@ extension vChewingLM { /// - parameters: /// - path: 給定路徑。 @discardableResult public mutating func open(_ path: String) -> Bool { - if isLoaded() { + if isLoaded { return false } @@ -81,7 +81,7 @@ extension vChewingLM { /// 將當前語言模組的資料庫辭典自記憶體內卸除。 public mutating func close() { - if isLoaded() { + if isLoaded { rangeMap.removeAll() } } diff --git a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmPlainBopomofo.swift b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmPlainBopomofo.swift index a5cf5ef2..4126b2df 100644 --- a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmPlainBopomofo.swift +++ b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmPlainBopomofo.swift @@ -22,12 +22,12 @@ extension vChewingLM { rangeMap = [:] } - public func isLoaded() -> Bool { + public var isLoaded: Bool { !rangeMap.isEmpty } @discardableResult public mutating func open(_ path: String) -> Bool { - if isLoaded() { + if isLoaded { return false } @@ -46,7 +46,7 @@ extension vChewingLM { } public mutating func close() { - if isLoaded() { + if isLoaded { rangeMap.removeAll() } } diff --git a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmReplacements.swift b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmReplacements.swift index a51ef050..c7f0de6c 100644 --- a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmReplacements.swift +++ b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmReplacements.swift @@ -22,12 +22,12 @@ extension vChewingLM { rangeMap = [:] } - public func isLoaded() -> Bool { + public var isLoaded: Bool { !rangeMap.isEmpty } @discardableResult public mutating func open(_ path: String) -> Bool { - if isLoaded() { + if isLoaded { return false } @@ -57,7 +57,7 @@ extension vChewingLM { } public mutating func close() { - if isLoaded() { + if isLoaded { rangeMap.removeAll() } }