Revision: 7236
Author: deton.kih
Date: Fri Jul 22 17:10:06 2011
Log: * scm/tutcode.scm
- (tutcode-bushu-predict): Simplify.
http://code.google.com/p/uim/source/detail?r=7236
Modified:
/trunk/scm/tutcode.scm
=======================================
--- /trunk/scm/tutcode.scm Fri Jul 22 04:25:01 2011
+++ /trunk/scm/tutcode.scm Fri Jul 22 17:10:06 2011
@@ -4156,8 +4156,10 @@
(rules-dic (rk-lib-find-partial-seqs (list str) bushudic))
(rules (append rules-help rules-dic)) ; ½ÅÊ£²óÈò¤Ïbushu.help¦¤Ç²Äǽ
(words1 (map (lambda (elem) (cadaar elem)) rules))
+ ;; (((str Éô¼ó2))(¹çÀ®Ê¸»ú)) -> (Éô¼ó2 ¹çÀ®Ê¸»ú)
+ (word/cand1 (map (lambda (elem) (list (cadaar elem) (caadr elem)))
rules))
(more-cands
- (filter
+ (filter-map
(lambda (elem)
(let
;; (((Éô¼ó1 Éô¼ó2))(¹çÀ®Ê¸»ú))
@@ -4171,28 +4173,14 @@
;; ´û¤Ë¾å¤Ç½Ð¸½ºÑ¤Î¾ì¹ç¤Ï½ü³°¡£
;; Îã: ((("Ìç" "ºÍ"))("ÊÄ"))¤Ç"ºÍ"¤¬½Ð¸½ºÑ¤Î¾ì¹ç¡¢
;; ((("ºÍ" "Ìç"))("Ùß"))¤Î"ºÍ"¤Ï½ü³°¡£
- (not (member bushu1 words1)))
- (string=? str gosei)))) ; (((Éô¼ó1 Éô¼ó2))(str))
- ;; XXX:¤³¤Î¾ì¹ç¡¢str¤Èbushu1¤Çbushu2¤¬¹çÀ®¤Ç¤¤ë¤³¤È¤ò
- ;; ³Îǧ¤¹¤Ù¤¤À¤¬¡¢tutcode-bushu-convert¤ÏÃÙ¤¤¤Î¤Ç¾Êά¡£
- bushudic))
- (res (append rules more-cands))
- (word/cand
- (map
- (lambda (elem)
- (let
- ((bushu1 (caaar elem))
- (bushu2 (cadaar elem))
- (gosei (caadr elem)))
- (cond
- ((string=? str bushu1) ; (((str Éô¼ó2))(¹çÀ®Ê¸»ú))
- (list bushu2 gosei))
- ((string=? str bushu2) ; (((Éô¼ó1 str))(¹çÀ®Ê¸»ú))
- (list bushu1 gosei))
- ((string=? str gosei) ; (((Éô¼ó1 Éô¼ó2))(str))
- (list bushu1 bushu2)))))
- res)))
- word/cand))
+ (not (member bushu1 words1))
+ (list bushu1 gosei))
+ (and (string=? str gosei) ; (((Éô¼ó1 Éô¼ó2))(str))
+ ;; XXX:¤³¤Î¾ì¹ç¡¢str¤Èbushu1¤Çbushu2¤¬¹çÀ®¤Ç¤¤ë¤³¤È¤ò
+ ;;
³Îǧ¤¹¤Ù¤¤À¤¬¡¢tutcode-bushu-convert¤ÏÃÙ¤¤¤Î¤Ç¾Êά
+ (list bushu1 bushu2)))))
+ bushudic)))
+ (append word/cand1 more-cands)))
;;; tutcode-rule¤òµÕ°ú¤¤·¤Æ¡¢ÊÑ´¹¸å¤Îʸ»ú¤«¤é¡¢ÆþÎÏ¥¡¼Îó¤ò¼èÆÀ¤¹¤ë¡£
;;; Îã: (tutcode-reverse-find-seq "¤¢" tutcode-rule) => ("r" "k")
