wisp-cvs

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

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

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

Index: strings.wim
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/strings.wim,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- strings.wim	4 Sep 2002 14:31:41 -0000	1.68
+++ strings.wim	7 Sep 2002 21:56:49 -0000	1.69
@@ -22,13 +22,13 @@
 
 (define (group-from-left str group-length sep)
   (let ((new-string (make-string
-                      (+ (string-length str)
-                         (* (ceiling (/ (string-length str)
-                                        group-length)) (string-length sep)))))
+                      (+ (length str)
+                         (* (ceiling (/ (length str)
+                                        group-length)) (length sep)))))
         (si 0)
         (ni 0)
-        (sl (string-length sep)))
-    (while (< si (string-length str))
+        (sl (length sep)))
+    (while (< si (length str))
       (if (and (not (zero? si)) (= (remainder si group-length) 0))
         (begin
           (string-move! new-string ni sep 0 sl)
@@ -36,45 +36,45 @@
       (set! new-string[ni] str[si])
       (incr! si)
       (incr! ni))
-    (set! (string-length new-string) ni)
+    (set! (length new-string) ni)
     new-string))
 
 (define (group-from-right str group-length sep)
-  (let* ((d (modulo (- (string-length str)) group-length))
-         (fs (make-string (+ d (string-length str)))))
-    (string-move! fs d str 0 (string-length str))
+  (let* ((d (modulo (- (length str)) group-length))
+         (fs (make-string (+ d (length str)))))
+    (string-move! fs d str 0 (length str))
     (let* ((g (group-from-left fs group-length sep))
-           (rl (- (string-length g) d)))
+           (rl (- (length g) d)))
       (string-move! g 0 g d rl) ; sic
-      (set! (string-length g) rl)
+      (set! (length g) rl)
       g)))
 
 (define (pad-left str len ch (cut? #f))
-  (my delta (- len (string-length str))
+  (my delta (- len (length str))
     (if (negative? delta)
       (if cut?
         str[(- delta) ...]
         str)
       (my new-string (make-string len)
-        (string-move! new-string delta str 0 (string-length str))
+        (string-move! new-string delta str 0 (length str))
         (do ((i (- delta 1) (- i 1)))
             ((negative? i) new-string)
           (set! new-string[i] ch))))))
 
 (define (pad-right str len ch (cut? #f))
-  (my delta (- len (string-length str))
+  (my delta (- len (length str))
     (if (negative? delta)
       (if cut?
         str[... len]
         str)
       (my new-string (make-string len)
-        (string-move! new-string 0 str 0 (string-length str))
-        (do ((i (string-length str) (+ i 1)))
+        (string-move! new-string 0 str 0 (length str))
+        (do ((i (length str) (+ i 1)))
             ((>= i len) new-string)
           (set! new-string[i] ch))))))
 
 (define (string->vector str)
-  (let* ((i (string-length str))
+  (let* ((i (length str))
          (vec (make-vector i)))
     (decr! i)
     (while (not (negative? i))
@@ -100,7 +100,7 @@
 (define (char-in-set? ch set)
   (bitstring-ref set (char->integer ch)))
 
-(define (find-first-char ch s (start 0) (end (string-length s)))
+(define (find-first-char ch s (start 0) (end (length s)))
   (my pred (if (char? ch)
              (cut char=? <> ch)
              ch)
@@ -110,7 +110,7 @@
              i
              (loop (+ i 1)))))))
 
-(define (find-last-char ch s (start 0) (end (string-length s)))
+(define (find-last-char ch s (start 0) (end (length s)))
   (my pred (if (char? ch)
              (cut char=? <> ch)
              ch)
@@ -120,7 +120,7 @@
              i
              (loop (- i 1)))))))
 
-(define (string-trim s (ch char-whitespace?) (start 0) (end (string-length s)))
+(define (string-trim s (ch char-whitespace?) (start 0) (end (length s)))
   (my i (find-last-char (cond
                           ((char? ch) (serial (cut char=? <> ch) not))
                           (else       (serial ch not)))
@@ -129,7 +129,7 @@
       s[start ... (+ i 1)]
       (string))))
 
-(define (string-trim-right s (ch char-whitespace?) (start 0) (end (string-length s)))
+(define (string-trim-right s (ch char-whitespace?) (start 0) (end (length s)))
   (my i (find-first-char (cond
                            ((char? ch) (serial (cut char=? <> ch) not))
                            (else       (serial ch not)))
@@ -138,7 +138,7 @@
       s[i ... end]
       (string))))
 
-(define (string-trim-both s (ch char-whitespace?) (start 0) (end (string-length s)))
+(define (string-trim-both s (ch char-whitespace?) (start 0) (end (length s)))
   (my i (find-first-char
           (cond
             ((char? ch) (serial (cut char=? <> ch) not))
@@ -177,7 +177,7 @@
 (define (simple-encode s alist)
   (collect-string
     (lambda (emit)
-      (my l (string-length s)
+      (my l (length s)
         (my i 0
           (while (< i l)
             (my ch s[i]
@@ -231,7 +231,7 @@
       (and (not (string-null? s))
            (char=? s[0] etalon)))
     ((string? etalon)
-      (string=? s[... (string-length etalon)]
+      (string=? s[... (length etalon)]
                 etalon))
     (else (raise 'string? etalon))))
 
@@ -241,13 +241,13 @@
       (and (not (string-null? s))
            (char=? s[-1] etalon)))
     ((string? etalon)
-      (string=? s[(- (string-length etalon)) ...] etalon))
+      (string=? s[(- (length etalon)) ...] etalon))
     (else (raise 'string? etalon))))
 
 ; FIXME: make it faster
 (define (string-contains str substr
-                         (start1 0) (end1 (string-length str))
-                         (start2 0) (end2 (string-length substr)))
+                         (start1 0) (end1 (length str))
+                         (start2 0) (end2 (length substr)))
   (my sublen (- end2 start2)
     (my limit (- end1 sublen)
       (let (loop (i start1))
@@ -264,12 +264,12 @@
         (ptr  (decr! max-cuts)
               (cons str[i ... ptr]
                     (if (zero? max-cuts)
-                      (list str[(+ ptr (string-length substr)) ...])
-                      (loop (+ ptr (string-length substr))))))
+                      (list str[(+ ptr (length substr)) ...])
+                      (loop (+ ptr (length substr))))))
         (else (list str[i ...]))))))
 
 (define (string-reverse! s (start #f) (end #f))
-  (my sl (string-length s)
+  (my sl (length s)
     (set! start (if start (reduce-index start sl) 0))
     (set! end (if end (reduce-index end sl) sl)))
   (my i start
@@ -287,7 +287,7 @@
     s))
 
 (define (string-map! proc s (start #f) (end #f))
-  (my sl (string-length s)
+  (my sl (length s)
     (set! start (if start (reduce-index start sl) 0))
     (set! end (if end (reduce-index end sl) sl)))
   (my i start
@@ -301,7 +301,7 @@
     s))
 
 (define (string-for-each proc s (start #f) (end #f))
-  (my sl (string-length s)
+  (my sl (length s)
     (set! start (if start (reduce-index start sl) 0))
     (set! end (if end (reduce-index end sl) sl)))
   (my i start
@@ -310,7 +310,7 @@
       (incr! i))))
 
 (define (string-for-each-index proc s (start #f) (end #f))
-  (my sl (string-length s)
+  (my sl (length s)
     (set! start (if start (reduce-index start sl) 0))
     (set! end (if end (reduce-index end sl) sl)))
   (my i start
@@ -326,7 +326,7 @@
            s[1 ...]))
     ((string-null? prefix) s)
     ((string? prefix)
-      (my cp (string-length prefix)
+      (my cp (length prefix)
         (and (string=? s[... cp] prefix)
              s[cp ...])))
     (else (raise 'string? prefix))))
@@ -339,7 +339,7 @@
            s[... -1]))
     ((string-null? suffix) s)
     ((string? suffix)
-      (my cp (- (string-length suffix))
+      (my cp (- (length suffix))
         (and (string=? s[cp ...] suffix)
              s[... cp])))
     (else (raise 'string? suffix))))