[Wisp-cvs] wisp/modules string-port.wim,1.14,1.15

[<di...@us...>]

Update of /cvsroot/wisp/wisp/modules
In directory usw-pr-cvs1:/tmp/cvs-serv5261/modules

Modified Files:
	string-port.wim 
Log Message:
Made string-port.wim avoid |string-length| in favour of |length|.

Index: string-port.wim
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/string-port.wim,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- string-port.wim	4 Sep 2002 14:31:41 -0000	1.14
+++ string-port.wim	7 Sep 2002 21:56:55 -0000	1.15
@@ -25,19 +25,19 @@
   (friend (raw-string-reader port string start count)
     (if (negative? count)
       (raise 'range count))
-    (if (>= pos (string-length data)) ; eof
+    (if (>= pos (length data)) ; eof
       0
       (begin
-        (if (< (- (string-length data) pos) count)
-          (set! count (- (string-length data) pos)))
+        (if (< (- (length data) pos) count)
+          (set! count (- (length data) pos)))
         (string-move! string start data pos count)
         (incr! pos count)
         count)))
   (friend (raw-string-writer port string start count)
     (if (negative? count)
       (raise 'range count))
-    (if (> (+ pos count) (string-length data))
-      (set! (string-length data) (+ pos count)))
+    (if (> (+ pos count) (length data))
+      (set! (length data) (+ pos count)))
     (string-move! data pos string start count)
     (incr! pos count)
     count)
@@ -45,7 +45,7 @@
     (set! pos (+ delta (case whence
                          ((absolute) 0)
                          ((relative) pos)
-                         ((end) (string-length data))
+                         ((end) (length data))
                          (else (raise 'invalid-whence whence)))))
     pos)
   (friend (get-output-string port)