From c9b360e8ceb124257024acc187024e4b232423c6 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Wed, 9 Oct 2002 02:28:03 +0000
Subject: [PATCH] r2954: *** empty log message ***

---
 classes.lisp | 74 ++++++++++++++++++++++++++--------------------------
 package.lisp |  3 +--
 2 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/classes.lisp b/classes.lisp
index 9a180ef..b64c40f 100644
--- a/classes.lisp
+++ b/classes.lisp
@@ -1,4 +1,4 @@
-;;; $Id: classes.lisp,v 1.1 2002/10/08 22:08:56 kevin Exp $
+;;; $Id: classes.lisp,v 1.2 2002/10/09 02:23:22 kevin Exp $
 ;;;
 ;;; UMLS object defintions and printing routines
 
@@ -7,17 +7,17 @@
 
 (defclass umlsclass ()
   ()
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:documentation "Parent class of all UMLS objects"))
 
 
 (defmethod print-object ((obj umlsclass) (s stream))
   (print-unreadable-object (obj s :type t :identity t)
-    (let ((fmt (make-instance 'gu.ml::textformat)))
+    (let ((fmt (make-instance 'kmrcl::textformat)))
       (apply #'format 
-	     s (funcall (gu.ml::obj-data-fmtstr fmt) obj)
+	     s (funcall (kmrcl::obj-data-fmtstr fmt) obj)
 	     (multiple-value-list 
-	      (funcall (funcall (gu.ml::obj-data-value-func fmt) obj) obj))))))
+	      (funcall (funcall (kmrcl::obj-data-value-func fmt) obj) obj))))))
 
 
 
@@ -27,7 +27,7 @@
    (sab :type string :initarg :sab :reader sab)
    (tty :type string :initarg :tty :reader tty)
    (supres :type string :initarg :supres :reader supres))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :rank nil :sab nil :tty nil :supres nil)
   (:title "Rank")
   (:fields (rank :fixnum) (sab :string) (tty :string) (supres :string)))
@@ -35,7 +35,7 @@
 (defclass udef (umlsclass)
   ((def :type string :initarg :def :reader def)
    (sab :type string :initarg :sab :reader sab))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :def nil :sab nil)
   (:title "Definition")
   (:ref-fields (sab find-bsab-sab))
@@ -46,7 +46,7 @@
    (code :type string :initarg :code :reader code)
    (atn :type string :initarg :atn :reader atn)
    (atv :type string :initarg :atv :reader atv))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :sab nil :code nil :atn nil :atv nil)
   (:title "Simple Attribute")
   (:ref-fields (sab find-bsab-sab))
@@ -57,7 +57,7 @@
    (code :type string :initarg :code :reader code)
    (tty :type string :initarg :tty :reader tty)
    (srl :type fixnum :initarg :srl :reader srl))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :sab nil :code nil :tty nil :srl nil)
   (:title "Source")
   (:ref-fields (sab find-bsab-sab) (tty find-btty-tty))
@@ -74,7 +74,7 @@
    (hcd :type string :initarg :hcd :reader hcd)
    (rela :type string :initarg :rela :reader rela)
    (xc :type string  :initarg :xc :reader xc))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :sab nil :code nil :rnk nil :cxn nil :cxl nil :cxs nil
 		     :cui2 nil :hcd nil :rela nil :xc nil)
   (:title "Context")
@@ -95,7 +95,7 @@
    (s#sat :reader s#sat)
    (s#so :reader s#so)
    (s#cxt :reader s#cxt))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs 
    :sui nil :cui nil :lui nil :cuisui nil :str nil :lrl nil :stt nil)
   (:title "String")
@@ -110,7 +110,7 @@
    (sui :type fixnum :initarg :sui :reader sui)
    (sna :type string :initarg :sna :reader sna)
    (soui :type string :initarg :soui :reader soui))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :isn nil :fr nil :un nil :sui nil :sna nil :soui nil)
   (:title "Locator")
   (:fields (isn :string) (fr :fixnum) (un :string) (sna :string)
@@ -124,7 +124,7 @@
    (lrl :type fixnum :initarg :lrl :reader lrl)
    (s#str :reader s#str)
    (s#sat :reader s#sat))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :lui nil :cui nil :lat nil :ts nil :lrl nil)
   (:title "Term")
   (:subobjects-lists (s#sat usat) (s#str ustr))
@@ -134,7 +134,7 @@
 (defclass usty (umlsclass)
   ((tui :type fixnum :initarg :tui :reader tui)
    (sty :type string :initarg :sty :reader sty))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :tui nil :sty nil)
   (:title "Semantic Type")
   (:ref-fields (tui find-ucon-tui (("subobjects" "no"))))
@@ -149,7 +149,7 @@
    (sab :type string :initarg :sab :reader sab)
    (sl :type string  :initarg :sl :reader sl)
    (mg :type string  :initarg :mg :reader mg))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs 
    :rel nil :cui1 nil :cui2 nil :pfstr2 nil :rela nil :sab nil :sl nil :mg nil)
   (:title "Relationship")
@@ -165,7 +165,7 @@
    (cot :type string :initarg :cot :reader cot)
    (cof :type fixnum :initarg :cof :reader cof)
    (coa :type string :initarg :coa :reader coa))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs 
    :cui1 nil :cui2 nil :pfstr2 nil :soc nil :cot nil :cof nil :coa nil)
   (:title "Co-occuring Concept")
@@ -178,7 +178,7 @@
   ((sab :type string :initarg :sab :reader sab)
    (rel :type string :initarg :rel :reader rel)
    (atx :type string :initarg :atx :reader atx))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :sab nil :rel nil :atx nil)
   (:title "Associated Expression")
   (:fields (sab :string) (rel :string) (atx :cdata)))
