Eliminate use of ascii-range->char-set.

diff --git a/src/compiler/machines/C/cout.scm b/src/compiler/machines/C/cout.scm
index 4e9ce2bba155701e444663e3c7fac8c315683ddf..ae0974500f91f7c434cbe29ace91c7f92d56c0f4 100644 (file)
--- a/src/compiler/machines/C/cout.scm
+++ b/src/compiler/machines/C/cout.scm
@@ -591,7 +591,7 @@ USA.
   (char-set-union
    ;; Not char-set:not-graphic
    (char-set-invert
-    (char-set-intersection char-set:graphic (ascii-range->char-set 0 #x7f)))
+    (char-set-intersection char-set:graphic (ucs-range->char-set 0 #x7f)))
    (char-set #\\ #\" #\? (integer->char #xA0))))
 
 (define char-set:C-named-chars

diff --git a/src/compiler/machines/C/cutl.scm b/src/compiler/machines/C/cutl.scm
index be23d5530da872e3eaa21d8c2b94ea77a12a0517..b48f292f858e3c5cde15841cc2f37d8a9cea6ebf 100644 (file)
--- a/src/compiler/machines/C/cutl.scm
+++ b/src/compiler/machines/C/cutl.scm
@@ -381,8 +381,8 @@ USA.
          #t))))
 
 (define c:decimal-chars
-  (ascii-range->char-set (char->integer #\0)
-                        (+ (char->integer #\9) 1)))
+  (ucs-range->char-set (char->integer #\0)
+                      (+ (char->integer #\9) 1)))
 
 (define (c:type type)
   (or (and (symbol? type)
@@ -464,12 +464,12 @@ USA.
          #t))))
 
 (define c:identifier-chars
-  (char-set-union (ascii-range->char-set (char->integer #\A)
-                                        (+ (char->integer #\Z) 1))
-                 (ascii-range->char-set (char->integer #\a)
-                                        (+ (char->integer #\z) 1))
-                 (ascii-range->char-set (char->integer #\0)
-                                        (+ (char->integer #\9) 1))
+  (char-set-union (ucs-range->char-set (char->integer #\A)
+                                      (+ (char->integer #\Z) 1))
+                 (ucs-range->char-set (char->integer #\a)
+                                      (+ (char->integer #\z) 1))
+                 (ucs-range->char-set (char->integer #\0)
+                                      (+ (char->integer #\9) 1))
                  (char-set #\_)))
 
 (define (c:%parenthesized? e)

diff --git a/src/edwin/dired.scm b/src/edwin/dired.scm
index 922acc1ed6a2f6ae03eef9f593249058afadb6b9..8fcaf1abe1c3b168a1aa30ec6a67baefb892809f 100644 (file)
--- a/src/edwin/dired.scm
+++ b/src/edwin/dired.scm
@@ -798,7 +798,7 @@ Actions controlled by variables list-directory-brief-switches
 (define directory-listing-before-filename-regexp
   (let* ((l
          (char-set-union char-set:alphabetic
-                         (ascii-range->char-set #x80 #x100)))
+                         (ucs-range->char-set #x80 #x100)))
         (l? (rexp-optional l))
         (l-or-quote (char-set-union l (char-set #\')))
         (digit (string->char-set "0123456789"))

diff --git a/src/edwin/dosfile.scm b/src/edwin/dosfile.scm
index 02835fbb0d7c68f80e02e87b3d46b1ad53da9d45..084a91d72b92de2162b14c9f79ac3493df05c542 100644 (file)
--- a/src/edwin/dosfile.scm
+++ b/src/edwin/dosfile.scm
@@ -397,10 +397,10 @@ Switches may be concatenated, e.g. `-lt' is equivalent to `-l -t'."
        (char-set-union (string->char-set "\"/:<>\\|")
                       (string->char-set "*?"))))
   (set! char-set:valid-hpfs
-       (char-set-difference (ascii-range->char-set #x21 #x7F)
+       (char-set-difference (ucs-range->char-set #x21 #x7F)
                             reserved-chars))
   (set! char-set:valid-windows-long
-       (char-set-difference (ascii-range->char-set #x20 #x100)
+       (char-set-difference (ucs-range->char-set #x20 #x100)
                             reserved-chars)))
 
 (define char-set:valid-fat

diff --git a/src/edwin/modefs.scm b/src/edwin/modefs.scm
index 6b9760a091fc8e9c18106abc757bf81a77f093ee..47a0fa7ade1e1c199e7122003354d4f442c7cfd6 100644 (file)
--- a/src/edwin/modefs.scm
+++ b/src/edwin/modefs.scm
@@ -48,7 +48,7 @@ Most other major modes are defined by comparison to this one.")
 
 ;; The extra range allows international keyboards to insert 8-bit characters
 (define char-set:self-insert-keys
-  (char-set-union char-set:printing (ascii-range->char-set 128 255)))
+  (char-set-union char-set:printing (ucs-range->char-set 128 255)))
 
 (define-key 'fundamental char-set:self-insert-keys 'self-insert-command)
 (define-key 'fundamental char-set:numeric 'auto-digit-argument)

diff --git a/src/edwin/rcsparse.scm b/src/edwin/rcsparse.scm
index 227b1d895293d3417f70d46252ba2349958eda85..94feeb56e713d21781480f5a8dd4d4a31d26bf9f 100644 (file)
--- a/src/edwin/rcsparse.scm
+++ b/src/edwin/rcsparse.scm
@@ -368,8 +368,8 @@ USA.
 (define parse-word
   (let ((delimiters
         (char-set-invert
-         (char-set-union (ascii-range->char-set #o010 #o016)
-                         (ascii-range->char-set #o040 #o041)))))
+         (char-set-union (ucs-range->char-set #o010 #o016)
+                         (ucs-range->char-set #o040 #o041)))))
     (lambda (port)
       (input-port/discard-chars port delimiters)
       (let ((char (input-port/peek-char port)))
@@ -401,8 +401,8 @@ USA.
   (let ((delimiters
         (char-set-invert
          (char-set-difference
-          (char-set-union (ascii-range->char-set #o041 #o177)
-                          (ascii-range->char-set #o240 #o400))
+          (char-set-union (ucs-range->char-set #o041 #o177)
+                          (ucs-range->char-set #o240 #o400))
           (char-set #\$ #\, #\. #\: #\; #\@)))))
     (lambda (port)
       (make-rcs-id (input-port/read-string port delimiters)))))

diff --git a/src/edwin/rfc822.scm b/src/edwin/rfc822.scm
index 67e132e7ed445ebc8cd93dbfc9ba8b19e402b065..3031c56fefc3f0c09e83d90711e240e088fa1e22 100644 (file)
--- a/src/edwin/rfc822.scm
+++ b/src/edwin/rfc822.scm
@@ -29,7 +29,7 @@ USA.
 (declare (usual-integrations))
 \f
 (define rfc822:char-set:header-constituents
-  (char-set-difference (ascii-range->char-set 33 127)
+  (char-set-difference (ucs-range->char-set 33 127)
                       (char-set #\:)))
 
 (define rfc822:char-set:not-header-constituents
@@ -385,7 +385,7 @@ USA.
 
 (define (rfc822:string-tokenizer special-chars keep-whitespace?)
   (let ((atom-chars
-         (char-set-difference (ascii-range->char-set #x21 #x7F)
+         (char-set-difference (ucs-range->char-set #x21 #x7F)
                               special-chars)))
     (define (special-char? char) (char-in-set? char special-chars))
     (define    (atom-char? char) (char-in-set?    char atom-chars))

diff --git a/src/edwin/sendmail.scm b/src/edwin/sendmail.scm
index c658af9a924df4140776de13d6984b659bcd98b6..24208233e5206fe923b95976489468534160b9bc 100644 (file)
--- a/src/edwin/sendmail.scm
+++ b/src/edwin/sendmail.scm
@@ -1375,7 +1375,7 @@ the user from the mailer."
                 (loop ls)))))))
 
 (define char-set:printable-7bit
-  (char-set-union (ascii-range->char-set #x20 #x7F)
+  (char-set-union (ucs-range->char-set #x20 #x7F)
                   (char-set #\tab #\page #\linefeed)))
 
 (define char-set:non-printable-7bit

diff --git a/src/edwin/syntax.scm b/src/edwin/syntax.scm
index 90c2e365d56e0872830a50151b058bdbb05dea9c..87bb7d5bb8674acc34619328393faf026108fcaf 100644 (file)
--- a/src/edwin/syntax.scm
+++ b/src/edwin/syntax.scm
@@ -32,8 +32,8 @@ USA.
 
 (define (modify-syntax-entries! syntax-table cl ch string)
   (set-char-syntax! syntax-table
-                   (ascii-range->char-set (char->integer cl)
-                                          (char->integer ch))
+                   (ucs-range->char-set (char->integer cl)
+                                        (char->integer ch))
                    string))
 
 (define (group-syntax-table-entries group)

diff --git a/src/imail/imap-syntax.scm b/src/imail/imap-syntax.scm
index 598e767e4ec95977c3583894388bb9529cce51b0..6f1b629133db75d67d7c0d5bc1eb5a8362cb5131 100644 (file)
--- a/src/imail/imap-syntax.scm
+++ b/src/imail/imap-syntax.scm
@@ -29,10 +29,10 @@ USA.
 (declare (usual-integrations))
 \f
 (define imap:char-set:char
-  (ascii-range->char-set #x01 #x80))
+  (ucs-range->char-set #x01 #x80))
 
 (define imap:char-set:ctl
-  (char-set-union (ascii-range->char-set #x00 #x20)
+  (char-set-union (ucs-range->char-set #x00 #x20)
                  (char-set #\rubout)))
 
 (define imap:char-set:list-wildcards

diff --git a/src/runtime/http-syntax.scm b/src/runtime/http-syntax.scm
index 6d81be9bcc4c6e27c3a7c7aac87d911a614d7404..1f5c834cc66ba36f00f71b7476a91ae314a0fb5c 100644 (file)
--- a/src/runtime/http-syntax.scm
+++ b/src/runtime/http-syntax.scm
@@ -953,8 +953,8 @@ USA.
   (char-set-difference char-set:http-text (char-set #\")))
 
 (define-deferred char-set:alpha
-  (char-set-union (ascii-range->char-set #x41 #x5B)
-                 (ascii-range->char-set #x61 #x7B)))
+  (char-set-union (ucs-range->char-set #x41 #x5B)
+                 (ucs-range->char-set #x61 #x7B)))
 \f
 (define-tokenizer-state tokenize
   (eof done)

diff --git a/src/runtime/mime-codec.scm b/src/runtime/mime-codec.scm
index eb407da508a6c2dd4c42e8e15675139e650a32e3..d2b38b6469c6bcdb12ec5fc5455bc38582dd2759 100644 (file)
--- a/src/runtime/mime-codec.scm
+++ b/src/runtime/mime-codec.scm
@@ -327,7 +327,7 @@ USA.
 
 (define char-set:qp-encoded
   (char-set-invert
-   (char-set-union (char-set-difference (ascii-range->char-set #x21 #x7F)
+   (char-set-union (char-set-difference (ucs-range->char-set #x21 #x7F)
                                        (char-set #\=))
                   (char-set #\space #\tab))))
 

diff --git a/src/runtime/sfile.scm b/src/runtime/sfile.scm
index da100090f3030c563baaa24ae84cbba2f1d80f09..b182630b57a180f14babede1f0d2edf2f972dfac 100644 (file)
--- a/src/runtime/sfile.scm
+++ b/src/runtime/sfile.scm
@@ -345,7 +345,7 @@ USA.
                    top-level-mime-types))
   (set! unusual-interned-mime-types (make-equal-hash-table))
   (set! char-set:mime-token
-       (char-set-difference (ascii-range->char-set #x21 #x7F)
+       (char-set-difference (ucs-range->char-set #x21 #x7F)
                             (string->char-set "()<>@,;:\\\"/[]?=")))
   (set! local-type-map (make-string-hash-table))
   (associate-pathname-type-with-mime-type "scm"

diff --git a/src/xml/rdf-nt.scm b/src/xml/rdf-nt.scm
index bb859d3898f6ec807d661d3b8c5032d4a0e53abc..fa486307fdc4efaf565afc721e95d5fa7531b78c 100644 (file)
--- a/src/xml/rdf-nt.scm
+++ b/src/xml/rdf-nt.scm
@@ -96,11 +96,11 @@ USA.
 
 (define match-bnode-name
   (let* ((name-head
-         (char-set-union (ascii-range->char-set #x41 #x5B)
-                         (ascii-range->char-set #x61 #x7B)))
+         (char-set-union (ucs-range->char-set #x41 #x5B)
+                         (ucs-range->char-set #x61 #x7B)))
         (name-tail
          (char-set-union name-head
-                         (ascii-range->char-set #x30 #x3A))))
+                         (ucs-range->char-set #x30 #x3A))))
     (*matcher
      (seq (char-set name-head)
          (* (char-set name-tail))))))
@@ -175,11 +175,11 @@ USA.
   (char-set #\space #\tab))
 
 (define char-set:character
-  (ascii-range->char-set #x20 #x7F))
+  (ucs-range->char-set #x20 #x7F))
 
 (define char-set:hex
-  (char-set-union (ascii-range->char-set #x30 #x3A)
-                 (ascii-range->char-set #x41 #x47)))
+  (char-set-union (ucs-range->char-set #x30 #x3A)
+                 (ucs-range->char-set #x41 #x47)))
 
 (define char-set:unescaped
   (char-set-difference char-set:character (char-set #\" #\\)))

diff --git a/src/xml/rdf-struct.scm b/src/xml/rdf-struct.scm
index 87e0636813ae331f8b78b36817d2c4c259a96aa1..6426beea4928a2d790198c7e61145d2d0efd854a 100644 (file)
--- a/src/xml/rdf-struct.scm
+++ b/src/xml/rdf-struct.scm
@@ -175,7 +175,7 @@ USA.
         (unhash-object (vector-ref v 0)))))
 
 (define parse-bnode
-  (let ((digits (ascii-range->char-set #x30 #x3A)))
+  (let ((digits (ucs-range->char-set #x30 #x3A)))
     (*parser
      (seq (noise "_:B")
          (map (lambda (s) (string->number s 10 #t))
@@ -238,10 +238,10 @@ USA.
        (*match-symbol match-language object)))
 
 (define match-language
-  (let* ((language-head (ascii-range->char-set #x61 #x7B))
+  (let* ((language-head (ucs-range->char-set #x61 #x7B))
         (language-tail
          (char-set-union language-head
-                         (ascii-range->char-set #x30 #x3A))))
+                         (ucs-range->char-set #x30 #x3A))))
     (*matcher
      (seq (+ (char-set language-head))
          (* (seq #\- (+ (char-set language-tail))))))))

diff --git a/src/xml/xml-rpc.scm b/src/xml/xml-rpc.scm
index cad22ac4f6d556e490ef5f917f99ef839daae13a..30f62b2c783e87f06d1a329b4778f64d58eaf814 100644 (file)
--- a/src/xml/xml-rpc.scm
+++ b/src/xml/xml-rpc.scm
@@ -93,12 +93,12 @@ USA.
        (string-every (char-set-predicate char-set:method-name) string)))
 
 (define char-set:method-name
-  (char-set-union (ascii-range->char-set (char->integer #\a)
-                                        (fix:+ (char->integer #\z) 1))
-                 (ascii-range->char-set (char->integer #\A)
-                                        (fix:+ (char->integer #\Z) 1))
-                 (ascii-range->char-set (char->integer #\0)
-                                        (fix:+ (char->integer #\9) 1))
+  (char-set-union (ucs-range->char-set (char->integer #\a)
+                                      (fix:+ (char->integer #\z) 1))
+                 (ucs-range->char-set (char->integer #\A)
+                                      (fix:+ (char->integer #\Z) 1))
+                 (ucs-range->char-set (char->integer #\0)
+                                      (fix:+ (char->integer #\9) 1))
                  (char-set #\_ #\. #\: #\/)))
 
 (define (xml-rpc:parse-response document)