LMCoreEX // Use new Tekkon functions to handle key conversions.

This commit is contained in:
ShikiSuen 2022-07-19 19:05:06 +08:00
parent 62ea37d2ec
commit 4c7ed0dc7b
1 changed files with 2 additions and 19 deletions

View File

@ -91,10 +91,9 @@ extension vChewing {
let neta = strData[$0].split(separator: " ")
if neta.count >= 2, String(neta[0]).first != "#" {
if !neta[0].isEmpty, !neta[1].isEmpty {
var theKey = shouldReverse ? String(neta[1]) : String(neta[0])
theKey.cnvPinyinToPhonabet()
let theKey = shouldReverse ? String(neta[1]) : String(neta[0])
let theValue = $0
rangeMap[theKey, default: []].append(theValue)
rangeMap[Tekkon.cnvHanyuPinyinToPhona(target: theKey), default: []].append(theValue)
}
}
}
@ -192,19 +191,3 @@ extension String {
}
}
}
// MARK: -
extension String {
fileprivate mutating func cnvPinyinToPhonabet() {
if contains("_") { return }
for key in Tekkon.mapHanyuPinyin.keys {
guard let value = Tekkon.mapHanyuPinyin[key] else { continue }
self = replacingOccurrences(of: key, with: value)
}
for key in Tekkon.mapArayuruPinyinIntonation.keys {
guard let value = Tekkon.mapArayuruPinyinIntonation[key] else { continue }
self = replacingOccurrences(of: key, with: value)
}
}
}