[uim-commit] r1872 - branches/composer/scm

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-10-22 19:03:16 -0700 (Sat, 22 Oct 2005)
New Revision: 1872

Modified:
   branches/composer/scm/composer.scm
   branches/composer/scm/trec.scm
Log:
* scm/trec.scm
  - (trec-make-vnode-recur-new): Trivial change

* scm/composer.scm
  - (composer-idname): Refine the comment


Modified: branches/composer/scm/composer.scm
===================================================================
--- branches/composer/scm/composer.scm	2005-10-23 01:57:39 UTC (rev 1871)
+++ branches/composer/scm/composer.scm	2005-10-23 02:03:16 UTC (rev 1872)
@@ -99,7 +99,7 @@
     ((composer-mtbl-finalize! (composer-methods self)) self)))
 
 ;; FIXME: describe naming rule
-;; Get a symbol for programs that uniquely identifies the composer
+;; Get a symbol for programs that uniquely identifies the class of composer
 ;; .parameter self Abstract composer object
 ;; .returns A symbol such as 'anthy
 (define composer-idname

Modified: branches/composer/scm/trec.scm
===================================================================
--- branches/composer/scm/trec.scm	2005-10-23 01:57:39 UTC (rev 1871)
+++ branches/composer/scm/trec.scm	2005-10-23 02:03:16 UTC (rev 1872)
@@ -479,12 +479,12 @@
 ;; TODO: simplify
 (define trec-make-vnode-recur-new
   (lambda (join retry)
-    (define make-vnode
+    (define vnode-new
       (lambda (pregiven-keys rule-key rule-val)
 	(lambda (router route matcher key)
 	  (and-let* ((matched (matcher rule-key key)))
 	    (if (not (trec-matcher-terminal-state matched))
-		(let ((next-node (make-vnode matched rule-val)))
+		(let ((next-node (vnode-new matched rule-val)))
 		  (cons (list key TREC-NULL-VALUE next-node)
 			route))
 		(let ((root (trec-route-last-root route))
@@ -501,7 +501,7 @@
 					(cons* root node route)
 					root)
 				    keys)))))))
-    make-vnode))
+    vnode-new))
 
 (define trec-vnode-join-new        (trec-make-vnode-recur-new #f #f))
 (define trec-vnode-join-retry-new  (trec-make-vnode-recur-new #f #t))