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

diff --git a/genutils.lisp b/genutils.lisp
index e13e46c..6125aba 100644
--- a/genutils.lisp
+++ b/genutils.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: genutils.lisp,v 1.6 2002/11/04 18:02:13 kevin Exp $
+;;;; $Id: genutils.lisp,v 1.8 2002/11/07 04:07:02 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -216,7 +216,21 @@
          ((> ,var ,gstop))
        ,@body)))
 
-
+(defmacro with-each-stream-line ((var stream) &body body)
+  (let ((eof (gensym))
+	(strm (gensym)))
+    `(let ((,strm ,stream))
+       (do ((,var (read-line stream nil ,eof) (read-line stream nil ,eof)))
+	   (eq ,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)
@@ -294,8 +308,9 @@
 
 (defun indent-spaces (n &optional (stream *standard-output*))
   "Indent n*2 spaces to output stream"
-  (let ((fmt (format nil "~~~DT" (+ n n))))
-    (format stream fmt)))
+  (when (numberp n)
+    (let ((fmt (format nil "~~~DT" (+ n n))))
+      (format stream fmt))))
 
 (defun print-list (l &optional (output *standard-output*))
   "Print a list to a stream"
@@ -443,30 +458,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