From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Thu, 7 Nov 2002 22:08:41 +0000 (+0000)
Subject: r3333: *** empty log message ***
X-Git-Tag: v1.96~297
X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=commitdiff_plain;h=93b0a41567a808a95f8fc07bd7c76cedc5fbfa40

r3333: *** empty log message ***
---

diff --git a/debian/changelog b/debian/changelog
index f85fa45..07e1da5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cl-kmrcl (1.20.1-1) unstable; urgency=low
+
+  * Add with-each-file-line & with-each-stream-line to export list, fix
+    bugs in those functions
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed,  7 Nov 2002 14:52:39 -0700
+
 cl-kmrcl (1.20-1) unstable; urgency=low
 
   * Add with-each-stream-line, with-each-file-line
diff --git a/genutils.lisp b/genutils.lisp
index 6125aba..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.8 2002/11/07 04:07:02 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
 ;;;;
@@ -218,15 +218,17 @@
 
 (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)
+    `(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-open-file (,stream ,file :direction :input)
          (with-each-stream-line (,var ,stream)
 	    ,@body))))
 
diff --git a/package.lisp b/package.lisp
index 7341fe5..afb5385 100644
--- a/package.lisp
+++ b/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.11 2002/11/03 20:10:48 kevin Exp $
+;;;; $Id: package.lisp,v 1.12 2002/11/07 22:08:41 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -75,6 +75,8 @@
 	  #:stream-subst
 	  #:remove-tree-if
 	  #:find-tree
+	  #:with-each-file-line
+	  #:with-each-stream-line
 	  #:print-file-contents
 	  #:read-file-to-string
 	  #:read-file-to-strings