From: Kevin M. Rosenberg Date: Tue, 10 Jun 2003 22:30:16 +0000 (+0000) Subject: r5080: *** empty log message *** X-Git-Tag: v2006ac.2~146 X-Git-Url: http://git.kpe.io/?p=umlisp.git;a=commitdiff_plain;h=2038ce2f480179fd23cb3ded6fa1250e61e22029 r5080: *** empty log message *** --- diff --git a/class-support.lisp b/class-support.lisp index 50e514f..413f314 100644 --- 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 d88a0cf..803c9e6 100644 --- 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 d9e01fd..e4fbcfe 100644 --- 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 8632daa..763418d 100644 --- 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 173d453..fc55f9c 100644 --- 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 38ace45..d8946fb 100644 --- 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 7dbd522..4db164a 100644 --- 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 bf334ca..06ad178 100644 --- 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 cd7e501..902b3cf 100644 --- 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 5c6ddea..1d180d6 100644 --- 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 671e321..6b72a68 100644 --- 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 6c7d08f..07f297b 100644 --- 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)