Revision: 7268
Author: deton.kih
Date: Sat Aug 13 15:06:28 2011
Log: * Change to be able to disable sort for slow PC.
* scm/tutcode-bushu.scm
- (tutcode-bushu-sort!): New.
- (tutcode-bushu-complete-compose-set,
tutcode-bushu-strong-compose-set,
tutcode-bushu-weak-compose-set,
tutcode-bushu-strong-diff-set,
tutcode-bushu-weak-diff-set,
tutcode-auto-help-bushu-decompose-tc23):
Replace sort! with tutcode-bushu-sort!.
http://code.google.com/p/uim/source/detail?r=7268
Modified:
/trunk/scm/tutcode-bushu.scm
=======================================
--- /trunk/scm/tutcode-bushu.scm Tue Aug 2 23:51:30 2011
+++ /trunk/scm/tutcode-bushu.scm Sat Aug 13 15:06:28 2011
@@ -49,6 +49,11 @@
"¥¿" "¥Á" "¥Æ" "¥È" "¥Ë" "¥Ì" "¥Í" "¥Î" "¥Ï" "¥Ò" "¥Û" "¥à" "¥á"
"¥è" "¥ê" "¥ë" "¥ì" "¥í" "¥ï" "¥ó"))
+;;;
sort¤òÆþ¤ì¤ë¤ÈÃÙ¤¹¤®¤ë´Ä¶¤Ç¤â¡¢ÂÐÏÃŪ¤ÊÉô¼ó¹çÀ®ÊÑ´¹¤Ï»È¤¤¤¿¤¤¾ì¹ç¸þ¤±¡£
+;;; ~/.uim¤Ë°Ê²¼¤òÄɲ乤ë¤Èsort¤ò¾Êά²Äǽ¡£
+;;; (set! tutcode-bushu-sort! (lambda (seq less?) seq))
+(define tutcode-bushu-sort! sort!)
+
;;; bushu.help¥Õ¥¡¥¤¥ë¤òÆɤó¤ÇÀ¸À®¤·¤¿tutcode-bushudic·Á¼°¤Î¥ê¥¹¥È
(define tutcode-bushu-help ())
@@ -387,7 +392,7 @@
(string<? char1 char2))))))
(define (tutcode-bushu-complete-compose-set char-list bushu-list)
- (sort!
+ (tutcode-bushu-sort!
(tutcode-bushu-subtract-set
(tutcode-bushu-char-list-for-bushu bushu-list) char-list)
(lambda (a b)
@@ -403,7 +408,8 @@
(if (null? lis)
r
(loop (cdr lis) (delete! (car lis) r))))))
- (sort! r2 (lambda (a b) (tutcode-bushu-less? a b bushu-list)))))
+ (tutcode-bushu-sort! r2
+ (lambda (a b) (tutcode-bushu-less? a b bushu-list)))))
(define (tutcode-bushu-include-all-chars-bushu? char char-list)
(let*
@@ -456,7 +462,7 @@
(define (tutcode-bushu-weak-compose-set char-list bushu-list
strong-compose-set)
(if (null? (cdr char-list)) ; char-list ¤¬°ìʸ»ú¤À¤±¤Î»þ¤Ï²¿¤â¤·¤Ê¤¤
()
- (sort!
+ (tutcode-bushu-sort!
(tutcode-bushu-subtract-set
(tutcode-bushu-all-compose-set char-list ())
strong-compose-set)
@@ -499,7 +505,7 @@
(if (pair? rest)
(delete! char
(tutcode-bushu-strong-diff-set rest d1-or-d2 complete?))
- (sort!
+ (tutcode-bushu-sort!
(delete! char
(if complete?
(tutcode-bushu-char-list-for-bushu d1-or-d2)
@@ -558,8 +564,8 @@
(tutcode-bushu-subtract-set
(tutcode-bushu-for-char char) bushu-list)))
diff-set)
- (append! (sort! true-diff-set less-or-many?)
- (sort! rest-diff-set less-or-many?)))))
+ (append! (tutcode-bushu-sort! true-diff-set less-or-many?)
+ (tutcode-bushu-sort! rest-diff-set less-or-many?)))))
(delete-duplicates! res)))
;;; bushu.help¥Õ¥¡¥¤¥ë¤òÆɤó¤Çtutcode-bushudic·Á¼°¤Î¥ê¥¹¥È¤òÀ¸À®¤¹¤ë
@@ -787,7 +793,7 @@
(lambda (set)
(let loop
((lis
- (sort! set
+ (tutcode-bushu-sort! set
(lambda (a b)
(tutcode-bushu-less? a b bushu-list)))))
(if (null? lis)
@@ -816,7 +822,7 @@
(lambda (set)
(let loop
((lis
- (sort! set
+ (tutcode-bushu-sort! set
(lambda (a b)
(tutcode-bushu-less? a b bushu-list)))))
(if (null? lis)
@@ -845,7 +851,7 @@
(bushu-list (append bushu1 bushu2))
(mkcl
(lambda (bushu)
- (sort!
+ (tutcode-bushu-sort!
(delete-duplicates!
(append!
(tutcode-bushu-subset bushu)
@@ -872,7 +878,7 @@
(let*
((bushu-list (tutcode-bushu-for-char kanji))
(superset
- (sort!
+ (tutcode-bushu-sort!
(tutcode-bushu-superset bushu-list)
(lambda (a b)
(tutcode-bushu-less? a b bushu-list)))))
