X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=genutils.lisp;h=09d595d77c5304dd1153df418690f71260e8f8af;hb=8e1e9fe9c4b29ed0bb5a8f340b2eb583144bb905;hp=6125aba7262e95696eac18ee766088f75f42b406;hpb=7249fcd884a04be929dc6895c91e82be747c9533;p=kmrcl.git

diff --git a/genutils.lisp b/genutils.lisp
index 6125aba..09d595d 100644
--- a/genutils.lisp
+++ b/genutils.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: genutils.lisp,v 1.8 2002/11/07 04:07:02 kevin Exp $
+;;;; $Id: genutils.lisp,v 1.10 2002/11/08 06:43:34 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -218,17 +218,19 @@
 
 (defmacro with-each-stream-line ((var stream) &body body)
   (let ((eof (gensym))
+	(eof-value (gensym))
 	(strm (gensym)))
-    `(let ((,strm ,stream))
-       (do ((,var (read-line stream nil ,eof) (read-line stream nil ,eof)))
-	   (eq ,var ,eof)
-	 ,@body))))
+    `(let ((,strm ,stream)
+	   (,eof ',eof-value))
+      (do ((,var (read-line ,strm nil ,eof) (read-line ,strm nil ,eof)))
+	  ((eql ,var ,eof))
+	,@body))))
 
 (defmacro with-each-file-line ((var file) &body body)
   (let ((stream (gensym)))
-    `(with-open-file (,stream file :direction :input)
-         (with-each-stream-line (,var ,stream)
-	    ,@body))))
+    `(with-open-file (,stream ,file :direction :input)
+      (with-each-stream-line (,var ,stream)
+	,@body))))
 
 		
 ;;; Keyword functions
@@ -383,9 +385,9 @@
 
 (defun file-subst (old new file1 file2)
   (with-open-file (in file1 :direction :input)
-     (with-open-file (out file2 :direction :output
-                                :if-exists :supersede)
-       (stream-subst old new in out))))
+    (with-open-file (out file2 :direction :output
+			 :if-exists :supersede)
+      (stream-subst old new in out))))
 
 (defun stream-subst (old new in out)
   (declare (string old new))