[elpa] externals/pyim 70a2d9a754 51/58: Add pyim-pinyin-valid-shuangpin-p

[ELPA Syncer]

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

    Add pyim-pinyin-valid-shuangpin-p
---
 pyim-imobjs.el | 4 ++--
 pyim-pinyin.el | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pyim-imobjs.el b/pyim-imobjs.el
index af45c79759..f55c51564a 100644
--- a/pyim-imobjs.el
+++ b/pyim-imobjs.el
@@ -116,8 +116,8 @@
           (let* ((y (concat sp-sm (or sp-ym " ")))
                  (z (cadr (assoc y keymaps)))
                  (py (if z (list "" z sp-sm sp-ym) (list sm x sp-sm sp-ym))))
-            (unless (string-match-p pyim-pinyin-shuangpin-invalid-pinyin-regexp
-                                    (concat (nth 0 py) (nth 1 py)))
+            (when (pyim-pinyin-valid-shuangpin-p
+                   (concat (nth 0 py) (nth 1 py)))
               (push py one-word-pinyins))))
 
         (when (and one-word-pinyins (> (length one-word-pinyins) 0))
diff --git a/pyim-pinyin.el b/pyim-pinyin.el
index 4f07414245..c382d8c0c2 100644
--- a/pyim-pinyin.el
+++ b/pyim-pinyin.el
@@ -55,7 +55,7 @@
   '("a" "o" "e" "ai" "ei" "ui" "ao" "ou" "er" "an" "en"
     "ang" "eng"))
 
-(defconst pyim-pinyin-shuangpin-invalid-pinyin-regexp
+(defconst pyim-pinyin--shuangpin-invalid-pinyin-regexp
   (format "^\\(%s\\)$"
           (string-join
            '("[qtghkzcsdn]o"
@@ -178,6 +178,11 @@
         (push `(,a ,b ,@(nthcdr 2 info)) result)))
     (reverse result)))
 
+(defun pyim-pinyin-valid-shuangpin-p (shuangpin)
+  (not (string-match-p
+        pyim-pinyin--shuangpin-invalid-pinyin-regexp
+        shuangpin)))
+
 ;; * Footer
 (provide 'pyim-pinyin)