From cdd0b5094e4db943ad6c9f79018f1dcd4f5bc205 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Tue, 6 May 2003 02:19:46 +0000
Subject: [PATCH 1/1] r4827: Auto commit for Debian build

---
 class-support.lisp |  5 ++---
 parse-macros.lisp  | 47 ++++++++++++++++++++++++----------------------
 sql-create.lisp    |  6 +++---
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/class-support.lisp b/class-support.lisp
index 05b2994..4b88f84 100644
--- a/class-support.lisp
+++ b/class-support.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: class-support.lisp,v 1.2 2003/05/02 05:37:16 kevin Exp $
+;;;; $Id: class-support.lisp,v 1.3 2003/05/06 02:15:41 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -16,8 +16,7 @@
 ;;;; as governed by the terms of the GNU General Public License.
 ;;;; *************************************************************************
 
-(in-package :umlisp)
-(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
+(in-package #:umlisp)
 
 
 ;;; Formatting routines
diff --git a/parse-macros.lisp b/parse-macros.lisp
index 65a608c..224496b 100644
--- a/parse-macros.lisp
+++ b/parse-macros.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: parse-macros.lisp,v 1.4 2003/05/06 01:34:57 kevin Exp $
+;;;; $Id: parse-macros.lisp,v 1.5 2003/05/06 02:19:46 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -23,36 +23,39 @@
 "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)))))
diff --git a/sql-create.lisp b/sql-create.lisp
index c9821fd..9ea3a16 100644
--- a/sql-create.lisp
+++ b/sql-create.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: sql-create.lisp,v 1.9 2003/05/06 02:14:59 kevin Exp $
+;;;; $Id: sql-create.lisp,v 1.10 2003/05/06 02:19:46 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -211,8 +211,8 @@ This is much faster that using create-umls-db-insert."
 
 (defun make-noneng-index-file (extension)
   "Make non-english index file"
-  (translate-file (find-umls-file "MRXW.NONENG" extension
-				   (noneng-lang-index-files))))
+  (translate-file (find-umls-file "MRXW.NONENG") extension
+		  (noneng-lang-index-files)))
 
 (defun pg-copy-cmd (file extension)
   "Return postgresql copy statement for a file"  
-- 
2.34.1