X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=parse-macros.lisp;h=66a54fda13d8894651b37fc6a25356f15bf7dc71;hb=3adbc09e353b3c4dc09c8c9da6cddee8075eaa14;hp=65a608cf42d694d6d5c082566918a4c1af63157b;hpb=cc0d0f58d7261d12a8d6a89153f58ea693618e79;p=umlisp.git

diff --git a/parse-macros.lisp b/parse-macros.lisp
index 65a608c..66a54fd 100644
--- a/parse-macros.lisp
+++ b/parse-macros.lisp
@@ -2,15 +2,15 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          parse-macros.lisp
-;;;; Purpose:       Macros for UMLS file parsing
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Apr 2000
+;;;; Name:         parse-macros.lisp
+;;;; Purpose:      Macros for UMLS file parsing
+;;;; Author:       Kevin M. Rosenberg
+;;;; Date Started: Apr 2000
 ;;;;
-;;;; $Id: parse-macros.lisp,v 1.4 2003/05/06 01:34:57 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2003 by Kevin M. Rosenberg, M.D.
 ;;;;
 ;;;; UMLisp users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the GNU General Public License.
@@ -18,41 +18,43 @@
 
 (in-package #:umlisp)
 
-
 (defmacro with-umls-file ((line filename) &body body)
 "Opens a UMLS and processes each parsed line with (body) argument"
   (let ((ustream (gensym "STRM-"))
 	(eof (gensym "EOF-")))
-    `(with-open-file
-	 (,ustream (umls-pathname ,filename) :direction :input)
-       (do ((,line (read-umls-line ,ustream ,eof)
-		   (read-umls-line ,ustream ,eof)))
-	   ((eq ,line 'eof) t)
-	 ,@body))))
+    `(let ((,eof (gensym "EOFSYM-")))
+      (with-open-file
+	  (,ustream (umls-pathname ,filename) :direction :input)
+	(do ((,line (read-umls-line ,ustream ,eof)
+		    (read-umls-line ,ustream ,eof)))
+	    ((eq ,line ,eof) t)
+	  ,@body)))))
 
 (defmacro with-buffered-umls-file ((line filename) &body body)
   "Opens a UMLS and processes each parsed line with (body) argument"
   (let ((ustream (gensym "STRM-"))
 	(buffer (gensym "BUF-"))
 	(eof (gensym "EOF-")))
-    `(let ((,buffer (make-fields-buffer)))
-       (with-open-file
-	   (,ustream (umls-pathname ,filename) :direction :input)
-	 (do ((,line (read-buffered-fields ,buffer ,ustream #\| ,eof)
-		     (read-buffered-fields ,buffer ,ustream #\| ,eof)))
-	     ((eq ,line ,eof) t)
-	   ,@body)))))
+    `(let ((,buffer (make-fields-buffer))
+	   (,eof (gensym "EOFSYM-")))
+      (with-open-file
+	  (,ustream (umls-pathname ,filename) :direction :input)
+	(do ((,line (read-buffered-fields ,buffer ,ustream #\| ,eof)
+		    (read-buffered-fields ,buffer ,ustream #\| ,eof)))
+	    ((eq ,line ,eof) t)
+	  ,@body)))))
 
 (defmacro with-buffered2-umls-file ((line filename) &body body)
   "Opens a UMLS and processes each parsed line with (body) argument"
   (let ((ustream (gensym "STRM-"))
 	(buffer (gensym "BUF-"))
 	(eof (gensym "EOF-")))
-    `(let ((,buffer (make-fields-buffer2)))
-       (with-open-file
-	   (,ustream (umls-pathname ,filename)
-		     :direction :input :if-exists :overwrite)
-	 (do ((,line (read-buffered-fields ,buffer ,ustream #\| ,eof)
-		     (read-buffered-fields ,buffer ,ustream #\| ,eof)))
-	     ((eq ,line ,eof) t)
-	   ,@body)))))
+    `(let ((,buffer (make-fields-buffer2))
+	   (,eof (gensym "EOFSYM-")))
+      (with-open-file
+	  (,ustream (umls-pathname ,filename)
+	   :direction :input :if-exists :overwrite)
+	(do ((,line (read-buffered-fields ,buffer ,ustream #\| ,eof)
+		    (read-buffered-fields ,buffer ,ustream #\| ,eof)))
+	    ((eq ,line ,eof) t)
+	  ,@body)))))