r5080: *** empty log message ***

diff --git a/class-support.lisp b/class-support.lisp
index 50e514f85fa00a988d9f8d47e541a2fc6d96636e..413f31470b94724bfaea8e4173356e49b4084416 100644 (file)
--- a/class-support.lisp
+++ b/class-support.lisp
@@ -7,10 +7,10 @@
 ;;;; Author:       Kevin M. Rosenberg
 ;;;; Date Started: Apr 2000
 ;;;;
-;;;; $Id: class-support.lisp,v 1.10 2003/05/28 21:25:47 kevin Exp $
+;;;; $Id: class-support.lisp,v 1.11 2003/06/10 22:30:16 kevin Exp $
 ;;;;
 ;;;; 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.
@@ -21,8 +21,6 @@
 
 ;;; Formatting routines
 
-
-
 (defgeneric fmt-cui (c))
 (defmethod fmt-cui ((c ucon))
   (fmt-cui (cui c)))

diff --git a/classes.lisp b/classes.lisp
index d88a0cfd800551bc9c452cf85f2bba933def7d7c..803c9e6ee3a87967de925f57ab7f1f4f35c38145 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -7,17 +7,16 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: classes.lisp,v 1.38 2003/05/15 06:32:46 kevin Exp $
+;;;; $Id: classes.lisp,v 1.39 2003/06/10 22:30:16 kevin Exp $
 ;;;;
 ;;;; 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.
 ;;;; *************************************************************************
 
