DecodeIndex: Fix invalid value of PADDING_MAX

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

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/src/main/kotlin/org/ks/chan/c2pinyin/decode/DecodeIndex.kt b/src/main/kotlin/org/ks/chan/c2pinyin/decode/DecodeIndex.kt
@@ -44,19 +44,19 @@ internal val Char.tableIndex: Int
  * [Int.pinyinIndex]
  * @access Private
  * @param encoding [Encoding]
- * @param charOffset [Int]
+ * @param offset [Int]
  * @param indexRaw [Int]
  * @return [Int]
  *
  * Convert [Char.code] into index of pinyin table
  **/
 private fun Int.pinyinIndex(
     encoding: Encoding = this.encoding,
-    charOffset: Int = this - encoding.offset,
-    indexRaw: Int = encoding.calculateIndex(charOffset)
+    offset: Int = this - encoding.offset,
+    indexRaw: Int = encoding.calculateIndex(offset)
 ): Int {
     return when {
-        encoding.checkPaddingCorrection(charOffset) -> {
+        encoding.checkPaddingCorrection(offset) -> {
             indexRaw or PADDING_MASK
         }
         else -> indexRaw
@@ -77,7 +77,7 @@ private const val INDEX_MAX = 0xFF
  *
  * Maximum padding of pinyin table
  **/
-private const val PADDING_MAX = 0xF
+private const val PADDING_MAX = 8
 
 /**
  * [Encoding.calculateIndex]

diff --git a/src/main/kotlin/org/ks/chan/c2pinyin/decode/Encoding.kt b/src/main/kotlin/org/ks/chan/c2pinyin/decode/Encoding.kt
@@ -8,7 +8,7 @@ import kotlin.io.encoding.ExperimentalEncodingApi
 
 private const val OFFSET_PADDING_START = 0
 private const val OFFSET_BASE = 19968
-private const val OFFSET_ENCODING_PART_DIFFERENCE = 7000
+internal const val OFFSET_ENCODING_PART_DIFFERENCE = 7000
 
 /**
  * [Encoding]