@@ -195,7 +195,7 @@
    (s#sat :reader s#sat)
    (s#atx :reader s#atx)
    (s#sty :reader s#sty))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :cui nil :pfstr nil :lrl nil)
   (:title "Concept")
   (:subobjects-lists 
@@ -209,7 +209,7 @@
    (cui :type fixnum :initform nil :initarg :cui :reader cui)
    (lui :type fixnum :initform nil :initarg :lui :reader lui)
    (sui :type fixnum :initform nil :initarg :sui :reader sui))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :wd nil :cui nil :lui nil :sui nil)
   (:title "XW Index")
   (:fields (wd :string) (cui :string fmt-cui) (lui :string fmt-lui) 
@@ -219,7 +219,7 @@
   ((lat :type string :initarg :lat :reader lat)
    (nwd :type string :initarg :nwd :reader nwd)
   (cuilist :type list :initarg :cuilist :reader uxnw-cuilist))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :lat nil :nwd nil :cuilist nil)
   (:title "XNW Index")
   (:fields (lat :string) (nwd :string) (cuilist :string)))
@@ -228,7 +228,7 @@
   ((lat :type string :initarg :lat :reader lat)
    (nstr :type string :initarg :nstr :reader nstr)
    (cuilist :type list :initarg :cuilist :reader cuilist))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :lat nil :nstr nil :cuilist nil)
   (:title "XNS Index")
   (:fields (lat :string) (nstr :string) (cuilist :string)))
@@ -249,7 +249,7 @@
    (s#spl :reader s#spl)
    (s#trm :reader s#trm)
    (s#typ :reader s#typ))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :eui nil :wrd nil)
   (:title "Lexical Term")
   (:subobjects-lists 
@@ -265,7 +265,7 @@
    (abr :type string :initarg :abr :reader abr)
    (eui2 :type integer :initarg :eui2 :reader eui2)
    (bas2 :type string :initarg :bas2 :reader bas2))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :eui nil :bas nil :abr nil :eui2 nil :bas2 nil)
   (:title "Abbreviations and Acronyms")
   (:fields (eui :string fmt-eui) (bas :string) (abr :string) 
@@ -278,7 +278,7 @@
    (agr :type string :initarg :agr :reader agr)
    (cit :type string :initarg :cit :reader cit)
    (bas :type string :initarg :bas :reader bas))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :eui nil :str nil :sca nil :agr nil :cit nil :bas nil)
   (:title "Agreement and Inflection")
   (:fields (eui :string fmt-eui) (str :string) (sca :string) (agr :string)
@@ -289,7 +289,7 @@
    (bas :type string :initarg :bas :reader bas)
    (sca :type string :initarg :sca :reader sca)
    (com :type string :initarg :com :reader com))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :eui nil :bas nil :sca nil :com nil)
   (:title "Complementation")
   (:fields (eui :string fmt-eui) (bas :string) (sca :string) (com :string)))
@@ -300,7 +300,7 @@
    (sca :type string :initarg :sca :reader sca)
    (psnmod :type string :initarg :psnmod :reader psnmod)
    (fea :type string :initarg :fea :reader fea))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :eui nil :bas nil :sca nil :psnmod nil :fea nil)
   (:title "Modifiers")
   (:fields (eui :string fmt-eui) (bas :string) (sca :string) (psnmod :string) 
@@ -313,7 +313,7 @@
    (eui2 :type integer :initarg :eui2 :reader eui2)
    (bas2 :type string :initarg :bas2 :reader bas2)
    (sca2 :type string :initarg :sca2 :reader sca2))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :eui nil :bas nil :sca nil :eui2 nil :bas2 nil :sca2 nil)
   (:title "Nominalizations")
   (:fields (eui :string fmt-eui) (bas :string) (sca :string) 
@@ -328,7 +328,7 @@
    (pos :type string :initarg :pos :reader pos)
    (qnt :type string :initarg :qnt :reader qnt)
    (fea :type string :initarg :fea :reader fea))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :eui nil :bas nil :num nil :gnd nil :cas nil
 		     :pos nil :qnt nil :fea nil)
   (:title "Pronouns")
