r4827: Auto commit for Debian build

diff --git a/class-support.lisp b/class-support.lisp
index 05b29941f5a3d94a6447918787a66f364a6e4b62..4b88f846d2bc8b2820f0edd47646d619ea2778e6 100644 (file)
--- 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 65a608cf42d694d6d5c082566918a4c1af63157b..224496bc58efca1dc3f15a7523f508860e6457e7 100644 (file)
--- 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 c9821fd742e7f77a108b89fcdcd5b4d9bc4cf813..9ea3a1667bfdb28d23b48fb23f4bf7867ff124b0 100644 (file)
--- 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"