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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-02-28 06:53:56 -0800 (Mon, 28 Feb 2005)
New Revision: 733

Modified:
   branches/composer/scm/evmap.scm
   branches/composer/scm/ng-japanese-azik.scm
Log:
* scm/evmap.scm
  - (list-copy!): Support null list destination

* scm/ng-japanese-azik.scm
  - (ja-azik-hiragana-ruleset, ja-azik-katakana-ruleset,
    ja-azik-halfkana-ruleset): Fix invalid ruleset name


Modified: branches/composer/scm/evmap.scm
===================================================================
--- branches/composer/scm/evmap.scm	2005-02-28 14:50:10 UTC (rev 732)
+++ branches/composer/scm/evmap.scm	2005-02-28 14:53:56 UTC (rev 733)
@@ -465,11 +465,15 @@
 
 (define list-copy!
   (lambda (dst src)
-    (if (not (or (null? dst)
-		 (null? src)))
-	(begin
-	  (set-car! dst (car src))
-	  (list-copy! (cdr dst) (cdr src))))))
+    (let self ((rest-dst dst)
+	       (rest-src src))
+      (if (or (null? rest-dst)
+	      (null? rest-src))
+	  dst
+	  (begin
+	    (set-car! rest-dst (car rest-src))
+	    (self (cdr rest-dst)
+		  (cdr rest-src)))))))
 
 (define action-exp-directive-positional-var
   (lambda (pos)

Modified: branches/composer/scm/ng-japanese-azik.scm
===================================================================
--- branches/composer/scm/ng-japanese-azik.scm	2005-02-28 14:50:10 UTC (rev 732)
+++ branches/composer/scm/ng-japanese-azik.scm	2005-02-28 14:53:56 UTC (rev 733)
@@ -554,7 +554,7 @@
    ;;ja-romaji-hiragana-hepburn-irregular-double-consonant-guide-ruleset
    ;;ja-romaji-hiragana-hepburn-irregular-double-consonant-ruleset
    ;;ja-romaji-hiragana-skk-like-symbol-ruleset
-   ja-azik-hiragana-basic-ruleset
+   ja-azik-hiragana-core-ruleset
    ))
 
 (define ja-azik-katakana-ruleset
@@ -580,7 +580,7 @@
    ;;ja-romaji-katakana-hepburn-irregular-double-consonant-guide-ruleset
    ;;ja-romaji-katakana-hepburn-irregular-double-consonant-ruleset
    ;;ja-romaji-katakana-skk-like-symbol-ruleset
-   ja-azik-katakana-basic-ruleset
+   ja-azik-katakana-core-ruleset
    ))
 
 (define ja-azik-halfkana-ruleset
@@ -606,5 +606,5 @@
    ;;ja-romaji-halfkana-hepburn-irregular-double-consonant-guide-ruleset
    ;;ja-romaji-halfkana-hepburn-irregular-double-consonant-ruleset
    ;;ja-romaji-halfkana-skk-like-symbol-ruleset
-   ja-azik-halfkana-basic-ruleset
+   ja-azik-halfkana-core-ruleset
    ))