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

Repo // Unify the usage of Megrez.Compositor.Candidate.

This commit is contained in:
ShikiSuen 2022-08-29 16:50:40 +08:00
parent a8f8408302
commit e3c832011e
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Modules/ControllerModules/KeyHandler_Core.swift
View File

@ -122,7 +122,7 @@ public class KeyHandler {
/// - Parameter key: 給定的聯想詞的開頭字。 /// - Parameter key: 給定的聯想詞的開頭字。
/// - Returns: 抓取到的聯想詞陣列。 /// - Returns: 抓取到的聯想詞陣列。
/// 不會是 nil，但那些負責接收結果的函式會對空白陣列結果做出正確的處理。 /// 不會是 nil，但那些負責接收結果的函式會對空白陣列結果做出正確的處理。
func buildAssociatePhraseArray(withPair pair: Megrez.KeyValuePaired) -> [(String, String)] { func buildAssociatePhraseArray(withPair pair: Megrez.Compositor.Candidate) -> [(String, String)] {
var arrResult: [(String, String)] = [] var arrResult: [(String, String)] = []
if currentLM.hasAssociatedPhrasesFor(pair: pair) { if currentLM.hasAssociatedPhrasesFor(pair: pair) {
arrResult = currentLM.associatedPhrasesFor(pair: pair).map { ("", $0) } arrResult = currentLM.associatedPhrasesFor(pair: pair).map { ("", $0) }

2
Source/Modules/ControllerModules/KeyHandler_States.swift
View File

@ -150,7 +150,7 @@ extension KeyHandler {
/// - isTypingVertical: 是否縱排輸入？ /// - isTypingVertical: 是否縱排輸入？
/// - Returns: 回呼一個新的聯想詞狀態，來就給定的聯想詞陣列資料內容顯示選字窗。 /// - Returns: 回呼一個新的聯想詞狀態，來就給定的聯想詞陣列資料內容顯示選字窗。
func buildAssociatePhraseState( func buildAssociatePhraseState(
withPair pair: Megrez.KeyValuePaired, withPair pair: Megrez.Compositor.Candidate,
isTypingVertical: Bool isTypingVertical: Bool
) -> InputState.AssociatedPhrases! { ) -> InputState.AssociatedPhrases! {
// 上一行必須要用驚嘆號，否則 Xcode 會誤導你砍掉某些實際上必需的語句。 // 上一行必須要用驚嘆號，否則 Xcode 會誤導你砍掉某些實際上必需的語句。

4
Source/Modules/LangModelRelated/LMInstantiator.swift
View File

@ -245,11 +245,11 @@ extension vChewing {
return !unigramsFor(key: key).isEmpty return !unigramsFor(key: key).isEmpty
} }
public func associatedPhrasesFor(pair: Megrez.KeyValuePaired) -> [String] { public func associatedPhrasesFor(pair: Megrez.Compositor.Candidate) -> [String] {
lmAssociates.valuesFor(pair: pair) lmAssociates.valuesFor(pair: pair)
} }
public func hasAssociatedPhrasesFor(pair: Megrez.KeyValuePaired) -> Bool { public func hasAssociatedPhrasesFor(pair: Megrez.Compositor.Candidate) -> Bool {
lmAssociates.hasValuesFor(pair: pair) lmAssociates.hasValuesFor(pair: pair)
} }

4
Source/Modules/LangModelRelated/SubLMs/lmAssociates.swift
View File

@ -78,7 +78,7 @@ extension vChewing {
// This function will be implemented only if further hard-necessity comes. // This function will be implemented only if further hard-necessity comes.
} }
public func valuesFor(pair: Megrez.KeyValuePaired) -> [String] { public func valuesFor(pair: Megrez.Compositor.Candidate) -> [String] {
var pairs: [String] = [] var pairs: [String] = []
if let arrRangeRecords: [(Range<String.Index>, Int)] = rangeMap[pair.toNGramKey] { if let arrRangeRecords: [(Range<String.Index>, Int)] = rangeMap[pair.toNGramKey] {
for (netaRange, index) in arrRangeRecords { for (netaRange, index) in arrRangeRecords {
@ -98,7 +98,7 @@ extension vChewing {
return pairs.filter { set.insert($0).inserted } return pairs.filter { set.insert($0).inserted }
} }
public func hasValuesFor(pair: Megrez.KeyValuePaired) -> Bool { public func hasValuesFor(pair: Megrez.Compositor.Candidate) -> Bool {
if rangeMap[pair.toNGramKey] != nil { return true } if rangeMap[pair.toNGramKey] != nil { return true }
return rangeMap[pair.value] != nil return rangeMap[pair.value] != nil
} }

4
Source/Modules/LangModelRelated/SubLMs/lmUserOverride.swift
View File

@ -319,8 +319,8 @@ extension vChewing.LMUserOverride {
// 前置單元只記錄讀音，在其後的單元則同時記錄讀音與字詞 // 前置單元只記錄讀音，在其後的單元則同時記錄讀音與字詞
let strCurrent = kvCurrent.key let strCurrent = kvCurrent.key
var kvPrevious = Megrez.KeyValuePaired() var kvPrevious = Megrez.Compositor.Candidate()
var kvAnterior = Megrez.KeyValuePaired() var kvAnterior = Megrez.Compositor.Candidate()
var readingStack = "" var readingStack = ""
var trigramKey: String { "(\(kvAnterior.toNGramKey),\(kvPrevious.toNGramKey),\(strCurrent))" } var trigramKey: String { "(\(kvAnterior.toNGramKey),\(kvPrevious.toNGramKey),\(strCurrent))" }
var result: String { var result: String {