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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-03-19 05:26:52 -0800 (Sat, 19 Mar 2005)
New Revision: 799

Modified:
   branches/composer/scm/evmap.scm
Log:
* scm/evmap.scm
  - (action-exp-seq-parse): Simplify with string-prefix?


Modified: branches/composer/scm/evmap.scm
===================================================================
--- branches/composer/scm/evmap.scm	2005-03-19 13:13:03 UTC (rev 798)
+++ branches/composer/scm/evmap.scm	2005-03-19 13:26:52 UTC (rev 799)
@@ -529,17 +529,14 @@
   (lambda (act-exps)
     (let ((action-symbol? (lambda (sym)
 			    (and (symbol? sym)
-				 (let* ((str (symbol->string sym))
-					(prefix (safe-car
-						 (string-split str "_"))))
-				   (and prefix
-					(string=? prefix "action")))
-				 sym))))
+				 (string-prefix? "action_"
+						 (symbol->string sym))
+				 sym)))
+	  (canonicalize (compose event-exp-collector-exp
+				 action-exp-collector-fold)))
       (map (lambda (exp)
 	     (or (action-symbol? exp)
-		 ((compose event-exp-collector-exp
-			   action-exp-collector-fold)
-		  exp)))
+		 (canonicalize exp)))
 	   act-exps))))
 
 ;; presumes normalized