[uim-commit] r504 - in trunk: doc scm test
yamaken at freedesktop.org
yamaken at freedesktop.org
Thu Feb 3 08:24:46 PST 2005
Author: yamaken
Date: 2005-02-03 08:24:40 -0800 (Thu, 03 Feb 2005)
New Revision: 504
Modified:
trunk/doc/UIM-SCM
trunk/scm/custom.scm
trunk/test/test-im.scm
trunk/test/test-lazy-load.scm
Log:
* scm/custom.scm
- (custom-set-value!): Fix excessive update-hook invocation
* test/test-lazy-load.scm
- (test stub-im-generate-stub-im-list, test
stub-im-generate-all-stub-im-list): Follow recent specification
change
* test/test-im.scm
- (test custom-im-list-as-choice-rec): Follow recent message
modification
* doc/UIM-SCM
- Trivial fix
Modified: trunk/doc/UIM-SCM
===================================================================
--- trunk/doc/UIM-SCM 2005-02-03 14:05:07 UTC (rev 503)
+++ trunk/doc/UIM-SCM 2005-02-03 16:24:40 UTC (rev 504)
@@ -28,8 +28,8 @@
1. static storage protection
You can allocate arbitrary static storage as for uim_lisp by
- uim_scm_gc_protect(). The function must be invoked before the
- using the variables.
+ uim_scm_gc_protect(). The function must be invoked before using
+ the variables.
static uim_lisp foo;
Modified: trunk/scm/custom.scm
===================================================================
--- trunk/scm/custom.scm 2005-02-03 14:05:07 UTC (rev 503)
+++ trunk/scm/custom.scm 2005-02-03 16:24:40 UTC (rev 504)
@@ -561,11 +561,12 @@
(list 'make-key-predicate (list 'quote key-val)))
toplevel-env)))
(custom-call-hook-procs sym custom-set-hooks)
+ (custom-call-hook-procs sym custom-update-hooks)
(let ((post-activities (map-activities)))
(for-each (lambda (another-sym pre post)
- (if (or (eq? another-sym sym)
- (not (eq? (not pre) ;; normalize bool
- (not post)))) ;; normalize bool
+ (if (and (not (eq? another-sym sym))
+ (not (eq? (not pre) ;; normalize bool
+ (not post)))) ;; normalize bool
(custom-call-hook-procs another-sym
custom-update-hooks)))
(map car custom-activity-hooks)
Modified: trunk/test/test-im.scm
===================================================================
--- trunk/test/test-im.scm 2005-02-03 14:05:07 UTC (rev 503)
+++ trunk/test/test-im.scm 2005-02-03 16:24:40 UTC (rev 504)
@@ -858,7 +858,7 @@
("test custom-im-list-as-choice-rec"
(assert-equal '((canna "Canna" "Japanese Kana Kanji Conversion Engine, Canna")
- (skk "SKK" "Uim's SKK like input method")
+ (skk "SKK" "uim's SKK like input method")
(anthy "Anthy" "Japanese Kana Kanji Conversion Engine, Anthy"))
(uim '(custom-im-list-as-choice-rec
(map retrieve-im '(canna skk anthy)))))
Modified: trunk/test/test-lazy-load.scm
===================================================================
--- trunk/test/test-lazy-load.scm 2005-02-03 14:05:07 UTC (rev 503)
+++ trunk/test/test-lazy-load.scm 2005-02-03 16:24:40 UTC (rev 504)
@@ -133,65 +133,77 @@
(assert-equal (list
(string-append
"(if (memq 'hangul2 enabled-im-list)\n"
- " (register-stub-im\n"
- " 'hangul2\n"
- " \"ko\"\n"
- " \"UTF-8\"\n"
- " \"Hangul (2-bul)\"\n"
- " \"2-bul style hangul input method\"\n"
- " \"hangul\"))\n"))
+ " (if enable-lazy-loading?\n"
+ " (register-stub-im\n"
+ " 'hangul2\n"
+ " \"ko\"\n"
+ " \"UTF-8\"\n"
+ " \"Hangul (2-bul)\"\n"
+ " \"2-bul style hangul input method\"\n"
+ " \"hangul\")\n"
+ " (require-module \"hangul\")))\n"))
(uim '(stub-im-generate-stub-im-list '(hangul2))))
(assert-equal (list
(string-append
"(if (memq 'hangul3 enabled-im-list)\n"
- " (register-stub-im\n"
- " 'hangul3\n"
- " \"ko\"\n"
- " \"UTF-8\"\n"
- " \"Hangul (3-bul)\"\n"
- " \"3-bul style hangul input method\"\n"
- " \"hangul\"))\n"))
+ " (if enable-lazy-loading?\n"
+ " (register-stub-im\n"
+ " 'hangul3\n"
+ " \"ko\"\n"
+ " \"UTF-8\"\n"
+ " \"Hangul (3-bul)\"\n"
+ " \"3-bul style hangul input method\"\n"
+ " \"hangul\")\n"
+ " (require-module \"hangul\")))\n"))
(uim '(stub-im-generate-stub-im-list '(hangul3))))
(assert-equal (list
(string-append
"(if (memq 'tcode enabled-im-list)\n"
- " (register-stub-im\n"
- " 'tcode\n"
- " \"ja\"\n"
- " \"EUC-JP\"\n"
- " \"T-Code\"\n"
- " \"T-Code\"\n"
- " \"tcode\"))\n"))
+ " (if enable-lazy-loading?\n"
+ " (register-stub-im\n"
+ " 'tcode\n"
+ " \"ja\"\n"
+ " \"EUC-JP\"\n"
+ " \"T-Code\"\n"
+ " \"T-Code\"\n"
+ " \"tcode\")\n"
+ " (require-module \"tcode\")))\n"))
(uim '(stub-im-generate-stub-im-list '(tcode))))
(assert-equal (list
(string-append
"(if (memq 'hangul2 enabled-im-list)\n"
- " (register-stub-im\n"
- " 'hangul2\n"
- " \"ko\"\n"
- " \"UTF-8\"\n"
- " \"Hangul (2-bul)\"\n"
- " \"2-bul style hangul input method\"\n"
- " \"hangul\"))\n")
+ " (if enable-lazy-loading?\n"
+ " (register-stub-im\n"
+ " 'hangul2\n"
+ " \"ko\"\n"
+ " \"UTF-8\"\n"
+ " \"Hangul (2-bul)\"\n"
+ " \"2-bul style hangul input method\"\n"
+ " \"hangul\")\n"
+ " (require-module \"hangul\")))\n")
(string-append
"(if (memq 'tcode enabled-im-list)\n"
- " (register-stub-im\n"
- " 'tcode\n"
- " \"ja\"\n"
- " \"EUC-JP\"\n"
- " \"T-Code\"\n"
- " \"T-Code\"\n"
- " \"tcode\"))\n")
+ " (if enable-lazy-loading?\n"
+ " (register-stub-im\n"
+ " 'tcode\n"
+ " \"ja\"\n"
+ " \"EUC-JP\"\n"
+ " \"T-Code\"\n"
+ " \"T-Code\"\n"
+ " \"tcode\")\n"
+ " (require-module \"tcode\")))\n")
(string-append
"(if (memq 'hangul3 enabled-im-list)\n"
- " (register-stub-im\n"
- " 'hangul3\n"
- " \"ko\"\n"
- " \"UTF-8\"\n"
- " \"Hangul (3-bul)\"\n"
- " \"3-bul style hangul input method\"\n"
- " \"hangul\"))\n"))
+ " (if enable-lazy-loading?\n"
+ " (register-stub-im\n"
+ " 'hangul3\n"
+ " \"ko\"\n"
+ " \"UTF-8\"\n"
+ " \"Hangul (3-bul)\"\n"
+ " \"3-bul style hangul input method\"\n"
+ " \"hangul\")\n"
+ " (require-module \"hangul\")))\n"))
(uim '(stub-im-generate-stub-im-list '(hangul2 tcode hangul3)))))
("test stub-im-generate-all-stub-im-list"
@@ -200,40 +212,48 @@
(assert-equal (list
(string-append
"(if (memq 'tcode enabled-im-list)\n"
- " (register-stub-im\n"
- " 'tcode\n"
- " \"ja\"\n"
- " \"EUC-JP\"\n"
- " \"T-Code\"\n"
- " \"T-Code\"\n"
- " \"tcode\"))\n")
+ " (if enable-lazy-loading?\n"
+ " (register-stub-im\n"
+ " 'tcode\n"
+ " \"ja\"\n"
+ " \"EUC-JP\"\n"
+ " \"T-Code\"\n"
+ " \"T-Code\"\n"
+ " \"tcode\")\n"
+ " (require-module \"tcode\")))\n")
(string-append
"(if (memq 'hangul2 enabled-im-list)\n"
- " (register-stub-im\n"
- " 'hangul2\n"
- " \"ko\"\n"
- " \"UTF-8\"\n"
- " \"Hangul (2-bul)\"\n"
- " \"2-bul style hangul input method\"\n"
- " \"hangul\"))\n")
+ " (if enable-lazy-loading?\n"
+ " (register-stub-im\n"
+ " 'hangul2\n"
+ " \"ko\"\n"
+ " \"UTF-8\"\n"
+ " \"Hangul (2-bul)\"\n"
+ " \"2-bul style hangul input method\"\n"
+ " \"hangul\")\n"
+ " (require-module \"hangul\")))\n")
(string-append
"(if (memq 'hangul3 enabled-im-list)\n"
- " (register-stub-im\n"
- " 'hangul3\n"
- " \"ko\"\n"
- " \"UTF-8\"\n"
- " \"Hangul (3-bul)\"\n"
- " \"3-bul style hangul input method\"\n"
- " \"hangul\"))\n")
+ " (if enable-lazy-loading?\n"
+ " (register-stub-im\n"
+ " 'hangul3\n"
+ " \"ko\"\n"
+ " \"UTF-8\"\n"
+ " \"Hangul (3-bul)\"\n"
+ " \"3-bul style hangul input method\"\n"
+ " \"hangul\")\n"
+ " (require-module \"hangul\")))\n")
(string-append
"(if (memq 'romaja enabled-im-list)\n"
- " (register-stub-im\n"
- " 'romaja\n"
- " \"ko\"\n"
- " \"UTF-8\"\n"
- " \"Hangul (Romaja)\"\n"
- " \"Romaja input style hangul input method\"\n"
- " \"hangul\"))\n"))
+ " (if enable-lazy-loading?\n"
+ " (register-stub-im\n"
+ " 'romaja\n"
+ " \"ko\"\n"
+ " \"UTF-8\"\n"
+ " \"Hangul (Romaja)\"\n"
+ " \"Romaja input style hangul input method\"\n"
+ " \"hangul\")\n"
+ " (require-module \"hangul\")))\n"))
(uim '(stub-im-generate-all-stub-im-list)))
(uim '(set! im-list ()))
More information about the Uim-commit
mailing list