[elpa] externals/pyim ba693e4561 18/58: pyim-candidates-quanpin* -> pyim-candidates--quanpin*

[ELPA Syncer]

branch: externals/pyim
commit ba693e4561e82374f8e4f9d22871df3c56e2a174
Author: Feng Shu <tumashu@163.com>
Commit: Feng Shu <tumashu@163.com>

    pyim-candidates-quanpin* -> pyim-candidates--quanpin*
---
 pyim-candidates.el  | 32 ++++++++++++++++----------------
 tests/pyim-tests.el | 44 ++++++++++++++++++++++----------------------
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/pyim-candidates.el b/pyim-candidates.el
index 47e0cb3675..f3d9391195 100644
--- a/pyim-candidates.el
+++ b/pyim-candidates.el
@@ -134,7 +134,7 @@
   ;; 这段代码主要实现以下功能：假如用户输入 nihaomazheshi, 但词库里面找不到对
   ;; 应的词条，那么输入法自动用 nihaoma 和 zheshi 的第一个词条："你好吗" 和 "
   ;; 这是" 连接成一个新的字符串 "你好吗这是" 做为第一个候选词。
-  (let* ((candidates (pyim-candidates-quanpin imobjs scheme))
+  (let* ((candidates (pyim-candidates--quanpin imobjs scheme))
          (n (length (car candidates)))
          output)
     (push (car candidates) output)
@@ -143,21 +143,21 @@
                            (mapcar (lambda (imobj)
                                      (nthcdr n imobj))
                                    imobjs))))
-      (let ((candidates (pyim-candidates-quanpin imobjs scheme)))
-        (push (car (pyim-candidates-quanpin imobjs scheme t)) output)
+      (let ((candidates (pyim-candidates--quanpin imobjs scheme)))
+        (push (car (pyim-candidates--quanpin imobjs scheme t)) output)
         (setq n (length (car candidates)))))
     (append (pyim-subconcat (nreverse output) "")
             candidates)))
 
