Changeset 35787 in project

Timestamp:

07/07/18 03:07:37 (8 months ago)

Author:

kon

Message:

rmv dup

File:

• release/4/string-utils/trunk/unicode-utils.scm (modified) (5 diffs)

release/4/string-utils/trunk/unicode-utils.scm

@@ -5 +5 @@
 ;;
 ;; - Implies Unicode support that is not present.
+
+(declare
+  (bound-to-procedure
+    ##sys#string-append
+    ##sys#char->utf8-string
+    ##sys#unicode-surrogate?
+    ##sys#surrogates->codepoint))
 
 (module unicode-utils
@@ -23 +30 @@
   (only type-checks check-natural-fixnum check-char))
 
-(declare
-  (bound-to-procedure
-    ##sys#string-append
-    ##sys#char->utf8-string
-    ##sys#unicode-surrogate?
-    ##sys#surrogates->codepoint))
-
 ;; Simple UTF 8
 
+;nul is not accepted!
 (: ascii-codepoint? (* -> boolean : char))
 ;
@@ -38 +39 @@
     (char? ch)
     (let ((x (char->integer ch)))
-      (and (fx<= 0 x) (fx<= x #x7f)) ) ) )
+      ;[1 7f] = (1 80)
+      (and (fx< 0 x) (fx< x #x80)) ) ) )
 
 (: unicode-char->string (char --> string))
@@ -57 +59 @@
       (*unicode-string chs) ) ) )
 
-(: generic-make-string (fixnum char --> string))
-;
-(define (generic-make-string len ch)
-  (if (ascii-codepoint? ch)
-    (make-string len ch)
-    (unicode-make-string len ch) ) )
-
 (: unicode-make-string (fixnum #!optional char --> string))
 ;
@@ -70 +65 @@
     (check-natural-fixnum 'unicode-make-string len)
     (check-char 'unicode-make-string fill)) )
+
+(define generic-make-string unicode-make-string)
 
 (: unicode-surrogate? (* -> boolean : fixnum))