X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=genutils.lisp;h=be156cc325bcfc012e875eb64cc92a50c276b57d;hb=93b0a41567a808a95f8fc07bd7c76cedc5fbfa40;hp=55751ff84fb41faf7ed51fc9cb23b76eb360ae11;hpb=d691dfbbed177726ba5a5313e23568c21e045359;p=kmrcl.git

diff --git a/genutils.lisp b/genutils.lisp
index 55751ff..be156cc 100644
--- a/genutils.lisp
+++ b/genutils.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: genutils.lisp,v 1.7 2002/11/04 19:19:04 kevin Exp $
+;;;; $Id: genutils.lisp,v 1.9 2002/11/07 22:08:41 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -216,7 +216,23 @@
          ((> ,var ,gstop))
        ,@body)))
 
-
+(defmacro with-each-stream-line ((var stream) &body body)
+  (let ((eof (gensym))
+	(eof-value (gensym))
+	(strm (gensym)))
+    `(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))))
+
+		
 ;;; Keyword functions
 
 (defun remove-keyword (key arglist)
@@ -444,30 +460,32 @@
   "Opens a reads a file. Returns the contents as a single string"
   (when (probe-file file)
     (with-open-file (in file :direction :input)
-		    (do ((line (read-line in nil 'eof) 
-			       (read-line in nil 'eof)))
-			((eql line 'eof))
-		      (format strm "~A~%" line)))))
+      (let ((eof (gensym)))		    
+	(do ((line (read-line in nil eof) 
+		   (read-line in nil eof)))
+	    ((eq line eof))
+	  (format strm "~A~%" line))))))
 
 (defun read-file-to-string (file)
   "Opens a reads a file. Returns the contents as a single string"
   (with-output-to-string (out)
     (with-open-file (in file :direction :input)
-      (do ((line (read-line in nil 'eof) 
-		 (read-line in nil 'eof)))
-	  ((eql line 'eof))
-	(format out "~A~%" line)))))
+      (let ((eof (gensym)))		    
+	(do ((line (read-line in nil eof) 
+		   (read-line in nil eof)))
+	    ((eq line eof))
+	  (format out "~A~%" line))))))
 
 (defun read-file-to-strings (file)
   "Opens a reads a file. Returns the contents as a list of strings"
   (let ((lines '()))
     (with-open-file (in file :direction :input)
-      (do ((line (read-line in nil 'eof) 
-		 (read-line in nil 'eof)))
-	  ((eql line 'eof))
-	(push line lines)))
-    (nreverse lines)))
-
+      (let ((eof (gensym)))		    
+	(do ((line (read-line in nil eof) 
+		   (read-line in nil eof)))
+	    ((eq line eof))
+	  (push line lines)))
+      (nreverse lines))))
 
 
 ;;; Formatting functions