r11209: fix test

[umlisp.git] / package.lisp

diff --git a/package.lisp b/package.lisp
index 9cd24dbfb14f30cb5f0fb19a104eb7c497a35ece..1d39df0e2f810ef7fa70a0784fa9a4c06d957483 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -1,35 +1,101 @@
-;;;; $Id: package.lisp,v 1.2 2002/10/09 00:34:47 kevin Exp $
-;;;; 
-;;;; Package definition for UMLisp
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: cl-user -*-
+;;;; *************************************************************************
+;;;; FILE IDENTIFICATION
+;;;;
+;;;; Name:     package.lisp
+;;;; Purpose:  Package definition for UMLisp
+;;;; Author:   Kevin M. Rosenberg
+;;;; Created:  Apr 2000
+;;;;
+;;;; $Id$
+;;;;
+;;;; This file, part of UMLisp, is
+;;;;    Copyright (c) 2000-2006 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)
+
+(eval-when (:compile-toplevel :load-toplevel :execute) ;; enclose reader macro
+  (defpackage #:umlisp
+  (:nicknames #:u)
+  (:use #:kmrcl #:common-lisp #:hyperobject)
+  (:export
+   #:dummy
+   .
+   ;; From classes.lisp
+   #1=(#:umlsclass
+       #:ucon #:uterm #:ustr #:usrl #:uso #:ucxt #:urank #:udef #:usat #:usab #:ulo
+       #:urel #:ucoc #:usty #:uxw #:uxnw  #:uxns
+       #:lexterm #:labr #:lagr #:lcmp #:lmod #:lnom #:lprn #:lprp #:lspl #:ltrm
+       #:ltyp #:lwd #:sdef #:sstr #:sstre1 #:sstre2
+       #:sty #:tui #:def #:sab #:srl #:tty #:rank #:supres #:atn #:atv #:vcui
+       #:rcui #:vsab #:code #:saui :scui :sdui
+       #:rl #:sty2 #:ui #:ui2 #:ui3 #:eui #:bas #:eui2 #:bas2 #:rui
+       #:cui #:aui #:lui #:sui #:wd #:lat #:nstr :cuilist
+       #:rsab #:lat
+       #:s#def #:s#sty #:s#term #:s#str #: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 #:isn #:fr #:un #:sna #:soui #:hcd #:stt #:str
+
+   ;; From class-support.lisp
+   #:ucon-has-tui
+   #:english-term-p #:remove-non-english-terms #:remove-english-terms
+   #:fmt-cui #:fmt-tui #:fmt-sui #:fmt-eui #:fmt-tui
+   #:display-con #:display-term #:display-str
+   #:pfstr #:pf-ustr
+   #:cui-p #:lui-p #:sui-p #:tui-p #:eui-p
+   #:rel-abbr-info #:filter-urels-by-rel
+   #:mesh-number #:cxt-ancestors #:ucon-ustrs
+   #:lat-abbr-info #:stt-abbr-info
+   #:uso-unique-codes #:ucon-has-sab
+
+   ;; From sql.lisp
+   #:*umls-sql-db*
+   #:umls-sql-user!
+   #:umls-sql-passwd!
+   #:umls-sql-db!
+   #:umls-sql-host!
+   #:umls-sql-type!
+
+   ;; From utils.lisp
+   #:fmt-cui
+   #:fmt-lui
+   #:fmt-sui
+   #:fmt-tui
+   #:find-uterm-in-ucon
+   #:find-ustr-in-uterm
+   #:find-ustr-in-ucon
+   #:*current-srl*
+   #:parse-cui #:parse-lui #:parse-sui #:parse-tui #:parse-eui
+
+   ;; From sql-classes.lisp
 
-(defpackage umlisp
-  (:nicknames :u)
-  (:uses :kmrcl)
-  (:export 
-   #:ucon
-   #:uterm
-   #:ustr
    #:find-udef-cui
    #:find-usty-cui
    #:find-usty-word
    #:find-urel-cui
+   #:find-cui2-urel-cui
    #:find-urel-cui2
    #:find-ucon-rel-cui2
    #:find-ucoc-cui
    #:find-ucoc-cui2
    #:find-ucon-coc-cui2
+   #:find-usty-sty
    #:find-ulo-cui
    #:suistr
-   #:find-uatx-cui
-   #:display-umls-obj
-   #:find-ucon-cui
+   #:print-umlsclass
+   #:find-ucon-cui #:make-ucon-cui
    #:find-ucon-lui
    #:find-ucon-sui
    #:find-ucon-cuisui
    #:find-ucon-str
    #:find-ucon-all
+   #:find-cui-ucon-all
+   #:map-ucon-all
    #:find-uterm-cui
    #:find-uterm-lui
    #:find-uterm-cuilui
@@ -41,13 +107,13 @@
    #:find-ustr-all
    #:find-string-sui
    #:find-uso-cuisui
+   #:find-uso-cui
+   #:find-uso-aui
    #:find-ucxt-cuisui
    #:find-usat-ui
-   #:find-bsab-sab
-   #:find-bsab-all
-   #:find-btty-tty
-   #:find-btty-all
-   #:find-brel-rel
+   #:find-usab-all
+   #:find-usab-rsab
+   #:find-usab-vsab
    #:find-pfstr-cui
    #:find-ustr-in-uterm
    #:find-usty-tui
@@ -59,8 +125,14 @@
    #:find-ucon-tui
    #:find-ucon-word
    #:find-ucon-normalized-word
+   #:find-cui-normalized-word
+   #:find-lui-normalized-word
+   #:find-sui-normalized-word
    #:find-ustr-word
    #:find-ustr-normalized-word
+   #:find-uterm-multiword
+   #:find-uterm-word
+   #:find-uterm-normalized-word
    #:find-ucon-multiword
    #:find-ucon-normalized-multiword
    #:find-ustr-multiword
@@ -85,11 +157,18 @@
    #:find-sstr2-sty
    #:find-sstr-rl
    #:find-sstr-styrl
-   #:disp-con
-   #:disp-term
-   #:disp-str
-   
-   ;; composite.cl
+   #:display-con
+   #:display-term
+   #:display-str
+   #:find-ustats-all
+   #:find-ustats-srl
+   #:find-bsab-sab
+   #:find-bsab-all
+   #:find-btty-all
+   #:find-btty-tty
+   #:find-brel-rel
+
+   ;; composite.lisp
    #:tui-finding
    #:tui-sign-or-symptom
    #:tui-disease-or-syndrome
@@ -108,47 +187,12 @@
    #:ustr_freq
    #:usty_freq
    #:usrl_freq
-   
-   #:umlisp-user
-   #:ustats
-   #:usrl
-   #:bsab
-   #:btty
-   #:brel
-   #:batn
-   #:urank
-   #:urel
-   #:usat
-   #:uso
-   #:ucxt
-   #:ustr
-   #:ulo
-   #:uterm
-   #:usty
-   #:urel
-   #:ucoc
-   #:uatx
-   #:ucon
-   #:uxw
-   #:uxnw
-   #:uxns
-   #:lexterm
-   #:labr
-   #:lagr
-   #:lcmp
-   #:lmod
-   #:lmod
-   #:lprn
-   #:prp
-   #:lspl
-   #:ltrm
-   #:ltyp
-   #:sdef
-   #:sstr
-   #:sstre1
-   #:sstre2
-   ))
-
+   )))
 
+(defpackage umlisp-user
+  (:use  #:kmrcl #:common-lisp #:hyperobject)
+  (:import-from :umlisp . #1#)
+  (:export . #1#)
+  (:documentation "User package for UMLisp")))