Author: yamakenz
Date: Wed Jul 11 06:21:37 2007
New Revision: 4709
Modified:
trunk/doc/COMPATIBILITY
trunk/scm/anthy-utf8.scm
trunk/scm/anthy.scm
trunk/scm/byeoru.scm
trunk/scm/canna.scm
trunk/scm/generic.scm
trunk/scm/ichar.scm
trunk/scm/key.scm
trunk/scm/latin.scm
trunk/scm/look.scm
trunk/scm/mana.scm
trunk/scm/prime.scm
trunk/scm/skk.scm
trunk/scm/spellcheck.scm
trunk/scm/tutcode.scm
trunk/test/test-util.scm
Log:
* This commit replace deprecated integer-based char procedures with new names
The renamings are performed by following script
$ perl -i -pe 's/\bcontrol-char\?/ichar-control?/g' {scm,test}/*.scm
$ perl -i -pe 's/\balphabet-char\?/ichar-alphabetic?/g' {scm,test}/*.scm
$ perl -i -pe 's/\bnumeral-char\?/ichar-numeric?/g' {scm,test}/*.scm
$ perl -i -pe 's/\busual-char\?/ichar-graphic?/g' {scm,test}/*.scm
$ perl -i -pe 's/\bto-lower-char/ichar-downcase/g' {scm,test}/*.scm
* scm/ichar.scm
- (control-char?, alphabet-char?, numeral-char?, usual-char?,
to-lower-char): Removed
* scm/anthy-utf8.scm
* scm/anthy.scm
* scm/byeoru.scm
* scm/canna.scm
* scm/generic.scm
* scm/key.scm
* scm/latin.scm
* scm/look.scm
* scm/mana.scm
* scm/prime.scm
* scm/skk.scm
* scm/spellcheck.scm
* scm/tutcode.scm
- Follow the renamings
* test/test-util.scm
- Remove tests for the removed procedures
- Update the "passed revision" comment
* doc/COMPATIBILITY
- Update "Renaming of integer-based char procedures"
Modified: trunk/doc/COMPATIBILITY
==============================================================================
--- trunk/doc/COMPATIBILITY (original)
+++ trunk/doc/COMPATIBILITY Wed Jul 11 06:21:37 2007
@@ -61,7 +61,7 @@
Affects: uim developers, IM developers
Updates: Scheme API
Version: 1.5.0
-Revision: ac4708
+Revision: ac4708, ac4709
Date: 2007-07-11
Modifier: YamaKen
Related:
@@ -89,6 +89,11 @@
(new) ichar-consonant?
(new) ichar-downcase
(new) ichar-upcase
+ (removed) control-char?
+ (removed) alphabet-char?
+ (removed) numeral-char?
+ (removed) usual-char?
+ (removed) to-lower-char
Description:
The integer-based char-* procedures have been renamed to ichar-* to
distinguish from and coexist with R5RS ones
Modified: trunk/scm/anthy-utf8.scm
==============================================================================
--- trunk/scm/anthy-utf8.scm (original)
+++ trunk/scm/anthy-utf8.scm Wed Jul 11 06:21:37 2007
@@ -701,7 +701,7 @@
(charcode->string key))
(if (symbol? key)
(symbol->string key)
- (charcode->string (to-lower-char key)))))
+ (charcode->string (ichar-downcase key)))))
(res (rk-push-key! rkc key-str)))
(if res
(begin
@@ -909,7 +909,7 @@
#t)
((and
anthy-select-prediction-by-numeral-key?
- (numeral-char? key))
+ (ichar-numeric? key))
(anthy-utf8-move-prediction-in-page ac key))
((and
(anthy-utf8-context-prediction-index ac)
@@ -986,7 +986,7 @@
(anthy-utf8-reset-prediction-window ac)
(anthy-utf8-check-prediction ac))
((and
- (numeral-char? key)
+ (ichar-numeric? key)
anthy-select-prediction-by-numeral-key?
(not (anthy-utf8-prediction-select-non-existing-index? ac key)))
(anthy-utf8-context-set-predicting! ac #f)
@@ -1183,7 +1183,7 @@
(else
;; handle "n1" sequence as " 1"
(if (and (not (anthy-utf8-context-alnum ac))
- (not (alphabet-char? key))
+ (not (ichar-alphabetic? key))
(not (string-find
(rk-expect rkc)
(if (= rule anthy-input-rule-kana)
@@ -1192,7 +1192,7 @@
(charcode->string key))
(if (symbol? key)
(symbol->string key)
- (charcode->string (to-lower-char key)))))))
+ (charcode->string (ichar-downcase key)))))))
(let ((pend (rk-pending rkc))
(residual-kana (rk-push-key-last! rkc)))
(if residual-kana
@@ -1226,7 +1226,7 @@
(charcode->string key))
(if (symbol? key)
(symbol->string key)
- (charcode->string (to-lower-char key)))))
+ (charcode->string (ichar-downcase key)))))
(pend (rk-pending rkc))
(res (rk-push-key! rkc key-str)))
(if (and res
@@ -1706,7 +1706,7 @@
(anthy-utf8-cancel-conv ac))
((and anthy-select-candidate-by-numeral-key?
- (numeral-char? key)
+ (ichar-numeric? key)
(anthy-utf8-context-candidate-window ac))
(anthy-utf8-move-candidate-in-page ac key))
@@ -1727,7 +1727,7 @@
(define anthy-utf8-press-key-handler
(lambda (ac key key-state)
- (if (control-char? key)
+ (if (ichar-control? key)
(im-commit-raw ac)
(if (anthy-utf8-context-on ac)
(if (anthy-utf8-context-transposing ac)
@@ -1744,7 +1744,7 @@
(define anthy-utf8-release-key-handler
(lambda (ac key key-state)
- (if (or (control-char? key)
+ (if (or (ichar-control? key)
(not (anthy-utf8-context-on ac)))
;; don't discard key release event for apps
(anthy-utf8-commit-raw ac))))
Modified: trunk/scm/anthy.scm
==============================================================================
--- trunk/scm/anthy.scm (original)
+++ trunk/scm/anthy.scm Wed Jul 11 06:21:37 2007
@@ -696,7 +696,7 @@
(charcode->string key))
(if (symbol? key)
(symbol->string key)
- (charcode->string (to-lower-char key)))))
+ (charcode->string (ichar-downcase key)))))
(res (rk-push-key! rkc key-str)))
(if res
(begin
@@ -904,7 +904,7 @@
#t)
((and
anthy-select-prediction-by-numeral-key?
- (numeral-char? key))
+ (ichar-numeric? key))
(anthy-move-prediction-in-page ac key))
((and
(anthy-context-prediction-index ac)
@@ -981,7 +981,7 @@
(anthy-reset-prediction-window ac)
(anthy-check-prediction ac))
((and
- (numeral-char? key)
+ (ichar-numeric? key)
anthy-select-prediction-by-numeral-key?
(not (anthy-prediction-select-non-existing-index? ac key)))
(anthy-context-set-predicting! ac #f)
@@ -1178,7 +1178,7 @@
(else
;; handle "n1" sequence as " 1"
(if (and (not (anthy-context-alnum ac))
- (not (alphabet-char? key))
+ (not (ichar-alphabetic? key))
(not (string-find
(rk-expect rkc)
(if (= rule anthy-input-rule-kana)
@@ -1187,7 +1187,7 @@
(charcode->string key))
(if (symbol? key)
(symbol->string key)
- (charcode->string (to-lower-char key)))))))
+ (charcode->string (ichar-downcase key)))))))
(let ((pend (rk-pending rkc))
(residual-kana (rk-push-key-last! rkc)))
(if residual-kana
@@ -1221,7 +1221,7 @@
(charcode->string key))
(if (symbol? key)
(symbol->string key)
- (charcode->string (to-lower-char key)))))
+ (charcode->string (ichar-downcase key)))))
(pend (rk-pending rkc))
(res (rk-push-key! rkc key-str)))
(if (and res
@@ -1702,7 +1702,7 @@
(anthy-cancel-conv ac))
((and anthy-select-candidate-by-numeral-key?
- (numeral-char? key)
+ (ichar-numeric? key)
(anthy-context-candidate-window ac))
(anthy-move-candidate-in-page ac key))
@@ -1723,7 +1723,7 @@
(define anthy-press-key-handler
(lambda (ac key key-state)
- (if (control-char? key)
+ (if (ichar-control? key)
(im-commit-raw ac)
(if (anthy-context-on ac)
(if (anthy-context-transposing ac)
@@ -1740,7 +1740,7 @@
(define anthy-release-key-handler
(lambda (ac key key-state)
- (if (or (control-char? key)
+ (if (or (ichar-control? key)
(not (anthy-context-on ac)))
;; don't discard key release event for apps
(anthy-commit-raw ac))))
Modified: trunk/scm/byeoru.scm
==============================================================================
--- trunk/scm/byeoru.scm (original)
+++ trunk/scm/byeoru.scm Wed Jul 11 06:21:37 2007
@@ -1434,7 +1434,7 @@
(rkc (byeoru-context-rkc bc))
(last-pend (rk-pending rkc))
(last-seq (rk-context-seq rkc))
- (key-str (charcode->string (to-lower-char key)))
+ (key-str (charcode->string (ichar-downcase key)))
(res (rk-push-key! rkc key-str))
(pend (rk-pending rkc))
(cur-seq (rk-current-seq rkc))
Modified: trunk/scm/canna.scm
==============================================================================
--- trunk/scm/canna.scm (original)
+++ trunk/scm/canna.scm Wed Jul 11 06:21:37 2007
@@ -600,7 +600,7 @@
(let* ((key-str (charcode->string
(if (= rule canna-input-rule-kana)
key
- (to-lower-char key))))
+ (ichar-downcase key))))
(res (rk-push-key! rkc key-str)))
(if res
(begin
@@ -877,13 +877,13 @@
(else
;; handle "n1" sequence as " 1"
(if (and (not (canna-context-alnum cc))
- (not (alphabet-char? key))
+ (not (ichar-alphabetic? key))
(not (string-find
(rk-expect rkc)
(charcode->string
(if (= rule canna-input-rule-kana)
key
- (to-lower-char key))))))
+ (ichar-downcase key))))))
(let ((pend (rk-pending rkc))
(residual-kana (rk-push-key-last! rkc)))
(if residual-kana
@@ -910,7 +910,7 @@
(let* ((key-str (charcode->string
(if (= rule canna-input-rule-kana)
key
- (to-lower-char key))))
+ (ichar-downcase key))))
(pend (rk-pending rkc))
(res (rk-push-key! rkc key-str)))
(if (and res
@@ -1307,7 +1307,7 @@
(canna-cancel-conv cc))
((and canna-select-candidate-by-numeral-key?
- (numeral-char? key)
+ (ichar-numeric? key)
(canna-context-candidate-window cc))
(canna-move-candidate-in-page cc key))
@@ -1324,7 +1324,7 @@
(canna-proc-input-state cc key key-state))))))
(define (canna-press-key-handler cc key key-state)
- (if (control-char? key)
+ (if (ichar-control? key)
(im-commit-raw cc)
(if (canna-context-on cc)
(if (canna-context-transposing cc)
@@ -1337,7 +1337,7 @@
;;;
(define (canna-release-key-handler cc key key-state)
- (if (or (control-char? key)
+ (if (or (ichar-control? key)
(not (canna-context-on cc)))
(canna-commit-raw cc)))
;;;
Modified: trunk/scm/generic.scm
==============================================================================
--- trunk/scm/generic.scm (original)
+++ trunk/scm/generic.scm Wed Jul 11 06:21:37 2007
@@ -387,7 +387,7 @@
#f)
#t)
(if (and generic-commit-candidate-by-numeral-key?
- (numeral-char? key))
+ (ichar-numeric? key))
(begin
(generic-commit-by-numkey pc key)
#f)
@@ -423,7 +423,7 @@
(define generic-key-press-handler
(lambda (pc key state)
- (if (control-char? key)
+ (if (ichar-control? key)
(im-commit-raw pc)
(if (generic-context-on pc)
(if (generic-context-converting pc)
@@ -435,7 +435,7 @@
(define generic-key-release-handler
(lambda (pc key state)
- (if (or (control-char? key)
+ (if (or (ichar-control? key)
(not (generic-context-on pc)))
;; don't discard key release event for apps
(generic-commit-raw pc))))
Modified: trunk/scm/ichar.scm
==============================================================================
--- trunk/scm/ichar.scm (original)
+++ trunk/scm/ichar.scm Wed Jul 11 06:21:37 2007
@@ -129,14 +129,8 @@
c)))
;;
-;; backward compatibility: should be obsoleted
+;; backward compatibility
;;
-
-(define control-char? ichar-control?)
-(define alphabet-char? ichar-alphabetic?)
-(define numeral-char? ichar-numeric?)
-(define usual-char? ichar-graphic?)
-(define to-lower-char ichar-downcase)
(define charcode->string
(lambda (c)
Modified: trunk/scm/key.scm
==============================================================================
--- trunk/scm/key.scm (original)
+++ trunk/scm/key.scm Wed Jul 11 06:21:37 2007
@@ -132,8 +132,8 @@
(let* ((head (car char-list))
(head-char (string->charcode head))
(rest (cdr char-list)))
- (if (or (alphabet-char? head-char)
- (numeral-char? head-char)
+ (if (or (ichar-alphabetic? head-char)
+ (ichar-numeric? head-char)
(string=? head "_"))
(parse-tag-prefix-symbol (string-append parsed head) rest)
(cons prefix char-list)))
@@ -201,7 +201,7 @@
(cond
((eq? prefix 'IgnoreCase)
(lambda (key key-state)
- (let ((translated-key (to-lower-char key)))
+ (let ((translated-key (ichar-downcase key)))
(list translated-key key-state))))
((eq? prefix 'IgnoreShift)
(lambda (key key-state)
@@ -210,7 +210,7 @@
(list key translated-key-state))))
((eq? prefix 'IgnoreRegularShift)
(lambda (key key-state)
- (let ((translated-key-state (if (usual-char? key)
+ (let ((translated-key-state (if (ichar-graphic? key)
(bit-and key-state
(bit-not 1))
key-state)))
Modified: trunk/scm/latin.scm
==============================================================================
--- trunk/scm/latin.scm (original)
+++ trunk/scm/latin.scm Wed Jul 11 06:21:37 2007
@@ -1701,7 +1701,7 @@
(define latin-press-key-handler
(lambda (lc key state)
- (if (control-char? key)
+ (if (ichar-control? key)
(im-commit-raw lc)
(if (latin-context-composing? lc)
(latin-proc-composing-state lc key state)
@@ -1710,7 +1710,7 @@
(define latin-release-key-handler
(lambda (lc key state)
- (if (or (control-char? key)
+ (if (or (ichar-control? key)
(not (latin-context-composing? lc)))
;; don't discard key release event for apps
(latin-commit-raw lc))))
Modified: trunk/scm/look.scm
==============================================================================
--- trunk/scm/look.scm (original)
+++ trunk/scm/look.scm Wed Jul 11 06:21:37 2007
@@ -138,7 +138,7 @@
(apply string-append
(map (lambda (c)
(if (ichar-upper-case? (string->charcode c))
- (charcode->string (to-lower-char (string->charcode c)))
+ (charcode->string (ichar-downcase (string->charcode c)))
c))
(reverse (string-to-list str)))))
Modified: trunk/scm/mana.scm
==============================================================================
--- trunk/scm/mana.scm (original)
+++ trunk/scm/mana.scm Wed Jul 11 06:21:37 2007
@@ -871,7 +871,7 @@
(let* ((key-str (charcode->string
(if (= rule mana-input-rule-kana)
key
- (to-lower-char key))))
+ (ichar-downcase key))))
(res (rk-push-key! rkc key-str)))
(if res
(begin
@@ -1166,13 +1166,13 @@
(else
;; handle "n1" sequence as " 1"
(if (and (not (mana-context-alnum mc))
- (not (alphabet-char? key))
+ (not (ichar-alphabetic? key))
(not (string-find
(rk-expect rkc)
(charcode->string
(if (= rule mana-input-rule-kana)
key
- (to-lower-char key))))))
+ (ichar-downcase key))))))
(let ((pend (rk-pending rkc))
(residual-kana (rk-push-key-last! rkc)))
(if residual-kana
@@ -1199,7 +1199,7 @@
(let* ((key-str (charcode->string
(if (= rule mana-input-rule-kana)
key
- (to-lower-char key))))
+ (ichar-downcase key))))
(pend (rk-pending rkc))
(res (rk-push-key! rkc key-str)))
(if (and res
@@ -1546,7 +1546,7 @@
(mana-cancel-conv mc))
((and mana-select-candidate-by-numeral-key?
- (numeral-char? key)
+ (ichar-numeric? key)
(mana-context-candidate-window mc))
(mana-move-candidate-in-page mc key))
@@ -1567,7 +1567,7 @@
(define mana-press-key-handler
(lambda (mc key key-state)
- (if (control-char? key)
+ (if (ichar-control? key)
(im-commit-raw mc)
(if (mana-context-on mc)
(if (mana-context-transposing mc)
@@ -1582,7 +1582,7 @@
(define mana-release-key-handler
(lambda (mc key key-state)
- (if (or (control-char? key)
+ (if (or (ichar-control? key)
(not (mana-context-on mc)))
;; don't discard key release event for apps
(mana-commit-raw mc))))
Modified: trunk/scm/prime.scm
==============================================================================
--- trunk/scm/prime.scm (original)
+++ trunk/scm/prime.scm Wed Jul 11 06:21:37 2007
@@ -52,7 +52,7 @@
(lambda ()
(set! prime-cand-select-key?
(lambda (key key-state)
- (and (numeral-char? key)
+ (and (ichar-numeric? key)
(control-key-mask key-state))))))
;; keys without custom
@@ -74,7 +74,7 @@
(define prime-cand-select-key?
(lambda (key key-state)
- (numeral-char? key)))
+ (ichar-numeric? key)))
(define prime-symbol-key?
(lambda (key key-state)
@@ -102,7 +102,7 @@
(define prime-capital-key?
(lambda (key key-state)
(and (shift-key-mask key-state)
- (alphabet-char? key))))
+ (ichar-alphabetic? key))))
(define prime-ja-direct-key?
(lambda (key key-state)
@@ -2061,7 +2061,7 @@
(define prime-press-key-handler
(lambda (context key key-state)
- (if (control-char? key)
+ (if (ichar-control? key)
(im-commit-raw context)
(let ((keymap (prime-keymap-get-keymap context key key-state)))
(prime-proc-call-command keymap context key key-state)
@@ -2071,7 +2071,7 @@
(define prime-release-key-handler
(lambda (context key key-state)
;(print "prime-release-key-handler")
- (if (or (control-char? key)
+ (if (or (ichar-control? key)
(= (prime-context-mode context)
prime-mode-latin))
(im-commit-raw context)
Modified: trunk/scm/skk.scm
==============================================================================
--- trunk/scm/skk.scm (original)
+++ trunk/scm/skk.scm Wed Jul 11 06:21:37 2007
@@ -984,7 +984,7 @@
(define skk-proc-state-direct
(lambda (c key key-state)
(let* ((sc (skk-find-descendant-context c))
- (key-str (charcode->string (to-lower-char key)))
+ (key-str (charcode->string (ichar-downcase key)))
(rkc (skk-context-rk-context sc))
(res #f)
(kana (skk-context-kana-mode sc)))
@@ -1109,19 +1109,19 @@
(skk-append-string sc (rk-push-key!
rkc
(charcode->string
- (to-lower-char key))))
+ (ichar-downcase key))))
#f)
(let* ((residual-kana (rk-push-key-last! rkc)))
;; handle preceding "n"
(if residual-kana
(skk-commit sc (skk-get-string sc residual-kana kana)))
(skk-context-set-state! sc 'skk-state-kanji)
- (set! key (to-lower-char key))
+ (set! key (ichar-downcase key))
#t))
#t)
;; Hack to handle "n1" sequence as " 1".
;; This should be handled in rk.scm. -- ekato
- (if (and (not (alphabet-char? key))
+ (if (and (not (ichar-alphabetic? key))
(not (string-find (rk-expect rkc) key-str)))
(let* ((residual-kana (rk-push-key-last! rkc)))
(if residual-kana
@@ -1160,7 +1160,7 @@
(define skk-sokuon-shiin-char?
(lambda (c)
- (and (alphabet-char? c)
+ (and (ichar-alphabetic? c)
(and
(not (= c 97)) ;; a
(not (= c 105)) ;; i
@@ -1391,7 +1391,7 @@
(else
;; append latin string
(begin
- (if (usual-char? key)
+ (if (ichar-graphic? key)
(let* ((s (charcode->string key))
(p (cons s (cons s (cons s s)))))
(skk-append-string sc p))))))
@@ -1420,7 +1420,7 @@
#t)
(if (and (ichar-upper-case? key)
(not (null? (skk-context-head sc))))
- (let ((key-str (charcode->string (to-lower-char key))))
+ (let ((key-str (charcode->string (ichar-downcase key))))
(set! res (skk-rk-push-key-match-without-new-seq rkc key-str))
(if (and
(skk-rk-pending? sc)
@@ -1438,7 +1438,7 @@
#f)
(begin
(skk-context-set-state! sc 'skk-state-okuri)
- (set! key (to-lower-char key))
+ (set! key (ichar-downcase key))
(skk-context-set-okuri-head! sc key-str)
(if (skk-sokuon-shiin-char? key)
(begin
@@ -1475,10 +1475,10 @@
#t)
;; Hack to handle "n1" sequence as " 1".
;; This should be handled in rk.scm. -- ekato
- (if (and (not (alphabet-char? key))
+ (if (and (not (ichar-alphabetic? key))
(not (string-find
(rk-expect rkc)
- (charcode->string (to-lower-char key)))))
+ (charcode->string (ichar-downcase key)))))
(let* ((residual-kana (rk-push-key-last! rkc)))
(if residual-kana
(skk-context-set-head! sc
@@ -1488,7 +1488,7 @@
#t)
#t)
(begin
- (set! key (to-lower-char key))
+ (set! key (ichar-downcase key))
(set! stat (skk-context-state sc))
(set! res
(rk-push-key!
@@ -1974,7 +1974,7 @@
(set! res
(rk-push-key!
rkc
- (charcode->string (to-lower-char key))))
+ (charcode->string (ichar-downcase key))))
(if (and res
(or
(list? (car res))
@@ -2057,7 +2057,7 @@
(define skk-press-key-handler
(lambda (sc key state)
- (if (control-char? key)
+ (if (ichar-control? key)
(im-commit-raw sc)
(skk-push-key sc key state))))
Modified: trunk/scm/spellcheck.scm
==============================================================================
--- trunk/scm/spellcheck.scm (original)
+++ trunk/scm/spellcheck.scm Wed Jul 11 06:21:37 2007
@@ -267,7 +267,7 @@
(define spell-proc-input-no-preedit
(lambda (sc key key-state)
- (let* ((key-str (charcode->string (to-lower-char key)))
+ (let* ((key-str (charcode->string (ichar-downcase key)))
(rkc (spell-context-rk-context sc))
(res #f)
(direct (ja-direct (charcode->string key)))
@@ -298,7 +298,7 @@
#t)
(if (and
(shift-key-mask key-state)
- (alphabet-char? key))
+ (ichar-alphabetic? key))
(begin
(spell-context-set-immediate-commit! sc #f)
#t)
@@ -389,7 +389,7 @@
(cons c (spell-context-left-string sc)))))
#f)
#t)
- (if (numeral-char? key)
+ (if (ichar-numeric? key)
(begin
(spell-context-set-nth! sc (- key 49))
(im-commit sc (spell-get-nth-candidate sc (- key 49)))
@@ -408,7 +408,7 @@
(set! res
(rk-push-key!
rkc
- (charcode->string (to-lower-char key))))
+ (charcode->string (ichar-downcase key))))
(if res
(begin
(spell-context-set-left-string!
Modified: trunk/scm/tutcode.scm
==============================================================================
--- trunk/scm/tutcode.scm (original)
+++ trunk/scm/tutcode.scm Wed Jul 11 06:21:37 2007
@@ -722,7 +722,7 @@
;;; @param key
;;; @param key-state
(define (tutcode-key-press-handler pc key key-state)
- (if (control-char? key)
+ (if (ichar-control? key)
(im-commit-raw pc)
(begin
(case (tutcode-context-state pc)
@@ -743,7 +743,7 @@
;;; @param key
;;; @param key-state
(define (tutcode-key-release-handler pc key key-state)
- (if (or (control-char? key)
+ (if (or (ichar-control? key)
(not (tutcode-context-on? pc)))
;; don't discard key release event for apps
(im-commit-raw pc)))
Modified: trunk/test/test-util.scm
==============================================================================
--- trunk/test/test-util.scm (original)
+++ trunk/test/test-util.scm Wed Jul 11 06:21:37 2007
@@ -29,7 +29,7 @@
;;; SUCH DAMAGE.
;;;;
-;; These tests are passed at revision 4708 (new repository)
+;; These tests are passed at revision 4709 (new repository)
(use test.unit)
@@ -204,14 +204,7 @@
(assert-true (uim-bool '(ichar-graphic? 123))) ; {
(assert-true (uim-bool '(ichar-graphic? 126))) ; ~
(assert-false (uim-bool '(ichar-graphic? 127)))) ; DEL
- ("test control-char?"
- (assert-true (uim-bool '(eq? control-char? ichar-control?))))
- ("test alphabet-char?"
- (assert-true (uim-bool '(eq? alphabet-char? ichar-alphabetic?))))
- ("test numeral-char?"
- (assert-true (uim-bool '(eq? numeral-char? ichar-numeric?))))
- ("test usual-char?"
- (assert-true (uim-bool '(eq? usual-char? ichar-graphic?)))))
+ )
(define-uim-test-case "test util character conversion procedures"
("test numeral-char->number"
@@ -308,9 +301,7 @@
(assert-false (uim-bool '(string->letter "{"))) ; {
(assert-false (uim-bool '(string->letter "~"))) ; ~
;;(assert-false (uim-bool '(string->letter ""))) ; DEL
- )
- ("test to-lower-char"
- (assert-true (uim-bool '(eq? to-lower-char ichar-downcase)))))
+ ))
(define-uim-test-case "test util string list procedures"
("test string-list-concat"
