Integrate string operations for order of magnitude speedup.

diff --git a/src/edwin/string.scm b/src/edwin/string.scm
index bc95437928bb4aae1cc0b7584f3f438ea8520c80..8fa590194d13d9933dc53000d28954a4b3edccae 100644 (file)
--- a/src/edwin/string.scm
+++ b/src/edwin/string.scm
@@ -62,6 +62,7 @@ USA.
 (define byte0-index
   (fix:* 2 (bytes-per-object)))
 
+(declare (integrate-operator string?))
 (define (string? object)
   (or (object-type? (ucode-type string) object)
       (bytevector? object)
@@ -75,12 +76,13 @@ USA.
 (define-integrable (%string-length string)
   (primitive-datum-ref string 1))
 
-(define (string-ref string index)
+(define-integrable (string-ref string index)
   (integer->char (vector-8b-ref string index)))
 
-(define (string-set! string index char)
+(define-integrable (string-set! string index char)
   (vector-8b-set! string index (char->integer char)))
 
+(declare (integrate-operator vector-8b-ref))
 (define (vector-8b-ref string index)
   (if (not (string? string))
       (error:not-a string? string 'vector-8b-ref))
@@ -90,6 +92,7 @@ USA.
       (error:bad-range-argument index 'vector-8b-ref))
   (primitive-byte-ref string (fix:+ byte0-index index)))
 
+(declare (integrate-operator vector-8b-set!))
 (define (vector-8b-set! string index u8)
   (if (not (string? string))
       (error:not-a string? string 'vector-8b-set!))
@@ -97,7 +100,7 @@ USA.
       (error:not-a index-fixnum? index 'vector-8b-set!))
   (if (not (fix:< index (%string-length string)))
       (error:bad-range-argument index 'vector-8b-set!))
-  (if (not (u8? u8))
+  (if (not (and (index-fixnum? u8) (fix:<= u8 #xff)))
       (error:not-a u8? u8 'vector-8b-set!))
   (primitive-byte-set! string (fix:+ byte0-index index) u8))