Update of /cvsroot/wisp/wisp/modules
In directory usw-pr-cvs1:/tmp/cvs-serv32556/modules
Modified Files:
builtin.wid cgi.wim display.wim ini.wim shell.wisp xml.wim
Log Message:
Replaced |*stdin*|, |*stdout*|, and |*stderr*| with |current-input-port|, |current-output-port|, and |current-errors-port|.
Index: builtin.wid
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/builtin.wid,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- builtin.wid 18 Sep 2002 21:09:55 -0000 1.180
+++ builtin.wid 18 Sep 2002 21:11:06 -0000 1.181
@@ -2301,11 +2301,11 @@
If /object/ is a string or a character, outputs it to /port/, otherwise
outputs the external representation of /object/ to /port/. If /port/ is
- not supplied, |*stdout*| is used as the default.
+ not supplied, the current output port is used as the default.
:Conforms to: Wisp extension.
- :See also: |write-string|.
+ :See also: |write-string|, |current-output-port|.
procedure?
Index: cgi.wim
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/cgi.wim,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- cgi.wim 7 Sep 2002 21:57:47 -0000 1.42
+++ cgi.wim 18 Sep 2002 21:11:06 -0000 1.43
@@ -52,7 +52,7 @@
(my content-length (string->number content-length-as-string)
(if (not content-length)
(raise 'content-length content-length-as-string))
- (my content (read-string *stdin* content-length)
+ (my content (read-string (current-input-port) content-length)
(if (not (= (length content) content-length))
(raise 'short-content content))
(my enctype (env-ref "CONTENT_TYPE")
Index: display.wim
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/display.wim,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- display.wim 4 Sep 2002 14:31:41 -0000 1.10
+++ display.wim 18 Sep 2002 21:11:06 -0000 1.11
@@ -10,7 +10,7 @@
(export display)
-(define (display s (port *stdout*))
+(define (display s (port (current-output-port)))
(cond
((or (number? s) (boolean? s) (null? s) (symbol? s))
(write s))
Index: ini.wim
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/ini.wim,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ini.wim 26 Aug 2002 16:18:19 -0000 1.13
+++ ini.wim 18 Sep 2002 21:11:06 -0000 1.14
@@ -57,7 +57,7 @@
(if section-name
(emit-section inner-head)))))))))
-(define (write-ini-file structure (port *stdout*))
+(define (write-ini-file structure (port (current-output-port)))
(my need-separ #f
(for-each (lambda (section)
(my (name . data) section
Index: shell.wisp
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/shell.wisp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- shell.wisp 7 Sep 2002 21:56:41 -0000 1.35
+++ shell.wisp 18 Sep 2002 21:11:06 -0000 1.36
@@ -280,7 +280,7 @@
(let (loop)
(try (begin
(print ". ")
- (my r (read *stdin*)
+ (my r (read (current-input-port))
(cond
((eof-object? r)
(print "\n$,(message 'farewell)\n\n")
Index: xml.wim
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/xml.wim,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- xml.wim 31 Aug 2002 14:30:07 -0000 1.35
+++ xml.wim 18 Sep 2002 21:11:06 -0000 1.36
@@ -159,7 +159,7 @@
(if (not (null? s))
(emit (list->string (reverse s))))))))))))
-(define (parse-xml-message (port *stdin*))
+(define (parse-xml-message (port (current-input-port)))
(parse-xml-element port))
;;;; Generator
@@ -170,13 +170,13 @@
(#\> . ">")
(#\" . """))))
-(define (generate-start-tag name attrs (port *stdout*))
+(define (generate-start-tag name attrs (port (current-output-port)))
(write-string
(apply string-append "<$[name]"
`(,@(map (lambda (x) " $,(car x)=\"$,(quote-text (cdr x))\"")
attrs) ">")) port))
-(define (output-xml-element elem (port *stdout*))
+(define (output-xml-element elem (port (current-output-port)))
(generate-start-tag (first elem) (second elem) port)
(for-each (lambda (i)
(if (string? i)
@@ -185,7 +185,7 @@
(cddr elem))
(write-string "</$(first elem)>" port))
-(define (output-xml-message msg (port *stdout*))
+(define (output-xml-message msg (port (current-output-port)))
(output-xml-element msg port))
;;;; XML structure manipulation
|