@@ -341,7 +341,7 @@
    (str :type string :initarg :str :reader str)
    (sca :type string :initarg :sca :reader sca)
    (fea :type string :initarg :fea :reader fea))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :eui nil :bas nil :str nil :sca nil :fea nil)
   (:title "Properties")
   (:fields (eui :string fmt-eui) (bas :string) (str :string) (sca :string) 
@@ -352,7 +352,7 @@
   ((eui :type integer :initarg :eui :reader eui)
    (spv :type string :initarg :spv :reader spv)
    (bas :type string :initarg :bas :reader bas))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :eui nil :spv nil :bas nil)
   (:title "Spelling Variants")
   (:fields (eui :string fmt-eui) (spv :string) (bas :string)))
@@ -363,7 +363,7 @@
   ((eui :type integer :initarg :eui :reader eui)
    (bas :type string :initarg :bas :reader bas)
    (gen :type string :initarg :gen :reader gen))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :eui nil :bas nil :gen nil)
   (:title "Trade Marks")
   (:fields (eui :string fmt-eui) (bas :string) (gen :string)))
@@ -373,7 +373,7 @@
    (bas :type string :initarg :bas :reader bas)
    (sca :type string :initarg :sca :reader sca)
    (typ :type string :initarg :typ :reader typ))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :eui nil :bas nil :sca nil :typ nil)
   (:title "Inflection Type")
   (:fields (eui :string fmt-eui) (bas :string) (sca :string) (typ :string)))
@@ -381,7 +381,7 @@
 (defclass lwd (umlsclass)
   ((wrd :type string :initarg :wrd :reader wrd)
    (euilist :type list :initarg :euilist :reader euilist))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :wrd nil :euilist nil)
   (:title "Lexical Word Index")
   (:fields (wrd :string) (euilist :string)))
@@ -399,7 +399,7 @@
    (rh :type string :initarg :rh :reader rh)
    (abr :type string :initarg :abr :reader abr)
    (rin :type string :initarg :rin :reader rin))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs 
    :rt nil :ui nil :styrl nil :stnrtn nil :def nil :ex nil :un nil :rh nil 
    :abr nil :rin nil)
@@ -414,7 +414,7 @@
    (rl :type string :initarg :rl :reader rl)
    (styrl2 :type string :initarg :styrl2 :reader styrl2)
    (ls :type string :initarg :ls :reader ls))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :styrl nil :rl nil :styrl2 nil :ls nil)
   (:title "Structure of the Network")
   (:fields (styrl :string) (rl :string) (styrl2 :string) (ls :string)))
@@ -423,7 +423,7 @@
   ((ui :type integer :initarg :ui :reader ui)
    (ui2 :type integer :initarg :ui2 :reader ui2)
    (ui3 :type integer :initarg :ui3 :reader ui3))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :ui nil :ui2 nil :ui3 nil)
   (:title "Fully Inherited Set of Releatons (TUI's)")
   (:fields (ui :string fmt-tui) (ui2 :string fmt-tui) (ui3 :string fmt-tui)))
@@ -432,7 +432,7 @@
   ((sty :type string :initarg :ui :reader sty)
    (rl :type string :initarg :ui2 :reader rl)
    (sty2 :type string :initarg :ui3 :reader sty2))
-  (:metaclass ml-class)
+  (:metaclass kmrcl::ml-class)
   (:default-initargs :sty nil :rl nil :sty2 nil)
   (:title "Fully Inherited Set of Releatons (strings)")
   (:fields (sty :string) (rl :string) (sty2 :string)))
diff --git a/package.lisp b/package.lisp
index 9cd24db..9cc3644 100644
--- a/package.lisp
+++ b/package.lisp
@@ -1,4 +1,4 @@
-;;;; $Id: package.lisp,v 1.2 2002/10/09 00:34:47 kevin Exp $
+;;;; $Id: package.lisp,v 1.3 2002/10/09 02:23:22 kevin Exp $
 ;;;; 
 ;;;; Package definition for UMLisp
 
@@ -6,7 +6,6 @@
 
 (defpackage umlisp
   (:nicknames :u)
-  (:uses :kmrcl)
   (:export 
    #:ucon
    #:uterm
-- 
2.34.1