Refactor some handlings and unit tests.

vChewing · Mar 18, 2024 · 9273d51 · 9273d51
1 parent 0f04e78
commit 9273d51
Show file tree

Hide file tree

Showing 19 changed files with 7,529 additions and 7,498 deletions.
diff --git a/Sources/Tekkon/Tekkon_SyllableComposer.swift b/Sources/Tekkon/Tekkon_SyllableComposer.swift
@@ -204,10 +204,8 @@ public extension Tekkon {
         receiveKey(fromPhonabet: translate(key: input))
         return
       }
-      if mapArayuruPinyinIntonation.keys.contains(input) {
-        if let theTone = mapArayuruPinyinIntonation[input] {
-          intonation = Phonabet(theTone)
-        }
+      if let theTone = mapArayuruPinyinIntonation[input] {
+        intonation = Phonabet(theTone)
       } else {
         // 為了防止 romajiBuffer 越敲越長帶來算力負擔，這裡讓它在要溢出時自動丟掉最早輸入的音頭。
         let maxCount: Int = (parser == .ofWadeGilesPinyin) ? 7 : 6
@@ -262,15 +260,11 @@ public extension Tekkon {
         default: break
         }
         if [.vowel, .intonation].contains(thePhone.type), "ㄓㄔㄕㄗㄘㄙ".doesHave(consonant.value) {
-          switch semivowel.value {
-          case "ㄧ": semivowel.clear()
-          case "ㄩ":
-            switch consonant {
-            case _ where "ㄓㄗ".doesHave(consonant.value): consonant = "ㄐ"
-            case _ where "ㄔㄘ".doesHave(consonant.value): consonant = "ㄑ"
-            case _ where "ㄕㄙ".doesHave(consonant.value): consonant = "ㄒ"
-            default: break
-            }
+          switch (semivowel, consonant) {
+          case ("ㄧ", _): semivowel.clear()
+          case ("ㄩ", "ㄓ"), ("ㄩ", "ㄗ"): consonant = "ㄐ"
+          case ("ㄩ", "ㄔ"), ("ㄩ", "ㄘ"): consonant = "ㄑ"
+          case ("ㄩ", "ㄕ"), ("ㄩ", "ㄙ"): consonant = "ㄒ"
           default: break
           }
         }
@@ -430,35 +424,11 @@ public extension Tekkon {
       // 處理特殊情形。
       switch incomingPhonabet.type {
       case .semivowel:
-        switch consonant {
-        case "ㄍ":
-          switch incomingPhonabet {
-          // 這裡不處理「ㄍㄧ」到「ㄑㄧ」的轉換，因為只有倚天26需要處理這個。
-          case "ㄨ": consonant = "ㄍ" // ㄍㄨ
-          case "ㄩ": consonant = "ㄑ" // ㄑㄩ
-          default: break
-          }
-        case "ㄓ":
-          switch incomingPhonabet {
-          case "ㄧ": consonant = "ㄐ" // ㄐㄧ
-          case "ㄨ": consonant = "ㄓ" // ㄓㄨ
-          case "ㄩ": consonant = "ㄐ" // ㄐㄩ
-          default: break
-          }
-        case "ㄔ":
-          switch incomingPhonabet {
-          case "ㄧ": consonant = "ㄑ" // ㄐㄧ
-          case "ㄨ": consonant = "ㄔ" // ㄓㄨ
-          case "ㄩ": consonant = "ㄑ" // ㄐㄩ
-          default: break
-          }
-        case "ㄕ":
-          switch incomingPhonabet {
-          case "ㄧ": consonant = "ㄒ" // ㄒㄧ
-          case "ㄨ": consonant = "ㄕ" // ㄕㄨ
-          case "ㄩ": consonant = "ㄒ" // ㄒㄩ
-          default: break
-          }
+        // 這裡不處理「ㄍㄧ」到「ㄑㄧ」的轉換，因為只有倚天26需要處理這個。
+        switch (consonant, incomingPhonabet) {
+        case ("ㄓ", "ㄧ"), ("ㄓ", "ㄩ"): consonant = "ㄐ"
+        case ("ㄍ", "ㄩ"), ("ㄔ", "ㄧ"), ("ㄔ", "ㄩ"): consonant = "ㄑ"
+        case ("ㄕ", "ㄧ"), ("ㄕ", "ㄩ"): consonant = "ㄒ"
         default: break
         }
         if incomingPhonabet == "ㄨ" {
@@ -671,10 +641,10 @@ public extension Tekkon {
         } else if semivowel != "ㄩ", vowel == "ㄡ" {
           vowel.clear()
           strReturn = "ㄩ"
-        } else if !semivowel.isEmpty {
+        } else if !semivowel.isEmpty || !"ㄐㄑㄒ".doesHave(consonant.value) {
           strReturn = "ㄡ"
         } else {
-          strReturn = "ㄐㄑㄒ".doesHave(consonant.value) ? "ㄩ" : "ㄡ"
+          strReturn = "ㄩ"
         }
       case "u":
         if semivowel == "ㄧ", vowel != "ㄚ" {

diff --git a/Tests/TekkonTests/BasicTests.swift b/Tests/TekkonTests/BasicTests.swift
@@ -169,6 +169,8 @@ final class TekkonTestsBasic: XCTestCase {
     // Testing tool functions
     XCTAssertEqual(Tekkon.restoreToneOneInPhona(target: "ㄉㄧㄠ"), "ㄉㄧㄠ1")
     XCTAssertEqual(Tekkon.cnvPhonaToTextbookStyle(target: "ㄓㄜ˙"), "˙ㄓㄜ")
+    XCTAssertEqual(Tekkon.cnvPhonaToHanyuPinyin(targetJoined: "ㄍㄢˋ"), "gan4")
+    XCTAssertEqual(Tekkon.cnvHanyuPinyinToTextbookStyle(targetJoined: "起(qi3)居(ju1)"), "起(qǐ)居(jū)")
     XCTAssertEqual(Tekkon.cnvHanyuPinyinToPhona(targetJoined: "bian4-le5-tian1"), "ㄅㄧㄢˋ-ㄌㄜ˙-ㄊㄧㄢ")
     // 測試這種情形：「如果傳入的字串不包含任何半形英數內容的話，那麼應該直接將傳入的字串原樣返回」。
     XCTAssertEqual(Tekkon.cnvHanyuPinyinToPhona(targetJoined: "ㄅㄧㄢˋ-˙ㄌㄜ-ㄊㄧㄢ"), "ㄅㄧㄢˋ-˙ㄌㄜ-ㄊㄧㄢ")