-(in-package :umlisp)
-(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
+(in-package #:umlisp)
 
 (defclass umlsclass (hyperobject)
   ()

diff --git a/composite.lisp b/composite.lisp
index d9e01fd794f455bd978a921715ce49a4cd014b54..e4fbcfe85988ef067e3773660734f94c2569fcdd 100644 (file)
--- a/composite.lisp
+++ b/composite.lisp
@@ -7,10 +7,10 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: composite.lisp,v 1.23 2003/05/27 21:43:41 kevin Exp $
+;;;; $Id: composite.lisp,v 1.24 2003/06/10 22:30:16 kevin Exp $
 ;;;;
 ;;;; 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,9 +18,6 @@
 
 (in-package #:umlisp)
 
-(eval-when (:compile-toplevel)
-  (declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
-
 
 ;;; Semantic type constants
 

diff --git a/create-sql.lisp b/create-sql.lisp
index 8632daab775a4d089aa0b3e900fcd0737c694310..763418d14ef9447cdd8b2ac153c8ffe585370ba0 100644 (file)
--- a/create-sql.lisp
+++ b/create-sql.lisp
@@ -7,10 +7,10 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: create-sql.lisp,v 1.5 2003/05/09 11:02:44 kevin Exp $
+;;;; $Id: create-sql.lisp,v 1.6 2003/06/10 22:30:16 kevin Exp $
 ;;;;
 ;;;; 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,9 +18,6 @@
 
 (in-package #:umlisp)
 
-(eval-when (:compile-toplevel)
-  (declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
-
 (defun create-table-cmd (file)
   "Return sql command to create a table"
   (let ((col-func 

diff --git a/data-structures.lisp b/data-structures.lisp
index 173d4535bd352269b5cd082d66c073e4c04650a3..fc55f9c2599ab63914bada260d7d5f3062198a67 100644 (file)
--- a/data-structures.lisp
+++ b/data-structures.lisp
@@ -7,10 +7,10 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: data-structures.lisp,v 1.11 2003/05/11 22:10:05 kevin Exp $
+;;;; $Id: data-structures.lisp,v 1.12 2003/06/10 22:30:16 kevin Exp $
 ;;;;
 ;;;; 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,9 +18,6 @@
 
 (in-package #:umlisp)
 
-(eval-when (:compile-toplevel)
-  (declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
-
 ;;; Paths for files
 
 (defvar *umls-path*

diff --git a/package.lisp b/package.lisp
index 38ace45039d251a727cc3998534a6be4aa0a8fa2..d8946fbada92e93dedd63276a28ebdc41f5133a8 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -7,19 +7,19 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.19 2003/05/26 14:53:33 kevin Exp $
+;;;; $Id: package.lisp,v 1.20 2003/06/10 22:30:16 kevin Exp $
 ;;;;
 ;;;; 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.
 ;;;; *************************************************************************
 
-(in-package :cl-user)
+(in-package #:cl-user)
 
-(defpackage umlisp
-  (:nicknames :u)
+(defpackage #:umlisp
+  (:nicknames #:u)
   (:use #:kmrcl #:common-lisp #:hyperobject)
   (:export 
    
@@ -37,7 +37,7 @@
    #:s#def #:s#sty #:s#term #:s#str #:s#atx #:s#lo #:s#sat #:s#rel #:s#coc
    #:s#so #:s#cxt
    #:pfstr #:pfstr2 #:lrl #:def #:ts #:cui1 #:cui2 #:rela #:sl #:mg #:rel
-   #:soc #:cot #:cof #:coa
+   #:soc #:cot #:cof #:coa #:isn #:fr #:un #:sna #:soui
    
    ;; From class-support.lisp
    #:ucon-has-tui

diff --git a/parse-2002.lisp b/parse-2002.lisp
index 7dbd52270c2937034e2b79d7061d336fcff144ec..4db164a6581a30704ea91730b86216928b479f66 100644 (file)
--- a/parse-2002.lisp
+++ b/parse-2002.lisp
@@ -8,10 +8,10 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: parse-2002.lisp,v 1.12 2003/05/08 04:36:12 kevin Exp $
+;;;; $Id: parse-2002.lisp,v 1.13 2003/06/10 22:30:16 kevin Exp $
 ;;;;
 ;;;; 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.

diff --git a/parse-common.lisp b/parse-common.lisp
index bf334ca7edeaf15924b72517f80b6f09309541fd..06ad178466e3a1edbe54cacfbc6081c3f3039d9e 100644 (file)
--- a/parse-common.lisp
+++ b/parse-common.lisp
@@ -7,10 +7,10 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: parse-common.lisp,v 1.14 2003/05/09 11:04:06 kevin Exp $
+;;;; $Id: parse-common.lisp,v 1.15 2003/06/10 22:30:16 kevin Exp $
 ;;;;
 ;;;; 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.

diff --git a/parse-macros.lisp b/parse-macros.lisp
index cd7e5017346c594ad5556015c4f890e01e2c27ce..902b3cf5f2f6d1e4c73627fea618068b932d3a90 100644 (file)
--- a/parse-macros.lisp
+++ b/parse-macros.lisp
@@ -7,10 +7,10 @@
 ;;;; Author:       Kevin M. Rosenberg
 ;;;; Date Started: Apr 2000
 ;;;;
-;;;; $Id: parse-macros.lisp,v 1.7 2003/05/07 21:57:06 kevin Exp $
+;;;; $Id: parse-macros.lisp,v 1.8 2003/06/10 22:30:16 kevin Exp $
 ;;;;
 ;;;; 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,9 +18,6 @@
 
 (in-package #:umlisp)
 
-(eval-when (:compile-toplevel)
-  (declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
-
 (defmacro with-umls-file ((line filename) &body body)
 "Opens a UMLS and processes each parsed line with (body) argument"
   (let ((ustream (gensym "STRM-"))

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 5c6ddea8f1e931a7462f4da27d37c67cbf696e2b..1d180d6b5b85cc754bac78c0d9759b17283da557 100644 (file)
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -7,17 +7,16 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: sql-classes.lisp,v 1.83 2003/05/16 08:34:00 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.84 2003/06/10 22:30:16 kevin Exp $
 ;;;;
 ;;;; 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.
 ;;;; *************************************************************************
 
-(in-package :umlisp)
-(declaim (optimize (compilation-speed 0) (debug 3)))
+(in-package # :umlisp)
 
 
 (defvar *current-srl* nil)

diff --git a/sql.lisp b/sql.lisp
index 671e3213be703c208b27053bcd81afb049b9a2f7..6b72a68ef91be2df9f7f2be971ccdb32708ceaf1 100644 (file)
--- a/sql.lisp
+++ b/sql.lisp
@@ -7,10 +7,10 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: sql.lisp,v 1.11 2003/05/06 02:14:59 kevin Exp $
+;;;; $Id: sql.lisp,v 1.12 2003/06/10 22:30:16 kevin Exp $
 ;;;;
 ;;;; 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.

diff --git a/utils.lisp b/utils.lisp
index 6c7d08fa7476b00f57e292b6394f293e07203822..07f297bb8f7391b1515384ca8ae56777ee4c8933 100644 (file)
--- a/utils.lisp
+++ b/utils.lisp
@@ -7,10 +7,10 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: utils.lisp,v 1.6 2003/05/06 02:36:58 kevin Exp $
+;;;; $Id: utils.lisp,v 1.7 2003/06/10 22:30:16 kevin Exp $
 ;;;;
 ;;;; 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,9 +18,6 @@
  
 (in-package #:umlisp)
 
-(eval-when (:compile-toplevel)
-  (declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
-
 (declaim (inline make-cuisui make-cuilui parse-ui parse-cui))
 
 (defmacro def-metaclass-reader (field)
@@ -82,11 +79,16 @@
     eui))
     
 (defconstant +cuisui-scale+ 10000000)
+(proclaim (type fixnum +cuisui-scale+))
 
 (defun make-cuisui (cui sui)
+  (declare (fixnum cui sui)
+          (optimize (speed 3) (safety 0) (space 0)))
   (+ (* +cuisui-scale+ cui) sui))
 
 (defun make-cuilui (cui lui)
+  (declare (fixnum cui sui)
+          (optimize (speed 3) (safety 0) (space 0)))
   (+ (* +cuisui-scale+ cui) lui))
 
 (defun decompose-cuisui (cuisui)