X-Git-Url: http://git.kpe.io/?p=umlisp.git;a=blobdiff_plain;f=package.lisp;h=3771a51eb21853c40fc79e1517ae2e862d43a0ff;hp=259c5f470fa2938a43737f7addeec090af5627ba;hb=a58ac3e24919f15c832aafde4f0d0c40df8f353e;hpb=750cc1891b279fb8fa6a9e4e8bd699a0cb874485

diff --git a/package.lisp b/package.lisp
index 259c5f4..3771a51 100644
--- a/package.lisp
+++ b/package.lisp
@@ -2,15 +2,15 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          package.lisp
-;;;; Purpose:       Package definition for UMLisp
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Apr 2000
+;;;; Name:     package.lisp
+;;;; Purpose:  Package definition for UMLisp
+;;;; Author:   Kevin M. Rosenberg
+;;;; Created:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.29 2003/07/21 09:46:22 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2003 by Kevin M. Rosenberg, M.D.
+;;;;    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.
@@ -18,51 +18,50 @@
 
 (in-package #:cl-user)
 
-(defpackage #:umlisp
+(eval-when (:compile-toplevel :load-toplevel :execute) ;; enclose reader macro
+  (defpackage #:umlisp
   (:nicknames #:u)
   (:use #:kmrcl #:common-lisp #:hyperobject)
-  (:export 
-   
+  (:export
+   #:dummy
+   .
    ;; From classes.lisp
-   #:umlsclass
-   #:ucon #:uterm #:ustr #:usrl #:uso #:ucxt #:urank #:udef #:usat #:usab #:ulo
-   #:urel #:ucoc #:usty #:uatx #: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
-   #:rl #:sty2 #:ui #:ui2 #:ui3 #:eui #:bas #:eui2 #:bas2
-   #:cui #:lui #:sui #:wd #:lat #:nstr :cuilist
-   #:rsab #:lat
-   #: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 #:isn #:fr #:un #:sna #:soui #:hcd #:stt #:str
-   
+   #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 #:suppress #:atn #:atv #:vcui
+       #:rcui #:vsab #:code #:saui #:scui #:sdui #:ispref
+       #: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
+       #:kpfeng :cvf
+
    ;; 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
+   #:fmt-cui #:fmt-tui #:fmt-sui #:fmt-eui #:fmt-tui #:fmt-aui
    #: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
-   #:ucon-ancestors #:ucon-parents
    #: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!
-   #:with-sql-connection
-   #:mutex-sql-execute
-   #:mutex-sql-query
-   #:with-mutex-sql
-   #:sql-query
-   #:sql-execute
-   
+   #:umls-sql-type!
+
    ;; From utils.lisp
    #:fmt-cui
    #:fmt-lui
@@ -73,30 +72,30 @@
    #:find-ustr-in-ucon
    #:*current-srl*
    #:parse-cui #:parse-lui #:parse-sui #:parse-tui #:parse-eui
-   
+
    ;; From sql-classes.lisp
-   
+
    #: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
    #:print-umlsclass
-   #:find-ucon-cui
-   #:find-ucon-cui-sans-pfstr
+   #:find-ucon-cui #:make-ucon-cui
+   #:find-uconso-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
@@ -109,6 +108,8 @@
    #:find-ustr-all
    #:find-string-sui
    #:find-uso-cuisui
+   #:find-uso-cui
+   #:find-uso-aui
    #:find-ucxt-cuisui
    #:find-usat-ui
    #:find-usab-all
@@ -125,6 +126,9 @@
    #: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
@@ -164,7 +168,7 @@
    #:find-btty-all
    #:find-btty-tty
    #:find-brel-rel
-   
+
    ;; composite.lisp
    #:tui-finding
    #:tui-sign-or-symptom
@@ -184,8 +188,12 @@
    #:ustr_freq
    #:usty_freq
    #:usrl_freq
-   ))
-
+   )))
 
+(defpackage umlisp-user
+  (:use  #:kmrcl #:common-lisp #:hyperobject)
+  (:import-from :umlisp . #1#)
+  (:export . #1#)
+  (:documentation "User package for UMLisp")))