Change most places that use bitless-char? to just throw away the bucket bits.

diff --git a/src/runtime/char-set.scm b/src/runtime/char-set.scm
index 63645b194e1e3fd9da8037a6dbab799db4f4b072..3a4dba94dc2a013ff71effe1c135929cb77e2df0 100644 (file)
--- a/src/runtime/char-set.scm
+++ b/src/runtime/char-set.scm
@@ -52,10 +52,9 @@ USA.
          (delay
            (let ((predicate
                   (lambda (char)
-                    (and (bitless-char? char)
+                    (and (char? char)
                          (char-in-set? char char-set)))))
-             (register-predicate! predicate 'char-set-predicate
-                                  '<= bitless-char?)
+             (register-predicate! predicate 'char-set-predicate '<= char?)
              predicate)))))
     char-set))
 
@@ -303,7 +302,7 @@ USA.
 
 (define (%cpl-element->ranges elt)
   (cond ((%range? elt) (list elt))
-       ((bitless-char? elt) (list (char->integer elt)))
+       ((char? elt) (list (char-code elt)))
        ((string? elt) (map char->integer (string->list elt)))
        (else #f)))
 
@@ -355,7 +354,7 @@ USA.
 
 (define (cpl-element? object)
   (or (%range? object)
-      (bitless-char? object)
+      (char? object)
       (string? object)
       (char-set? object)
       (name->char-set object)))
@@ -416,8 +415,7 @@ USA.
 
 (define (char-in-set? char char-set)
   (guarantee char? char 'char-in-set?)
-  (and (bitless-char? char)
-       (%code-point-in-char-set? (char->integer char) char-set)))
+  (%code-point-in-char-set? (char-code char) char-set))
 
 (define (code-point-in-char-set? cp char-set)
   (guarantee unicode-code-point? cp 'code-point-in-char-set?)

diff --git a/src/runtime/char.scm b/src/runtime/char.scm
index b29535a75c5dd9d1616e4345773b71fa18b5495b..6072215832e72d5c1a12cf9db07ceb2d110aa111 100644 (file)
--- a/src/runtime/char.scm
+++ b/src/runtime/char.scm
@@ -384,8 +384,8 @@ USA.
     n))
 
 (define (char-general-category char)
-  (guarantee bitless-char? char 'char-general-category)
-  (ucd-gc-value char))
+  (guarantee char? char 'char-general-category)
+  (code-point-general-category (char-code char)))
 
 (define (code-point-general-category cp)
   (guarantee unicode-code-point? cp 'code-point-general-category)