Update of /cvsroot/wisp/wisp/modules
In directory usw-pr-cvs1:/tmp/cvs-serv26988/modules
Modified Files:
strings.wim
Log Message:
Dropped |char-in-set?| and |pack-charset|.
Index: strings.wim
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/strings.wim,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- strings.wim 7 Sep 2002 21:58:33 -0000 1.70
+++ strings.wim 18 Sep 2002 20:58:41 -0000 1.71
@@ -10,15 +10,14 @@
(export
char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-foldcase
- char-in-set? find-first-char find-last-char group-from-left
- group-from-right list->string normalize-phrase pack-charset pad-left
- pad-right simple-encode split-by-string string->vector
- string->word-list string-ci<=? string-ci<? string-ci=? string-ci>=?
- string-ci>? string-contains string-drop-prefix string-drop-suffix
- string-ends-with? string-foldcase string-for-each
- string-for-each-index string-map string-map! string-reverse
- string-reverse! string-starts-with? string-trim string-trim-both
- string-trim-right vector->string)
+ find-first-char find-last-char group-from-left group-from-right
+ list->string normalize-phrase pad-left pad-right simple-encode
+ split-by-string string->vector string->word-list string-ci<=?
+ string-ci<? string-ci=? string-ci>=? string-ci>? string-contains
+ string-drop-prefix string-drop-suffix string-ends-with?
+ string-foldcase string-for-each string-for-each-index string-map
+ string-map! string-reverse string-reverse! string-starts-with?
+ string-trim string-trim-both string-trim-right vector->string)
(define (group-from-left str group-length sep)
(let ((new-string (make-string
@@ -97,9 +96,6 @@
(define (normalize-phrase entry)
(string-join (string->word-list entry)))
-(define (char-in-set? ch set)
- (bitstring-ref set (char->integer ch)))
-
(define (find-first-char ch s (start 0) (end (length s)))
(my pred (if (char? ch)
(cut char=? <> ch)
@@ -152,27 +148,6 @@
s start end)
s[i ... (+ j 1)])
(string))))
-
-(define (pack-charset l)
- (my cs (make-string 32 #\U+00)
- (while (not (null? l))
- (my i (car l)
- (if (cons? i)
- (my k (car i)
- (if (char? k)
- (set! k (char->integer k)))
- (my n (cdr i)
- (if (char? n)
- (set! n (char->integer n)))
- (while (<= k n)
- (set! (bitstring-ref cs k) 1)
- (incr! k))))
- (set! (bitstring-ref cs (if (char? i)
- (char->integer i)
- i))
- 1)))
- (cdr! l))
- cs))
(define (simple-encode s alist)
(collect-string
|
