Update of /cvsroot/wisp/wisp/modules
In directory usw-pr-cvs1:/tmp/cvs-serv5333/modules
Modified Files:
regex.wim
Log Message:
Made regex.wim avoid |string-length| in favour of |length|.
Index: regex.wim
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/regex.wim,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- regex.wim 4 Sep 2002 14:39:08 -0000 1.52
+++ regex.wim 7 Sep 2002 21:57:02 -0000 1.53
@@ -314,7 +314,7 @@
;
(define (regex-string-match s1 s i n sk fk)
- (my n1 (string-length s1)
+ (my n1 (length s1)
(if (> n1 n) (fk)
(let (loop (j 0) (k i))
(cond
@@ -573,11 +573,11 @@
(define (regex-parse s)
(set! (regex-space-sensitive?) #t) ; in case it got corrupted
- (list ':sub (if (zero? (string-length s))
+ (list ':sub (if (zero? (length s))
`(:or (:seq))
- (car (regex-read-pattern s 0 (string-length s))))))
+ (car (regex-read-pattern s 0 (length s))))))
-(define (regex-match-positions pat str (start 0) (end (string-length str)))
+(define (regex-match-positions pat str (start 0) (end (length str)))
(my pat (if (string? pat)
(regex-parse pat)
pat)
@@ -588,7 +588,7 @@
(cadr vv)
(loop (+ i 1))))))))
-(define (regex-match pat str (start 0) (end (string-length str)))
+(define (regex-match pat str (start 0) (end (length str)))
(my ix-prs (regex-match-positions pat str start end)
(and ix-prs
(map (lambda (ix-pr)
@@ -613,10 +613,10 @@
(else (list str[item-start ...]))))))
(define (regex-replace pat str ins)
- (let* ((n (string-length str))
+ (let* ((n (length str))
(pp (regex-match-positions pat str 0 n)))
(if (not pp) str
- (my ins-len (string-length ins)
+ (my ins-len (length ins)
(my (m-i . m-n) (car pp)
(string-append
str[0 ... m-i]
@@ -625,8 +625,8 @@
(define (regex-replace* pat str ins)
(let ((pat (if (string? pat) (regex-parse pat) pat))
- (n (string-length str))
- (ins-len (string-length ins)))
+ (n (length str))
+ (ins-len (length ins)))
(let (loop (i 0) (r ""))
(my pp (regex-match-positions pat str i n)
(if pp
|
