Author: koutou
Date: Sat Mar 21 20:19:44 2009
New Revision: 5903
Modified:
trunk/test/test-ustr.scm
Log:
* test/test-ustr.scm: setup definitions are evaluated in a
single S expression.
Modified: trunk/test/test-ustr.scm
==============================================================================
--- trunk/test/test-ustr.scm (original)
+++ trunk/test/test-ustr.scm Sat Mar 21 20:19:44 2009
@@ -41,29 +41,31 @@
'((hiragana "")
(katakana "")
(hankaku ""))))
- (uim-eval '(define ustr-f (ustr-new '(("h" . "H") ("e" . "E") ("l" . "L")
- ("l" . "L") ("o" . "O")))))
- (uim-eval '(define ustr-fl (ustr-new '(("h" . "H") ("e" . "E")
("l" . "L"))
- '(("l" . "L") ("o" . "O")))))
- (uim-eval '(define ustr-l (ustr-new ()
- '(("h" . "H") ("e" . "E") ("l" . "L")
- ("l" . "L") ("o" . "O")))))
- (uim-eval '(define ustra-f (ustr-new '("h" "e" "l" "l" "o"))))
- (uim-eval '(define ustra-fl (ustr-new '("h" "e" "l")
- '("l" "o"))))
- (uim-eval '(define ustra-l (ustr-new ()
- '("h" "e" "l" "l" "o"))))
- (uim-eval '(define ustrj-f (ustr-new '(("に" "ニ" "ニ") ("ほ" "ホ" "ホ")
- ("ん" "ン" "ン") ("ご" "ゴ" "ゴ")
- ("じゃ" "ジャ" "ジャ")))))
- (uim-eval '(define ustrj-fl (ustr-new '(("に" "ニ" "ニ") ("ほ" "ホ" "ホ")
- ("ん" "ン" "ン"))
- '(("ご" "ゴ" "ゴ") ("じゃ" "ジ
ャ" "ジャ")))))
- (uim-eval '(define ustrj-l (ustr-new ()
- '(("に" "ニ" "ニ") ("ほ" "ホ" "ホ")
- ("ん" "ン" "ン") ("ご" "ゴ" "ゴ")
- ("じゃ" "ジャ" "ジャ")))))
- (uim-eval '(define ustre (ustr-new ()))))
+ (uim-eval
+ '(begin
+ (define ustr-f (ustr-new '(("h" . "H") ("e" . "E") ("l" . "L")
+ ("l" . "L") ("o" . "O"))))
+ (define ustr-fl (ustr-new '(("h" . "H") ("e" . "E") ("l" . "L"))
+ '(("l" . "L") ("o" . "O"))))
+ (define ustr-l (ustr-new ()
+ '(("h" . "H") ("e" . "E") ("l" . "L")
+ ("l" . "L") ("o" . "O"))))
+ (define ustra-f (ustr-new '("h" "e" "l" "l" "o")))
+ (define ustra-fl (ustr-new '("h" "e" "l")
+ '("l" "o")))
+ (define ustra-l (ustr-new ()
+ '("h" "e" "l" "l" "o")))
+ (define ustrj-f (ustr-new '(("に" "ニ" "ニ") ("ほ" "ホ" "ホ")
+ ("ん" "ン" "ン") ("ご" "ゴ" "ゴ")
+ ("じゃ" "ジャ" "ジャ"))))
+ (define ustrj-fl (ustr-new '(("に" "ニ" "ニ") ("ほ" "ホ" "ホ")
+ ("ん" "ン" "ン"))
+ '(("ご" "ゴ" "ゴ") ("じゃ" "ジ
ャ" "ジャ"))))
+ (define ustrj-l (ustr-new ()
+ '(("に" "ニ" "ニ") ("ほ" "ホ" "ホ")
+ ("ん" "ン" "ン") ("ご" "ゴ" "ゴ")
+ ("じゃ" "ジャ" "ジャ"))))
+ (define ustre (ustr-new ())))))
(define (teardown)
(uim-test-teardown))
