Dictionary: Check whether Phase list is empty when loop through each

1552980358 · Jan 3, 2024 · 1ea0912 · 1ea0912
1 parent 114f5c5
commit 1ea0912
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 21 deletions.
diff --git a/src/main/kotlin/org/ks/chan/c2pinyin/StringDecode.kt b/src/main/kotlin/org/ks/chan/c2pinyin/StringDecode.kt
@@ -21,16 +21,13 @@ internal fun String.decodeToPinyinList(
     dictionary: Dictionary,
     indexArray: IntArray = IntArray(length) { INDEX_INVALID }
 ): List<String> {
-    // Find and set phases in dictionary
-    if (dictionary.hasPhase) {
-        // Loop through each phase
-        dictionary.forEachPhase { phase ->
-            // Check if any phase exists in string
-            validate(phase = phase.text, indexArray = indexArray) { startIndex ->
-                // Replace all index
-                phase.forEachIndexed { index, word ->
-                    indexArray[startIndex + index] = word.tableIndex
-                }
+    // Loop through each phase
+    dictionary.allPhases { phase ->
+        // Check if any phase exists in string
+        validate(phase = phase.text, indexArray = indexArray) { startIndex ->
+            // Replace all index
+            phase.forEachIndexed { index, word ->
+                indexArray[startIndex + index] = word.tableIndex
             }
         }
     }

diff --git a/src/main/kotlin/org/ks/chan/c2pinyin/dictionary/Dictionary.kt b/src/main/kotlin/org/ks/chan/c2pinyin/dictionary/Dictionary.kt
@@ -5,6 +5,7 @@ import org.ks.chan.c2pinyin.decode.INDEX_INVALID
 import org.ks.chan.c2pinyin.decode.INDEX_JUMP
 import org.ks.chan.c2pinyin.decode.PinyinTable
 import java.io.File
+import kotlin.jvm.functions.FunctionN
 
 /**
  * [Dictionary]
@@ -46,19 +47,16 @@ class Dictionary {
     private val wordList = ArrayList<Word>()
 
     /**
-     * [Dictionary.hasPhase]
-     * @return [Boolean]
+     * [Dictionary.allPhases]
+     * @param action [kotlin.jvm.functions.Function1]
      *
-     * Checks if [Dictionary.phaseList] is empty or not
+     * Loop through all [phaseList] and perform [action]
      **/
-    val hasPhase: Boolean
-        get() = phaseList.isNotEmpty()
-
-    /**
-     *
-     **/
-    fun forEachPhase(action: (Phase) -> Unit) =
-        phaseList.forEach(action)
+    fun allPhases(action: (Phase) -> Unit) {
+        if (phaseList.isNotEmpty()) {
+            phaseList.forEach(action)
+        }
+    }
 
     /**
      * [Dictionary.findWord]