Update of /cvsroot/wisp/wisp/modules
In directory usw-pr-cvs1:/tmp/cvs-serv4543/modules
Modified Files:
Makefile.am files.wim xml.wim
Removed Files:
strings-as-stacks.wim
Log Message:
Dropped the strings-as-stacks module and |cut-place| special form.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/Makefile.am,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Makefile.am 26 Aug 2002 15:54:16 -0000 1.54
+++ Makefile.am 31 Aug 2002 14:28:26 -0000 1.55
@@ -24,9 +24,8 @@
cgi.wim codecoll.wim collectors.wim display.wim encoding.wim \
files.wim frer.wim getopt.wim ini.wim keyboard.wim lists.wim \
locale.wim mingle.wim morse.wim phases.wim promises.wim qsort.wim \
- random.wim regex.wim string-port.wim strings-as-stacks.wim \
- strings.wim tester.wim time.wim unicode.wim unix.wim url.wim \
- xml.wim wispdoc.wim
+ random.wim regex.wim string-port.wim strings.wim tester.wim \
+ time.wim unicode.wim unix.wim url.wim xml.wim wispdoc.wim
frwim_DATA = $(filter-out arithmetics.frwim,$(wim_DATA:%.wim=%.frwim))
Index: files.wim
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/files.wim,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- files.wim 26 Aug 2002 16:18:18 -0000 1.39
+++ files.wim 31 Aug 2002 14:28:26 -0000 1.40
@@ -8,7 +8,7 @@
(module files)
-(use strings strings-as-stacks)
+(use strings)
; {{{ exports
(export
Index: xml.wim
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/xml.wim,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- xml.wim 26 Aug 2002 16:18:19 -0000 1.33
+++ xml.wim 31 Aug 2002 14:28:26 -0000 1.34
@@ -10,7 +10,7 @@
(module xml)
-(use strings-as-stacks)
+(use strings)
(export
for-all-xml-children output-xml-message parse-xml-message)
@@ -20,7 +20,9 @@
;; FIXME: check what happens in case of unexpected EOF's.
(define (eat-up-whitespace port)
- (while (char-whitespace? (peek-char port))
+ (while (my c (peek-char port)
+ (and (not (eof-object? c))
+ (char-whitespace? c)))
(read-char port)))
(define (char-xml-symbolic? ch)
@@ -145,38 +147,36 @@
(collect
(lambda (emit)
(for-each emit items)
- (let ((s (string))
+ (let ((s '()) ; reversed
(done? #f))
(while (not done?)
(case (peek-char port) c
((#\&)
(read-char port)
- (string-push! s (parse-xml-amp port)))
+ (cons! s (parse-xml-amp port)))
((#\<)
- (my l (string-length s)
- (while (and (not (zero? l))
- (char-whitespace? s[-1]))
- (string-pop! s)
- (decr! l)))
+ (while (and (not (null? s))
+ (char-whitespace? (car s)))
+ (cdr! s))
(my t (parse-xml-tag port)
(if (symbol? t)
(if (eq? t head)
(set! done? #t)
(raise 'invalid-xml:mismatch port))
(begin
- (if (not (zero? (string-length s)))
+ (if (not (null? s))
(begin
- (emit s)
- (set! s (string))))
+ (emit (list->string (reverse s)))
+ (set! s '())))
(emit (parse-xml-element port t)))))
(eat-up-whitespace port))
((#\return)
(read-char port)) ; ignore
(else
(read-char port)
- (string-push! s c))))
- (if (not (string-null? s))
- (emit s))))))))))
+ (cons! s c))))
+ (if (not (null? s))
+ (emit (list->string (reverse s))))))))))))
(define (parse-xml-message (port *stdin*))
(parse-xml-element port))
--- strings-as-stacks.wim DELETED ---
|
