floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LMCassette // Handle delimiters consisting of multiple spaces.

This commit is contained in:
ShikiSuen 2022-10-22 13:34:27 +08:00
parent 85efbeaf81
commit d2d8d4ab58
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmCassette.swift
View File

@ -75,16 +75,22 @@ extension vChewingLM {
var loadingKeys = false var loadingKeys = false
var loadingCharDefinitions = false var loadingCharDefinitions = false
var loadingOctagramData = false var loadingOctagramData = false
for (_, strLine) in lineReader.enumerated() { for strLine in lineReader {
if !loadingKeys, strLine.contains("%keyname begin") { loadingKeys = true } if !loadingKeys, strLine.contains("%keyname"), strLine.contains("begin") { loadingKeys = true }
if loadingKeys, strLine.contains("%keyname end") { loadingKeys = false } if loadingKeys, strLine.contains("%keyname"), strLine.contains("end") { loadingKeys = false }
if !loadingCharDefinitions, strLine.contains("%chardef begin") { loadingCharDefinitions = true } if !loadingCharDefinitions, strLine.contains("%chardef"), strLine.contains("begin") {
if loadingCharDefinitions, strLine.contains("%chardef end") { loadingCharDefinitions = true
}
if loadingCharDefinitions, strLine.contains("%chardef"), strLine.contains("end") {
loadingCharDefinitions = false loadingCharDefinitions = false
if charDefMap.keys.contains(wildcardKey) { wildcardKey = "" } if charDefMap.keys.contains(wildcardKey) { wildcardKey = "" }
} }
if !loadingOctagramData, strLine.contains("%octagram begin") { loadingOctagramData = true } if !loadingOctagramData, strLine.contains("%octagram"), strLine.contains("begin") {
if loadingOctagramData, strLine.contains("%octagram end") { loadingOctagramData = false } loadingOctagramData = true
}
if loadingOctagramData, strLine.contains("%octagram"), strLine.contains("end") {
loadingOctagramData = false
}
let cells: [String.SubSequence] = let cells: [String.SubSequence] =
strLine.contains("\t") ? strLine.split(separator: "\t") : strLine.split(separator: " ") strLine.contains("\t") ? strLine.split(separator: "\t") : strLine.split(separator: " ")
guard cells.count >= 2 else { continue } guard cells.count >= 2 else { continue }