-(defun pyim-candidates-quanpin (imobjs scheme &optional fast-search)
+(defun pyim-candidates--quanpin (imobjs scheme &optional fast-search)
   "用于全拼输入法的 `pyim-candidates-create' 方法内部使用的函数。"
   (let* ((znabc-words (pyim-candidates-znabc-words imobjs scheme fast-search))
          (jianpin-words (pyim-candidates-jianpin-words imobjs scheme 
fast-search))
-         (quanpin-words (pyim-candidates-quanpin-words imobjs scheme 
fast-search))
+         (quanpin-words (pyim-candidates--quanpin-words imobjs scheme 
fast-search))
          (personal-words (pyim-candidates--sort (nth 0 quanpin-words)))
          (common-words (nth 1 quanpin-words))
          (chief-word (pyim-candidates-get-chief scheme personal-words))
-         (quanpin-chars (pyim-candidates-quanpin-first-chars imobjs scheme 
fast-search))
+         (quanpin-chars (pyim-candidates--quanpin-first-chars imobjs scheme 
fast-search))
          (matched-chars (nth 0 quanpin-chars))
          (possible-chars (nth 1 quanpin-chars))
          (words `( :chief-word ,chief-word
@@ -212,46 +212,46 @@
           (push (delete-dups (append w2 w1)) jianpin-words)))
       (pyim-zip (nreverse jianpin-words) fast-search))))
 
-(defun pyim-candidates-quanpin-words (imobjs scheme &optional fast-search)
+(defun pyim-candidates--quanpin-words (imobjs scheme &optional fast-search)
   "从 dcache 获取个人词条，词库词条。"
   (let (personal-words common-words)
     (dolist (imobj imobjs)
-      (let* ((w1 (pyim-candidates-quanpin-personal-words imobj scheme))
-             (w2 (pyim-candidates-quanpin-common-words imobj scheme)))
+      (let* ((w1 (pyim-candidates--quanpin-personal-words imobj scheme))
+             (w2 (pyim-candidates--quanpin-common-words imobj scheme)))
         (push w1 personal-words)
         (push w2 common-words)))
     (setq personal-words (pyim-zip (nreverse personal-words) fast-search))
     (setq common-words (pyim-zip (nreverse common-words) fast-search))
     (list personal-words common-words)))
 
-(defun pyim-candidates-quanpin-personal-words (imobj scheme)
+(defun pyim-candidates--quanpin-personal-words (imobj scheme)
   (pyim-dcache-get
    (string-join (pyim-codes-create imobj scheme) "-")
    (if pyim-enable-shortcode
        '(icode2word ishortcode2word)
      '(icode2word))))
 
-(defun pyim-candidates-quanpin-common-words (imobj scheme)
+(defun pyim-candidates--quanpin-common-words (imobj scheme)
   (pyim-dcache-get
    (string-join (pyim-codes-create imobj scheme) "-")
    (if pyim-enable-shortcode
        '(code2word shortcode2word)
      '(code2word))))
 
-(defun pyim-candidates-quanpin-first-chars (imobjs scheme &optional 
fast-search)
+(defun pyim-candidates--quanpin-first-chars (imobjs scheme &optional 
fast-search)
   "获取词条第一汉字列表。"
   (let (matched-chars possible-chars)
     (dolist (imobj imobjs)
-      (let* ((w1 (pyim-candidates-quanpin-first-matched-chars imobj scheme))
+      (let* ((w1 (pyim-candidates--quanpin-first-matched-chars imobj scheme))
              (w2 (unless w1
-                   (pyim-candidates-quanpin-first-possible-chars imobj 
scheme))))
+                   (pyim-candidates--quanpin-first-possible-chars imobj 
scheme))))
         (push w1 matched-chars)
         (push w2 possible-chars)))
     (setq matched-chars (pyim-zip (nreverse matched-chars) fast-search))
     (setq possible-chars (pyim-zip (nreverse possible-chars) fast-search))
     (list matched-chars possible-chars)))
 
-(defun pyim-candidates-quanpin-first-matched-chars (imobj scheme)
+(defun pyim-candidates--quanpin-first-matched-chars (imobj scheme)
   "获取输入的全拼对应的第一个汉字。
 
 假如用户输入 nihao 时，获取 ni 对应的汉字。"
@@ -260,7 +260,7 @@
      `(,@(pyim-dcache-get code '(icode2word code2word))
        ,@(pyim-pymap-py2cchar-get code t t)))))
 
-(defun pyim-candidates-quanpin-first-possible-chars (imobj scheme)
+(defun pyim-candidates--quanpin-first-possible-chars (imobj scheme)
   "获取输入的全拼对应的第一个可能的常用汉字。
 
 假如用户输入 ni 时，获取拼音匹配 ni.* 的常用汉字，比如：ni niao
diff --git a/tests/pyim-tests.el b/tests/pyim-tests.el
index 500ee9a018..1d184ba7da 100644
--- a/tests/pyim-tests.el
+++ b/tests/pyim-tests.el
@@ -606,7 +606,7 @@
     (should (equal (pyim-tests-sublists lists 4)
                    '((1 2 3) (1 2 3 4))))))
 
-(ert-deftest pyim-tests-pyim-candidates-quanpin-words/first-chars ()
+(ert-deftest pyim-tests-pyim-candidates--quanpin-words/first-chars ()
   (let* ((pyim-dhashcache-code2word (make-hash-table :test #'equal))
          (pyim-dhashcache-icode2word (make-hash-table :test #'equal))
          (pyim-dhashcache-shortcode2word (make-hash-table :test #'equal))
@@ -622,33 +622,33 @@
     (puthash "ni-hao" (list "你好" "尼耗") pyim-dhashcache-code2word)
     (puthash "n-h" (list "你好" "你坏" "尼耗" "南好" "内核" "内河") 
pyim-dhashcache-ishortcode2word)
 
-    (should (equal (pyim-tests-sublists (pyim-candidates-quanpin-words imobjs1 
quanpin nil) 10)
+    (should (equal (pyim-tests-sublists (pyim-candidates--quanpin-words 
imobjs1 quanpin nil) 10)
                    '(("你" "您" "妮") nil)))
 
-    (should (equal (pyim-tests-sublists (pyim-candidates-quanpin-first-chars 
imobjs1 quanpin nil) 10)
+    (should (equal (pyim-tests-sublists (pyim-candidates--quanpin-first-chars 
imobjs1 quanpin nil) 10)
                    '(nil ("南" "乃" "囊" "脑" "呢" "内" "嫩" "能" "你" "年"))))
 
-    (should (equal (pyim-tests-sublists (pyim-candidates-quanpin-words imobjs1 
quanpin nil) 10)
+    (should (equal (pyim-tests-sublists (pyim-candidates--quanpin-words 
imobjs1 quanpin nil) 10)
                    '(("你" "您" "妮") nil)))
 
-    (should (equal (pyim-tests-sublists (pyim-candidates-quanpin-first-chars 
imobjs1 quanpin nil) 10)
+    (should (equal (pyim-tests-sublists (pyim-candidates--quanpin-first-chars 
imobjs1 quanpin nil) 10)
                    '(nil ("南" "乃" "囊" "脑" "呢" "内" "嫩" "能" "你" "年"))))
 
-    (should (equal (pyim-tests-sublists (pyim-candidates-quanpin-words imobjs2 
quanpin nil) 10)
+    (should (equal (pyim-tests-sublists (pyim-candidates--quanpin-words 
imobjs2 quanpin nil) 10)
                    '(("你" "尼") ("尼" "你"))))
 
-    (should (equal (pyim-tests-sublists (pyim-candidates-quanpin-first-chars 
imobjs2 quanpin nil) 10)
+    (should (equal (pyim-tests-sublists (pyim-candidates--quanpin-first-chars 
imobjs2 quanpin nil) 10)
                    '(("你" "尼" "呢" "泥" "拟" "逆" "倪" "妮" "腻" "匿") nil)))
 
-    (should (equal (pyim-tests-sublists (pyim-candidates-quanpin-words imobjs3 
quanpin nil) 10)
+    (should (equal (pyim-tests-sublists (pyim-candidates--quanpin-words 
imobjs3 quanpin nil) 10)
                    '(("你好" "尼耗" "呢耗") ("你好" "尼耗"))))
 
-    (should (equal (pyim-tests-sublists (pyim-candidates-quanpin-first-chars 
imobjs3 quanpin nil) 10)
+    (should (equal (pyim-tests-sublists (pyim-candidates--quanpin-first-chars 
imobjs3 quanpin nil) 10)
                    '(("你好" "尼耗" "呢耗") nil)))
 
     ))
 
-(ert-deftest pyim-tests-pyim-candidates-quanpin-personal-words ()
+(ert-deftest pyim-tests-pyim-candidates--quanpin-personal-words ()
   (let* ((pyim-dhashcache-icode2word (make-hash-table :test #'equal))
          (pyim-dhashcache-ishortcode2word (make-hash-table :test #'equal))
          (quanpin (pyim-scheme-get 'quanpin))
@@ -659,14 +659,14 @@
     (puthash "ni" (list "你" "尼") pyim-dhashcache-icode2word)
     (puthash "n-h" (list "呢耗") pyim-dhashcache-icode2word)
     (puthash "n-h" (list "你好" "你坏" "尼耗") pyim-dhashcache-ishortcode2word)
-    (should (equal (pyim-candidates-quanpin-personal-words (car imobjs1) 
quanpin)
+    (should (equal (pyim-candidates--quanpin-personal-words (car imobjs1) 
quanpin)
                    '("你" "您" "妮")))
-    (should (equal (pyim-candidates-quanpin-personal-words (car imobjs2) 
quanpin)
+    (should (equal (pyim-candidates--quanpin-personal-words (car imobjs2) 
quanpin)
                    '("你" "尼")))
-    (should (equal (pyim-candidates-quanpin-personal-words (car imobjs3) 
quanpin)
+    (should (equal (pyim-candidates--quanpin-personal-words (car imobjs3) 
quanpin)
                    '("呢耗" "你好" "你坏" "尼耗")))))
 
-(ert-deftest pyim-tests-pyim-candidates-quanpin-common-words ()
+(ert-deftest pyim-tests-pyim-candidates--quanpin-common-words ()
   (let* ((pyim-dhashcache-code2word (make-hash-table :test #'equal))
          (pyim-dhashcache-shortcode2word (make-hash-table :test #'equal))
          (quanpin (pyim-scheme-get 'quanpin))
@@ -677,30 +677,30 @@
     (puthash "ni" (list "你" "尼") pyim-dhashcache-code2word)
     (puthash "n-h" (list "呢耗") pyim-dhashcache-code2word)
     (puthash "n-h" (list "你好" "你坏" "尼耗") pyim-dhashcache-shortcode2word)
-    (should (equal (pyim-candidates-quanpin-common-words (car imobjs1) quanpin)
+    (should (equal (pyim-candidates--quanpin-common-words (car imobjs1) 
quanpin)
                    '("你" "您" "妮")))
-    (should (equal (pyim-candidates-quanpin-common-words (car imobjs2) quanpin)
+    (should (equal (pyim-candidates--quanpin-common-words (car imobjs2) 
quanpin)
                    '("你" "尼")))
-    (should (equal (pyim-candidates-quanpin-common-words (car imobjs3) quanpin)
+    (should (equal (pyim-candidates--quanpin-common-words (car imobjs3) 
quanpin)
                    '("呢耗" "你好" "你坏" "尼耗")))))
 
-(ert-deftest pyim-tests-pyim-candidates-quanpin-first-matched-chars ()
+(ert-deftest pyim-tests-pyim-candidates--quanpin-first-matched-chars ()
   (let* ((pyim-dhashcache-icode2word (make-hash-table :test #'equal))
          (pyim-dhashcache-code2word (make-hash-table :test #'equal))
          (quanpin (pyim-scheme-get 'quanpin))
          (imobjs (pyim-imobjs-create "nihao" quanpin)))
     (puthash "ni" (list "你" "呢") pyim-dhashcache-icode2word)
     (puthash "ni" (list "你" "尼") pyim-dhashcache-code2word)
-    (should (equal (pyim-tests-sublist 
(pyim-candidates-quanpin-first-matched-chars (car imobjs) quanpin) 10)
+    (should (equal (pyim-tests-sublist 
(pyim-candidates--quanpin-first-matched-chars (car imobjs) quanpin) 10)
                    '("你" "呢" "尼" "泥" "拟" "逆" "倪" "妮" "腻" "匿")))))
 
-(ert-deftest pyim-tests-pyim-candidates-quanpin-first-possible-chars ()
+(ert-deftest pyim-tests-pyim-candidates--quanpin-first-possible-chars ()
   (let* ((quanpin (pyim-scheme-get 'quanpin))
          (imobjs1 (pyim-imobjs-create "ni" quanpin))
          (imobjs2 (pyim-imobjs-create "nihao" quanpin)))
-    (should (equal (pyim-tests-sublist 
(pyim-candidates-quanpin-first-possible-chars (car imobjs1) quanpin) 10)
+    (should (equal (pyim-tests-sublist 
(pyim-candidates--quanpin-first-possible-chars (car imobjs1) quanpin) 10)
                    '("你" "年" "娘" "鸟" "摄" "您" "宁" "牛" "尼" "念")))
-    (should (equal (pyim-tests-sublist 
(pyim-candidates-quanpin-first-possible-chars (car imobjs2) quanpin) 10)
+    (should (equal (pyim-tests-sublist 
(pyim-candidates--quanpin-first-possible-chars (car imobjs2) quanpin) 10)
                    '("你" "年" "娘" "鸟" "摄" "您" "宁" "牛" "尼" "念")))))
 
 (ert-deftest pyim-tests-pyim-candidates-search-buffer ()