Author: yamakenz
Date: Wed Jul 11 06:37:12 2007
New Revision: 4710
Modified:
trunk/doc/COMPATIBILITY
trunk/scm/anthy-utf8.scm
trunk/scm/anthy.scm
trunk/scm/canna.scm
trunk/scm/custom.scm
trunk/scm/generic.scm
trunk/scm/ichar.scm
trunk/scm/mana.scm
trunk/scm/prime.scm
trunk/test/test-util.scm
Log:
* This commit rename integer-based char procedures
The renamings are performed by following script
$ perl -i -pe 's/\bstring->char\b/string->ichar/g' {scm,test}/*.scm
$ perl -i -pe 's/\bstring->printable-char\b/string->printable-ichar/g'
{scm,test}/*.scm
$ perl -i -pe 's/\bstring->letter\b/string->alphabetic-ichar/g'
{scm,test}/*.scm
$ perl -i -pe 's/\bnumeral-char->number\b/numeric-ichar->integer/g'
{scm,test}/*.scm
* scm/ichar.scm
- (string->char, string->printable-char, string->letter,
numeral-char->number): Renamed to below
- (string->ichar, string->printable-ichar, string->alphabetic-ichar,
numeric-ichar->integer): Renamed from above
* scm/anthy-utf8.scm
* scm/anthy.scm
* scm/canna.scm
* scm/custom.scm
* scm/generic.scm
* scm/mana.scm
* scm/prime.scm
- Follow the renamings
* test/test-util.scm
- Ditto
- 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:37:12 2007
@@ -89,6 +89,14 @@
(new) ichar-consonant?
(new) ichar-downcase
(new) ichar-upcase
+ (renamed) string->char
+ (new) string->ichar
+ (renamed) string->printable-char
+ (new) string->printable-ichar
+ (renamed) string->letter
+ (new) string->alphabetic-ichar
+ (renamed) numeral-char->number
+ (new) numeric-ichar->integer
(removed) control-char?
(removed) alphabet-char?
(removed) numeral-char?
Modified: trunk/scm/anthy-utf8.scm
==============================================================================
--- trunk/scm/anthy-utf8.scm (original)
+++ trunk/scm/anthy-utf8.scm Wed Jul 11 06:37:12 2007
@@ -852,7 +852,7 @@
(cur-page (if (= anthy-nr-candidate-max 0)
0
(quotient n anthy-nr-candidate-max)))
- (pageidx (- (numeral-char->number numeralc) 1))
+ (pageidx (- (numeric-ichar->integer numeralc) 1))
(compensated-pageidx (cond
((< pageidx 0) ; pressing key_0
(+ pageidx 10))
@@ -887,7 +887,7 @@
(cur-page (if (= anthy-nr-candidate-max 0)
0
(quotient p-idx anthy-nr-candidate-max)))
- (pageidx (- (numeral-char->number numeralc) 1))
+ (pageidx (- (numeric-ichar->integer numeralc) 1))
(compensated-pageidx (cond
((< pageidx 0) ; pressing key_0
(+ pageidx 10))
@@ -1026,7 +1026,7 @@
(= (anthy-utf8-context-input-rule ac) anthy-input-rule-roma)
(not (null? (ustr-former-seq preconv-str)))
(not (ichar-printable? ;; check for kana
- (string->char
+ (string->ichar
(car (last (ustr-former-seq preconv-str)))))))
(ja-fix-deleted-raw-str-to-valid-roma! raw-str)))))
@@ -1557,7 +1557,7 @@
(cur-page (if (= anthy-nr-candidate-max 0)
0
(quotient n anthy-nr-candidate-max)))
- (pageidx (- (numeral-char->number numeralc) 1))
+ (pageidx (- (numeric-ichar->integer numeralc) 1))
(compensated-pageidx (cond
((< pageidx 0) ; pressing key_0
(+ pageidx 10))
Modified: trunk/scm/anthy.scm
==============================================================================
--- trunk/scm/anthy.scm (original)
+++ trunk/scm/anthy.scm Wed Jul 11 06:37:12 2007
@@ -847,7 +847,7 @@
(cur-page (if (= anthy-nr-candidate-max 0)
0
(quotient n anthy-nr-candidate-max)))
- (pageidx (- (numeral-char->number numeralc) 1))
+ (pageidx (- (numeric-ichar->integer numeralc) 1))
(compensated-pageidx (cond
((< pageidx 0) ; pressing key_0
(+ pageidx 10))
@@ -882,7 +882,7 @@
(cur-page (if (= anthy-nr-candidate-max 0)
0
(quotient p-idx anthy-nr-candidate-max)))
- (pageidx (- (numeral-char->number numeralc) 1))
+ (pageidx (- (numeric-ichar->integer numeralc) 1))
(compensated-pageidx (cond
((< pageidx 0) ; pressing key_0
(+ pageidx 10))
@@ -1021,7 +1021,7 @@
(= (anthy-context-input-rule ac) anthy-input-rule-roma)
(not (null? (ustr-former-seq preconv-str)))
(not (ichar-printable? ;; check for kana
- (string->char
+ (string->ichar
(car (last (ustr-former-seq preconv-str)))))))
(ja-fix-deleted-raw-str-to-valid-roma! raw-str)))))
@@ -1553,7 +1553,7 @@
(cur-page (if (= anthy-nr-candidate-max 0)
0
(quotient n anthy-nr-candidate-max)))
- (pageidx (- (numeral-char->number numeralc) 1))
+ (pageidx (- (numeric-ichar->integer numeralc) 1))
(compensated-pageidx (cond
((< pageidx 0) ; pressing key_0
(+ pageidx 10))
Modified: trunk/scm/canna.scm
==============================================================================
--- trunk/scm/canna.scm (original)
+++ trunk/scm/canna.scm Wed Jul 11 06:37:12 2007
@@ -737,7 +737,7 @@
(= (canna-context-input-rule cc) canna-input-rule-roma)
(not (null? (ustr-former-seq preconv-str)))
(not (ichar-printable?
- (string->char
+ (string->ichar
(car (last (ustr-former-seq preconv-str)))))))
(ja-fix-deleted-raw-str-to-valid-roma! raw-str)))))
@@ -1168,7 +1168,7 @@
(cur-page (if (= canna-nr-candidate-max 0)
0
(quotient n canna-nr-candidate-max)))
- (pageidx (- (numeral-char->number numeralc) 1))
+ (pageidx (- (numeric-ichar->integer numeralc) 1))
(compensated-pageidx (cond
((< pageidx 0) ; pressing key_0
(+ pageidx 10))
Modified: trunk/scm/custom.scm
==============================================================================
--- trunk/scm/custom.scm (original)
+++ trunk/scm/custom.scm Wed Jul 11 06:37:12 2007
@@ -183,7 +183,7 @@
;; TODO: write test
(define map-key-list-letter
(lambda (letter-mapper key-list)
- (let ((letter (string->letter (find string? key-list))))
+ (let ((letter (string->alphabetic-ichar (find string? key-list))))
(map-key-list-body (lambda (elem)
(if letter
(charcode->string (letter-mapper letter))
@@ -231,8 +231,8 @@
(lambda (key-list)
(let* ((has-shift? (memq 'Shift_key key-list))
(str (find string? key-list))
- (printable (string->printable-char str))
- (letter (string->letter str)))
+ (printable (string->printable-ichar str))
+ (letter (string->alphabetic-ichar str)))
(filter-map (lambda (elem)
(cond
((and (eq? elem 'Shift_key)
@@ -253,7 +253,7 @@
;; TODO: write test
(define key-list-decode-shift
(lambda (key-list)
- (let* ((letter (string->letter (find string? key-list)))
+ (let* ((letter (string->alphabetic-ichar (find string? key-list)))
(upper-case? (and letter
(ichar-upper-case? letter)))
(has-shift? (memq 'Shift_key key-list))
@@ -266,7 +266,7 @@
;; TODO: write test
(define key-list-ignore-regular-shift
(lambda (key-list)
- (let ((printable (string->printable-char (find string? key-list))))
+ (let ((printable (string->printable-ichar (find string? key-list))))
(if (ichar-graphic? printable)
(cons 'IgnoreRegularShift key-list)
key-list))))
@@ -274,7 +274,7 @@
;; TODO: write test
(define key-list-ignore-letter-shift
(lambda (key-list)
- (let ((letter (string->letter (find string? key-list))))
+ (let ((letter (string->alphabetic-ichar (find string? key-list))))
(if letter
(cons 'IgnoreShift key-list)
key-list))))
@@ -283,7 +283,7 @@
(define key-list-ignore-punct-numeric-shift
(lambda (key-list)
(let* ((str (find string? key-list))
- (c (string->printable-char str)))
+ (c (string->printable-ichar str)))
(if (and (ichar-graphic? c)
(not (ichar-alphabetic? c)))
(cons 'IgnoreShift key-list)
@@ -292,7 +292,7 @@
;; TODO: write test
(define key-list-ignore-case
(lambda (key-list)
- (let ((letter (string->letter (find string? key-list))))
+ (let ((letter (string->alphabetic-ichar (find string? key-list))))
(if letter
(cons 'IgnoreCase key-list)
key-list))))
@@ -306,7 +306,7 @@
(define key-list-strip-regular-shift
(lambda (key-list)
(let* ((str (find string? key-list))
- (printable (string->printable-char str)))
+ (printable (string->printable-ichar str)))
(if (ichar-graphic? printable)
(key-list-strip-shift key-list)
key-list))))
Modified: trunk/scm/generic.scm
==============================================================================
--- trunk/scm/generic.scm (original)
+++ trunk/scm/generic.scm Wed Jul 11 06:37:12 2007
@@ -171,7 +171,7 @@
(cur-page (if (= generic-nr-candidate-max 0)
0
(quotient n generic-nr-candidate-max)))
- (pageidx (- (numeral-char->number key) 1))
+ (pageidx (- (numeric-ichar->integer key) 1))
(compensated-pageidx (cond
((< pageidx 0) ; pressing key_0
(+ pageidx 10))
Modified: trunk/scm/ichar.scm
==============================================================================
--- trunk/scm/ichar.scm (original)
+++ trunk/scm/ichar.scm Wed Jul 11 06:37:12 2007
@@ -32,22 +32,22 @@
;; TODO: write test
-(define string->char
+(define string->ichar
(lambda (str)
(and (= (string-length str)
1)
(string->charcode str))))
;; TODO: write test
-(define string->printable-char
+(define string->printable-ichar
(lambda (str)
- (let ((c (string->char str)))
+ (let ((c (string->ichar str)))
(and (ichar-printable? c)
c))))
-(define string->letter
+(define string->alphabetic-ichar
(lambda (str)
- (let ((c (string->printable-char str)))
+ (let ((c (string->printable-ichar str)))
(and (ichar-alphabetic? c)
c))))
@@ -110,7 +110,7 @@
(and (ichar-alphabetic? c)
(not (ichar-vowel? c)))))
-(define numeral-char->number
+(define numeric-ichar->integer
(lambda (c)
(if (ichar-numeric? c)
(- c 48)
Modified: trunk/scm/mana.scm
==============================================================================
--- trunk/scm/mana.scm (original)
+++ trunk/scm/mana.scm Wed Jul 11 06:37:12 2007
@@ -1014,7 +1014,7 @@
(= (mana-context-input-rule mc) mana-input-rule-roma)
(not (null? (ustr-former-seq preconv-str)))
(not (ichar-printable? ;; check for kana
- (string->char
+ (string->ichar
(car (last (ustr-former-seq preconv-str)))))))
(ja-fix-deleted-raw-str-to-valid-roma! raw-str)))))
@@ -1406,7 +1406,7 @@
(cur-page (if (= mana-nr-candidate-max 0)
0
(quotient n mana-nr-candidate-max)))
- (pageidx (- (numeral-char->number numeralc) 1))
+ (pageidx (- (numeric-ichar->integer numeralc) 1))
(compensated-pageidx (cond
((< pageidx 0) ; pressing key_0
(+ pageidx 10))
Modified: trunk/scm/prime.scm
==============================================================================
--- trunk/scm/prime.scm (original)
+++ trunk/scm/prime.scm Wed Jul 11 06:37:12 2007
@@ -1148,7 +1148,7 @@
(define prime-command-conv-select
(lambda (context key key-state)
- (let* ((nth0 (number->candidate-index (numeral-char->number key)))
+ (let* ((nth0 (number->candidate-index (numeric-ichar->integer key)))
(cand-range (prime-uim-candwin-get-range context))
(nth (min (+ (car cand-range) nth0) (cdr cand-range)))
(cand (prime-candidates-get-nth context nth)))
@@ -1160,7 +1160,7 @@
;; FIXME: <Hiroyuki Komatsu> (2005-03-30)
(define prime-command-segment-select
(lambda (context key key-state)
- (let* ((nth0 (number->candidate-index (numeral-char->number key)))
+ (let* ((nth0 (number->candidate-index (numeric-ichar->integer key)))
(cand-range (prime-uim-candwin-get-range context))
(nth (min (+ (car cand-range) nth0) (cdr cand-range)))
(cand (prime-candidates-get-nth context nth)))
@@ -1345,7 +1345,7 @@
(define prime-command-preedit-commit-candidate
(lambda (context key key-state)
(if prime-custom-number-selection?
- (let* ((nth (number->candidate-index (numeral-char->number key)))
+ (let* ((nth (number->candidate-index (numeric-ichar->integer key)))
(cand (prime-get-nth-candidate context nth)))
(if cand
(prime-commit-candidate context nth))
Modified: trunk/test/test-util.scm
==============================================================================
--- trunk/test/test-util.scm (original)
+++ trunk/test/test-util.scm Wed Jul 11 06:37:12 2007
@@ -29,7 +29,7 @@
;;; SUCH DAMAGE.
;;;;
-;; These tests are passed at revision 4709 (new repository)
+;; These tests are passed at revision 4710 (new repository)
(use test.unit)
@@ -207,34 +207,34 @@
)
(define-uim-test-case "test util character conversion procedures"
- ("test numeral-char->number"
- (assert-true (uim-bool '(integer? (numeral-char->number 0)))) ; NUL
- (assert-true (uim-bool '(integer? (numeral-char->number 1)))) ; SOH
- (assert-true (uim-bool '(integer? (numeral-char->number 31)))) ; US
- (assert-true (uim-bool '(integer? (numeral-char->number 32)))) ; SPACE
- (assert-true (uim-bool '(integer? (numeral-char->number 33)))) ; !
- (assert-true (uim-bool '(integer? (numeral-char->number 47)))) ; /
- (assert-equal 0 (uim '(numeral-char->number 48))) ; 0
- (assert-equal 1 (uim '(numeral-char->number 49))) ; 1
- (assert-equal 2 (uim '(numeral-char->number 50))) ; 2
- (assert-equal 3 (uim '(numeral-char->number 51))) ; 3
- (assert-equal 4 (uim '(numeral-char->number 52))) ; 4
- (assert-equal 5 (uim '(numeral-char->number 53))) ; 5
- (assert-equal 6 (uim '(numeral-char->number 54))) ; 6
- (assert-equal 7 (uim '(numeral-char->number 55))) ; 7
- (assert-equal 8 (uim '(numeral-char->number 56))) ; 8
- (assert-equal 9 (uim '(numeral-char->number 57))) ; 9
- (assert-true (uim-bool '(integer? (numeral-char->number 58)))) ; :
- (assert-true (uim-bool '(integer? (numeral-char->number 64)))) ; @
- (assert-true (uim-bool '(integer? (numeral-char->number 65)))) ; A
- (assert-true (uim-bool '(integer? (numeral-char->number 90)))) ; Z
- (assert-true (uim-bool '(integer? (numeral-char->number 91)))) ; [
- (assert-true (uim-bool '(integer? (numeral-char->number 96)))) ; `
- (assert-true (uim-bool '(integer? (numeral-char->number 97)))) ; a
- (assert-true (uim-bool '(integer? (numeral-char->number 122)))) ; z
- (assert-true (uim-bool '(integer? (numeral-char->number 123)))) ; {
- (assert-true (uim-bool '(integer? (numeral-char->number 126)))) ; ~
- (assert-true (uim-bool '(integer? (numeral-char->number 127))))) ; DEL
+ ("test numeric-ichar->integer"
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 0)))) ; NUL
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 1)))) ; SOH
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 31)))) ; US
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 32)))) ; SPACE
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 33)))) ; !
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 47)))) ; /
+ (assert-equal 0 (uim '(numeric-ichar->integer 48))) ; 0
+ (assert-equal 1 (uim '(numeric-ichar->integer 49))) ; 1
+ (assert-equal 2 (uim '(numeric-ichar->integer 50))) ; 2
+ (assert-equal 3 (uim '(numeric-ichar->integer 51))) ; 3
+ (assert-equal 4 (uim '(numeric-ichar->integer 52))) ; 4
+ (assert-equal 5 (uim '(numeric-ichar->integer 53))) ; 5
+ (assert-equal 6 (uim '(numeric-ichar->integer 54))) ; 6
+ (assert-equal 7 (uim '(numeric-ichar->integer 55))) ; 7
+ (assert-equal 8 (uim '(numeric-ichar->integer 56))) ; 8
+ (assert-equal 9 (uim '(numeric-ichar->integer 57))) ; 9
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 58)))) ; :
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 64)))) ; @
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 65)))) ; A
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 90)))) ; Z
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 91)))) ; [
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 96)))) ; `
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 97)))) ; a
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 122)))) ; z
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 123)))) ; {
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 126)))) ; ~
+ (assert-true (uim-bool '(integer? (numeric-ichar->integer 127))))) ; DEL
("test ichar-downcase"
(assert-equal 0 (uim '(ichar-downcase 0))) ; NUL
(assert-equal 1 (uim '(ichar-downcase 1))) ; SOH
@@ -275,32 +275,32 @@
(assert-equal 123 (uim '(ichar-upcase 123))) ; {
(assert-equal 126 (uim '(ichar-upcase 126))) ; ~
(assert-equal 127 (uim '(ichar-upcase 127)))) ; DEL
- ("test string->letter"
- (assert-false (uim-bool '(string->letter ""))) ; NUL
+ ("test string->alphabetic-ichar"
+ (assert-false (uim-bool '(string->alphabetic-ichar ""))) ; NUL
;; FIXME: Since these control chars are normalized to "\x01" and so on by
;; Gauche at first, uim-sh cannot interpret them without SRFI-75 support.
- ;;(assert-false (uim-bool '(string->letter ""))) ; SOH
- ;;(assert-false (uim-bool '(string->letter " "))) ; US
- (assert-false (uim-bool '(string->letter " "))) ; SPACE
- (assert-false (uim-bool '(string->letter "!"))) ; !
- (assert-false (uim-bool '(string->letter "/"))) ; /
- (assert-false (uim-bool '(string->letter "0"))) ; 0
- (assert-false (uim-bool '(string->letter "9"))) ; 9
- (assert-false (uim-bool '(string->letter ":"))) ; :
- (assert-false (uim-bool '(string->letter "@"))) ; @
- (assert-false (uim-bool '(string->letter "AA"))) ; AA
- (assert-equal 65 (uim '(string->letter "A"))) ; A
- (assert-equal 90 (uim '(string->letter "Z"))) ; Z
- (assert-false (uim-bool '(string->letter "ZZ"))) ; ZZ
- (assert-false (uim-bool '(string->letter "["))) ; [
- (assert-false (uim-bool '(string->letter "`"))) ; `
- (assert-false (uim-bool '(string->letter "aa"))) ; aa
- (assert-equal 97 (uim '(string->letter "a"))) ; a
- (assert-equal 122 (uim '(string->letter "z"))) ; z
- (assert-false (uim-bool '(string->letter "zz"))) ; zz
- (assert-false (uim-bool '(string->letter "{"))) ; {
- (assert-false (uim-bool '(string->letter "~"))) ; ~
- ;;(assert-false (uim-bool '(string->letter ""))) ; DEL
+ ;;(assert-false (uim-bool '(string->alphabetic-ichar ""))) ; SOH
+ ;;(assert-false (uim-bool '(string->alphabetic-ichar " "))) ; US
+ (assert-false (uim-bool '(string->alphabetic-ichar " "))) ; SPACE
+ (assert-false (uim-bool '(string->alphabetic-ichar "!"))) ; !
+ (assert-false (uim-bool '(string->alphabetic-ichar "/"))) ; /
+ (assert-false (uim-bool '(string->alphabetic-ichar "0"))) ; 0
+ (assert-false (uim-bool '(string->alphabetic-ichar "9"))) ; 9
+ (assert-false (uim-bool '(string->alphabetic-ichar ":"))) ; :
+ (assert-false (uim-bool '(string->alphabetic-ichar "@"))) ; @
+ (assert-false (uim-bool '(string->alphabetic-ichar "AA"))) ; AA
+ (assert-equal 65 (uim '(string->alphabetic-ichar "A"))) ; A
+ (assert-equal 90 (uim '(string->alphabetic-ichar "Z"))) ; Z
+ (assert-false (uim-bool '(string->alphabetic-ichar "ZZ"))) ; ZZ
+ (assert-false (uim-bool '(string->alphabetic-ichar "["))) ; [
+ (assert-false (uim-bool '(string->alphabetic-ichar "`"))) ; `
+ (assert-false (uim-bool '(string->alphabetic-ichar "aa"))) ; aa
+ (assert-equal 97 (uim '(string->alphabetic-ichar "a"))) ; a
+ (assert-equal 122 (uim '(string->alphabetic-ichar "z"))) ; z
+ (assert-false (uim-bool '(string->alphabetic-ichar "zz"))) ; zz
+ (assert-false (uim-bool '(string->alphabetic-ichar "{"))) ; {
+ (assert-false (uim-bool '(string->alphabetic-ichar "~"))) ; ~
+ ;;(assert-false (uim-bool '(string->alphabetic-ichar ""))) ; DEL
))
(define-uim-test-case "test util string list procedures"
