[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/pyim 1b5c7a8ac7 07/58: pyim-cregexp-create-cregexp-from
From: |
ELPA Syncer |
Subject: |
[elpa] externals/pyim 1b5c7a8ac7 07/58: pyim-cregexp-create-cregexp-from-string -> pyim-cregexp--create-cregexp-from-string |
Date: |
Fri, 24 Jun 2022 06:57:52 -0400 (EDT) |
branch: externals/pyim
commit 1b5c7a8ac7d88e30fc908ed8d43c7e1e07496b45
Author: Feng Shu <tumashu@163.com>
Commit: Feng Shu <tumashu@163.com>
pyim-cregexp-create-cregexp-from-string ->
pyim-cregexp--create-cregexp-from-string
---
pyim-cregexp.el | 8 ++++----
tests/pyim-tests.el | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pyim-cregexp.el b/pyim-cregexp.el
index e23085f092..bf6f2eb01a 100644
--- a/pyim-cregexp.el
+++ b/pyim-cregexp.el
@@ -138,7 +138,7 @@ regexp, 所以搜索单字的时候一般可以搜到生僻字,但搜索句子
(pyim-cregexp--create-cregexp-from-rx
(lambda (x)
(if (stringp x)
- (xr (pyim-cregexp-create-cregexp-from-string
+ (xr (pyim-cregexp--create-cregexp-from-string
x scheme char-level-num chinese-only))
x))
(xr string))))
@@ -155,13 +155,13 @@ regexp, 所以搜索单字的时候一般可以搜到生僻字,但搜索句子
rx-form))
(_ (funcall fn rx-form))))
-(defun pyim-cregexp-create-cregexp-from-string
+(defun pyim-cregexp--create-cregexp-from-string
(string scheme &optional char-level-num chinese-only)
(let* ((char-level-num (pyim-cregexp--char-level-num char-level-num))
(string-list (pyim-cregexp-split-string string)))
;; 确保 pyim 词库加载
(pyim-dcache-init-variables)
- (pyim-cregexp-create-cregexp-from-string-list
+ (pyim-cregexp--create-cregexp-from-string-list
string-list scheme char-level-num chinese-only)))
(defun pyim-cregexp-split-string (string)
@@ -171,7 +171,7 @@ regexp, 所以搜索单字的时候一般可以搜到生僻字,但搜索句子
"\\([a-z]+'*\\)" (concat sep "\\1" sep) string)
sep))))
-(defun pyim-cregexp-create-cregexp-from-string-list
+(defun pyim-cregexp--create-cregexp-from-string-list
(string-list scheme &optional char-level-num chinese-only)
(mapconcat
(lambda (string)
diff --git a/tests/pyim-tests.el b/tests/pyim-tests.el
index 46322e6374..8b40a275c2 100644
--- a/tests/pyim-tests.el
+++ b/tests/pyim-tests.el
@@ -986,8 +986,8 @@
(let* ((str (nth 2 (split-string (car (pyim-pymap-py2cchar-get "wang" t))
"|")))
(quanpin (pyim-scheme-get 'quanpin))
- (regexp1 (pyim-cregexp-create-cregexp-from-string "wang" quanpin 3
nil))
- (regexp2 (pyim-cregexp-create-cregexp-from-string "wang" quanpin 2)))
+ (regexp1 (pyim-cregexp--create-cregexp-from-string "wang" quanpin 3
nil))
+ (regexp2 (pyim-cregexp--create-cregexp-from-string "wang" quanpin 2)))
(should (string-match-p regexp1 str))
(should-not (string-match-p regexp2 str)))
@@ -1009,7 +1009,7 @@
(should (equal (pyim-cregexp-build "adww")
"\\(?:adww\\|[其匧惹斯欺歁莢蒙][人古]?人?\\)"))
(should (equal (pyim-cregexp-build "aaaa'aaaa")
"\\(?:\\(?:aaaa'\\|aaaa\\|[工恭]恭?敬?敬?\\)\\(?:aaaa\\|[工恭]恭?敬?敬?\\)\\)"))
- (should (equal (pyim-cregexp-create-cregexp-from-string "aaaa'aaaa" wubi)
+ (should (equal (pyim-cregexp--create-cregexp-from-string "aaaa'aaaa" wubi)
"\\(?:aaaa'\\|aaaa\\|[工恭][恭]?[敬]?[敬]?\\)\\(?:aaaa\\|[工恭][恭]?[敬]?[敬]?\\)"))
(should (equal (pyim-cregexp-build-xingma-regexp-from-words '("工" "恭恭敬敬"))
"[工恭][恭]?[敬]?[敬]?"))
- [elpa] externals/pyim updated (b12d621924 -> c573694ae4), ELPA Syncer, 2022/06/24
- [elpa] externals/pyim b2b2cff501 02/58: pyim-cregexp-create-valid-cregexp-from-string -> pyim-cregexp--create-valid-cregexp-from-string, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim ca1c0dc355 01/58: pyim-cregexp-find-scheme -> pyim-cregexp--find-scheme, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim bf1ade4d31 08/58: pyim-cregexp-split-string -> pyim-cregexp--split-string, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim b9fffaab28 03/58: pyim-cregexp-char-level-num -> pyim-cregexp--char-level-num, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim c0b1ea1260 06/58: pyim-cregexp-create-cregexp-from-rx -> pyim-cregexp--create-cregexp-from-rx, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 1b5c7a8ac7 07/58: pyim-cregexp-create-cregexp-from-string -> pyim-cregexp--create-cregexp-from-string,
ELPA Syncer <=
- [elpa] externals/pyim 314279993d 14/58: pyim-cstring-split-to-string-1 -> pyim-cstring--split-to-string, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 20d9feea63 13/58: pyim-cstring-substrings* -> pyim-cstring--substrings*, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 11a62675d6 17/58: pyim-candidates-sort -> pyim-candidates--sort, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim ba693e4561 18/58: pyim-candidates-quanpin* -> pyim-candidates--quanpin*, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim b8c05f0b7f 25/58: pyim-dcache-value-length -> pyim-dcache--value-length, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim fdd41426a8 29/58: pyim-entered-buffer -> pyim-entered--buffer, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 148137b2ae 32/58: pyim-indicator-last-input-method-title -> pyim-indicator--last-input-method-title, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim e667d71c3e 33/58: pyim-indicator-daemon-function -> pyim-indicator--daemon-function, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 9cef8ad02e 36/58: pyim-indicator-select-color -> pyim-indicator--select-color, ELPA Syncer, 2022/06/24
- [elpa] externals/pyim 5a8be7f327 37/58: Sort pyim-indicator.el, ELPA Syncer, 2022/06/24