From f1ceffd73c7e181db3b2a739b7dbc64243cfca2d Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 14 Dec 2002 02:36:42 +0000 Subject: [PATCH] r3627: *** empty log message *** --- classes.lisp | 348 +++++++++++++++++++++++------------------------ composite.lisp | 6 +- debian/changelog | 6 + 3 files changed, 183 insertions(+), 177 deletions(-) diff --git a/classes.lisp b/classes.lisp index abf07fe..40db29a 100644 --- a/classes.lisp +++ b/classes.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id: classes.lisp,v 1.25 2002/12/13 09:16:13 kevin Exp $ +;;;; $Id: classes.lisp,v 1.26 2002/12/14 02:35:28 kevin Exp $ ;;;; ;;;; This file, part of UMLisp, is ;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D. @@ -26,8 +26,8 @@ (defclass usrl (umlsclass) - ((sab :type string :initarg :sab :reader sab) - (srl :type fixnum :initarg :srl :reader srl)) + ((sab :value-type string :initarg :sab :reader sab) + (srl :value-type fixnum :initarg :srl :reader srl)) (:metaclass hyperobject-class) (:default-initargs :sab nil :srl nil) (:user-name "Source Restriction Level") @@ -36,57 +36,57 @@ (defclass urank (umlsclass) - ((rank :type fixnum :initarg :rank :reader rank) - (sab :type string :initarg :sab :reader sab) - (tty :type string :initarg :tty :reader tty) - (supres :type string :initarg :supres :reader supres)) + ((rank :value-type fixnum :initarg :rank :reader rank) + (sab :value-type string :initarg :sab :reader sab) + (tty :value-type string :initarg :tty :reader tty) + (supres :value-type string :initarg :supres :reader supres)) (:metaclass hyperobject-class) (:default-initargs :rank nil :sab nil :tty nil :supres nil) (:user-name "Rank") (:default-print-slots rank sab tty supres)) (defclass udef (umlsclass) - ((def :type cdata :initarg :def :reader def) - (sab :type string :initarg :sab :reader sab :hyperlink find-usab-rsab)) + ((def :value-type cdata :initarg :def :reader def) + (sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab)) (:metaclass hyperobject-class) (:default-initargs :def nil :sab nil) (:user-name "Definition") (:default-print-slots sab def)) (defclass usat (umlsclass) - ((sab :type string :initarg :sab :reader sab :hyperlink find-usab-rsab) - (code :type string :initarg :code :reader code) - (atn :type string :initarg :atn :reader atn) - (atv :type cdata :initarg :atv :reader atv)) + ((sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab) + (code :value-type string :initarg :code :reader code) + (atn :value-type string :initarg :atn :reader atn) + (atv :value-type cdata :initarg :atv :reader atv)) (:metaclass hyperobject-class) (:default-initargs :sab nil :code nil :atn nil :atv nil) (:user-name "Simple Attribute") (:default-print-slots sab code atn atv)) (defclass usab (umlsclass) - ((vcui :type fixnum :initarg :vcui :reader vcui :print-formatter fmt-cui) - (rcui :type fixnum :initarg :rcui :reader rcui :print-formatter fmt-cui) - (vsab :type string :initarg :vsab :reader vsab) - (rsab :type string :initarg :rsab :reader rsab :hyperlink find-ucan-sab) - (son :type string :initarg :son :reader son) - (sf :type string :initarg :sf :reader sf) - (sver :type string :initarg :sver :reader sver) - (mstart :type string :initarg :mstart :reader mstart) - (mend :type string :initarg :mend :reader mend) - (imeta :type string :initarg :imeta :reader imeta) - (rmeta :type string :initarg :rmeta :reader rmeta) - (slc :type cdata :initarg :slc :reader slc) - (scc :type cdata :initarg :scc :reader scc) - (srl :type fixnum :initarg :srl :reader srl) - (tfr :type fixnum :initarg :tfr :reader tfr :print-formatter fmt-comma-integer) - (cfr :type fixnum :initarg :cfr :reader cfr :print-formatter fmt-comma-integer) - (cxty :type string :initarg :cxty :reader cxty) - (ttyl :type string :initarg :ttyl :reader ttyl) - (atnl :type string :initarg :atnl :reader atnl) - (lat :type string :initarg :lat :reader lat) - (cenc :type string :initarg :cenc :reader cenc) - (curver :type string :initarg :curver :reader curver) - (sabin :type string :initarg :sabin :reader sabin)) + ((vcui :value-type fixnum :initarg :vcui :reader vcui :print-formatter fmt-cui) + (rcui :value-type fixnum :initarg :rcui :reader rcui :print-formatter fmt-cui) + (vsab :value-type string :initarg :vsab :reader vsab) + (rsab :value-type string :initarg :rsab :reader rsab :hyperlink find-ucan-sab) + (son :value-type string :initarg :son :reader son) + (sf :value-type string :initarg :sf :reader sf) + (sver :value-type string :initarg :sver :reader sver) + (mstart :value-type string :initarg :mstart :reader mstart) + (mend :value-type string :initarg :mend :reader mend) + (imeta :value-type string :initarg :imeta :reader imeta) + (rmeta :value-type string :initarg :rmeta :reader rmeta) + (slc :value-type cdata :initarg :slc :reader slc) + (scc :value-type cdata :initarg :scc :reader scc) + (srl :value-type fixnum :initarg :srl :reader srl) + (tfr :value-type fixnum :initarg :tfr :reader tfr :print-formatter fmt-comma-integer) + (cfr :value-type fixnum :initarg :cfr :reader cfr :print-formatter fmt-comma-integer) + (cxty :value-type string :initarg :cxty :reader cxty) + (ttyl :value-type string :initarg :ttyl :reader ttyl) + (atnl :value-type string :initarg :atnl :reader atnl) + (lat :value-type string :initarg :lat :reader lat) + (cenc :value-type string :initarg :cenc :reader cenc) + (curver :value-type string :initarg :curver :reader curver) + (sabin :value-type string :initarg :sabin :reader sabin)) (:metaclass hyperobject-class) (:default-initargs :vcui nil :rcui nil :vsab nil :rsab nil :son nil :sf nil :sver nil :mstart nil :mend nil :imeta nil :rmeta nil @@ -99,27 +99,27 @@ curver sabin)) (defclass uso (umlsclass) - ((sab :type string :initarg :sab :reader sab :hyperlink find-usab-rsab) - (code :type string :initarg :code :reader code) - (tty :type string :initarg :tty :reader tty :hyperlink find-btty-tty) - (srl :type fixnum :initarg :srl :reader srl)) + ((sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab) + (code :value-type string :initarg :code :reader code) + (tty :value-type string :initarg :tty :reader tty :hyperlink find-btty-tty) + (srl :value-type fixnum :initarg :srl :reader srl)) (:metaclass hyperobject-class) (:default-initargs :sab nil :code nil :tty nil :srl nil) (:user-name "Source") (:default-print-slots sab code tty srl)) (defclass ucxt (umlsclass) - ((sab :type string :initarg :sab :reader sab :hyperlink find-usab-rsab) - (code :type string :initarg :code :reader code) - (rnk :type fixnum :initarg :rnk :reader rnk) - (cxn :type fixnum :initarg :cxn :reader cxn) - (cxl :type string :initarg :cxl :reader cxl) - (cxs :type cdata :initarg :cxs :reader cxs) - (cui2 :type fixnum :initarg :cui2 :reader cui2 :hyperlink find-ucon-cui + ((sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab) + (code :value-type string :initarg :code :reader code) + (rnk :value-type fixnum :initarg :rnk :reader rnk) + (cxn :value-type fixnum :initarg :cxn :reader cxn) + (cxl :value-type string :initarg :cxl :reader cxl) + (cxs :value-type cdata :initarg :cxs :reader cxs) + (cui2 :value-type fixnum :initarg :cui2 :reader cui2 :hyperlink find-ucon-cui :print-formatter fmt-cui) - (hcd :type string :initarg :hcd :reader hcd) - (rela :type string :initarg :rela :reader rela) - (xc :type string :initarg :xc :reader xc)) + (hcd :value-type string :initarg :hcd :reader hcd) + (rela :value-type string :initarg :rela :reader rela) + (xc :value-type string :initarg :xc :reader xc)) (:metaclass hyperobject-class) (:default-initargs :sab nil :code nil :rnk nil :cxn nil :cxl nil :cxs nil :cui2 nil :hcd nil :rela nil :xc nil) @@ -127,16 +127,16 @@ (:default-print-slots sab code rnk cxn cxl hcd rela xc cui2 cxs)) (defclass ustr (umlsclass) - ((sui :type fixnum :initarg :sui :reader sui :print-formatter fmt-sui + ((sui :value-type fixnum :initarg :sui :reader sui :print-formatter fmt-sui :hyperlink find-ustr-sui) - (cui :type fixnum :initarg :cui :reader cui :print-formatter fmt-cui + (cui :value-type fixnum :initarg :cui :reader cui :print-formatter fmt-cui :hyperlink find-ucon-cui) - (lui :type fixnum :initarg :lui :reader lui :print-formatter fmt-lui + (lui :value-type fixnum :initarg :lui :reader lui :print-formatter fmt-lui :hyperlink find-uterm-lui) - (cuisui :type integer :initarg :cuisui :reader cuisui ) - (str :type cdata :initarg :str :reader str) - (lrl :type fixnum :initarg :lrl :reader lrl) - (stt :type string :initarg :stt :reader stt) + (cuisui :value-type integer :initarg :cuisui :reader cuisui ) + (str :value-type cdata :initarg :str :reader str) + (lrl :value-type fixnum :initarg :lrl :reader lrl) + (stt :value-type string :initarg :stt :reader stt) (s#sat :reader s#sat :subobject (find-usat-ui cui lui sui)) (s#so :reader s#so :subobject (find-uso-cuisui cui sui)) (s#cxt :reader s#cxt :subobject (find-ucxt-cuisui cui sui))) @@ -147,25 +147,25 @@ (:default-print-slots sui stt lrl str)) (defclass ulo (umlsclass) - ((isn :type string :initarg :isn :reader isn) - (fr :type fixnum :initarg :fr :reader fr) - (un :type string :initarg :un :reader un) - (sui :type fixnum :initarg :sui :reader sui :print-formatter fmt-sui) - (sna :type string :initarg :sna :reader sna) - (soui :type string :initarg :soui :reader soui)) + ((isn :value-type string :initarg :isn :reader isn) + (fr :value-type fixnum :initarg :fr :reader fr) + (un :value-type string :initarg :un :reader un) + (sui :value-type fixnum :initarg :sui :reader sui :print-formatter fmt-sui) + (sna :value-type string :initarg :sna :reader sna) + (soui :value-type string :initarg :soui :reader soui)) (:metaclass hyperobject-class) (:default-initargs :isn nil :fr nil :un nil :sui nil :sna nil :soui nil) (:user-name "Locator") (:default-print-slots isn fr un sna soui sui)) (defclass uterm (umlsclass) - ((lui :type fixnum :initarg :lui :reader lui :print-formatter fmt-lui + ((lui :value-type fixnum :initarg :lui :reader lui :print-formatter fmt-lui :hyperlink find-uterm-lui) - (cui :type fixnum :initarg :cui :reader cui :print-formatter fmt-cui + (cui :value-type fixnum :initarg :cui :reader cui :print-formatter fmt-cui :hyperlink find-ucon-cui) - (lat :type string :initarg :lat :reader lat) - (ts :type string :initarg :ts :reader ts) - (lrl :type fixnum :initarg :lrl :reader lrl) + (lat :value-type string :initarg :lat :reader lat) + (ts :value-type string :initarg :ts :reader ts) + (lrl :value-type fixnum :initarg :lrl :reader lrl) (s#str :reader s#str :subobject (find-ustr-cuilui cui lui)) (s#sat :reader s#sat :subobject (find-usat-ui cui lui))) (:metaclass hyperobject-class) @@ -174,24 +174,24 @@ (:default-print-slots lui lat ts lrl)) (defclass usty (umlsclass) - ((tui :type fixnum :initarg :tui :reader tui :print-formatter fmt-tui + ((tui :value-type fixnum :initarg :tui :reader tui :print-formatter fmt-tui :hyperlink (find-ucon-tui ("subobjects" "no"))) - (sty :type string :initarg :sty :reader sty)) + (sty :value-type string :initarg :sty :reader sty)) (:metaclass hyperobject-class) (:default-initargs :tui nil :sty nil) (:user-name "Semantic Type") (:default-print-slots tui sty)) (defclass urel (umlsclass) - ((rel :type string :initarg :rel :reader rel :hyperlink find-brel-rel) - (cui1 :type fixnum :initarg :cui1 :reader cui1 :print-formatter fmt-cui) - (cui2 :type fixnum :initarg :cui2 :reader cui2 :hyperlink find-ucon-sui + ((rel :value-type string :initarg :rel :reader rel :hyperlink find-brel-rel) + (cui1 :value-type fixnum :initarg :cui1 :reader cui1 :print-formatter fmt-cui) + (cui2 :value-type fixnum :initarg :cui2 :reader cui2 :hyperlink find-ucon-sui :print-formatter fmt-cui) - (pfstr2 :type cdata :initarg :pfstr2 :reader pfstr2) - (rela :type string :initarg :rela :reader rela) - (sab :type string :initarg :sab :reader sab :hyperlink find-usab-rsab) - (sl :type string :initarg :sl :reader sl) - (mg :type string :initarg :mg :reader mg)) + (pfstr2 :value-type cdata :initarg :pfstr2 :reader pfstr2) + (rela :value-type string :initarg :rela :reader rela) + (sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab) + (sl :value-type string :initarg :sl :reader sl) + (mg :value-type string :initarg :mg :reader mg)) (:metaclass hyperobject-class) (:default-initargs :rel nil :cui1 nil :cui2 nil :pfstr2 nil :rela nil :sab nil :sl nil :mg nil) @@ -199,14 +199,14 @@ (:default-print-slots rel rela sab sl mg cui2 pfstr2)) (defclass ucoc (umlsclass) - ((cui1 :type fixnum :initarg :cui1 :reader cui1 :print-formatter fmt-cui) - (cui2 :type fixnum :initarg :cui2 :reader cui2 :print-formatter fmt-cui + ((cui1 :value-type fixnum :initarg :cui1 :reader cui1 :print-formatter fmt-cui) + (cui2 :value-type fixnum :initarg :cui2 :reader cui2 :print-formatter fmt-cui :hyperlink find-ucon-cui) - (pfstr2 :type cdata :initarg :pfstr2 :reader pfstr2) - (soc :type string :initarg :soc :reader soc) - (cot :type string :initarg :cot :reader cot) - (cof :type fixnum :initarg :cof :reader cof) - (coa :type cdata :initarg :coa :reader coa)) + (pfstr2 :value-type cdata :initarg :pfstr2 :reader pfstr2) + (soc :value-type string :initarg :soc :reader soc) + (cot :value-type string :initarg :cot :reader cot) + (cof :value-type fixnum :initarg :cof :reader cof) + (coa :value-type cdata :initarg :coa :reader coa)) (:metaclass hyperobject-class) (:default-initargs :cui1 nil :cui2 nil :pfstr2 nil :soc nil :cot nil :cof nil :coa nil) @@ -215,19 +215,19 @@ (defclass uatx (umlsclass) - ((sab :type string :initarg :sab :reader sab) - (rel :type string :initarg :rel :reader rel) - (atx :type cdata :initarg :atx :reader atx)) + ((sab :value-type string :initarg :sab :reader sab) + (rel :value-type string :initarg :rel :reader rel) + (atx :value-type cdata :initarg :atx :reader atx)) (:metaclass hyperobject-class) (:default-initargs :sab nil :rel nil :atx nil) (:user-name "Associated Expression") (:default-print-slots sab rel atx)) (defclass ucon (umlsclass) - ((cui :type fixnum :initarg :cui :reader cui :print-formatter fmt-cui + ((cui :value-type fixnum :initarg :cui :reader cui :print-formatter fmt-cui :hyperlink find-ucon-cui) - (lrl :type fixnum :initarg :lrl :reader lrl) - (pfstr :type cdata :initarg :pfstr :reader pfstr) + (lrl :value-type fixnum :initarg :lrl :reader lrl) + (pfstr :value-type cdata :initarg :pfstr :reader pfstr) (s#term :reader s#term :subobject (find-uterm-cui cui)) (s#def :reader s#def :subobject (find-udef-cui cui)) (s#lo :reader s#lo :subobject (find-ulo-cui cui)) @@ -242,28 +242,28 @@ (:default-print-slots cui lrl pfstr)) (defclass uxw (umlsclass) - ((wd :type string :initarg :wd :reader wd) - (cui :type fixnum :initform nil :initarg :cui :reader cui :print-formatter fmt-cui) - (lui :type fixnum :initform nil :initarg :lui :reader lui :print-formatter fmt-lui) - (sui :type fixnum :initform nil :initarg :sui :reader sui :print-formatter fmt-sui)) + ((wd :value-type string :initarg :wd :reader wd) + (cui :value-type fixnum :initform nil :initarg :cui :reader cui :print-formatter fmt-cui) + (lui :value-type fixnum :initform nil :initarg :lui :reader lui :print-formatter fmt-lui) + (sui :value-type fixnum :initform nil :initarg :sui :reader sui :print-formatter fmt-sui)) (:metaclass hyperobject-class) (:default-initargs :wd nil :cui nil :lui nil :sui nil) (:user-name "XW Index") (:default-print-slots wd cui lui sui)) (defclass uxnw (umlsclass) - ((lat :type string :initarg :lat :reader lat) - (nwd :type string :initarg :nwd :reader nwd) - (cuilist :type list :initarg :cuilist :reader uxnw-cuilist)) + ((lat :value-type string :initarg :lat :reader lat) + (nwd :value-type string :initarg :nwd :reader nwd) + (cuilist :value-type list :initarg :cuilist :reader uxnw-cuilist)) (:metaclass hyperobject-class) (:default-initargs :lat nil :nwd nil :cuilist nil) (:user-name "XNW Index") (:default-print-slots lat nwd cuilist)) (defclass uxns (umlsclass) - ((lat :type string :initarg :lat :reader lat) - (nstr :type string :initarg :nstr :reader nstr) - (cuilist :type list :initarg :cuilist :reader cuilist)) + ((lat :value-type string :initarg :lat :reader lat) + (nstr :value-type string :initarg :nstr :reader nstr) + (cuilist :value-type list :initarg :cuilist :reader cuilist)) (:metaclass hyperobject-class) (:default-initargs :lat nil :nstr nil :cuilist nil) (:user-name "XNS Index") @@ -273,9 +273,9 @@ ;;; LEX objects (defclass lexterm (umlsclass) - ((eui :type fixnum :initarg :eui :reader eui :print-formatter fmt-eui + ((eui :value-type fixnum :initarg :eui :reader eui :print-formatter fmt-eui :hyperlink find-lexterm-eui) - (wrd :type string :initarg :wrd :reader wrd) + (wrd :value-type string :initarg :wrd :reader wrd) (s#abr :reader s#abr :subobject (find-labr-eui eui)) (s#agr :reader s#agr :subobject (find-lagr-eui eui)) (s#cmp :reader s#cmp :subobject (find-lcmp-eui eui)) @@ -293,70 +293,70 @@ (defclass labr (umlsclass) - ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui) - (bas :type string :initarg :bas :reader bas) - (abr :type string :initarg :abr :reader abr) - (eui2 :type integer :initarg :eui2 :reader eui2 :print-formatter fmt-eui) - (bas2 :type string :initarg :bas2 :reader bas2)) + ((eui :value-type integer :initarg :eui :reader eui :print-formatter fmt-eui) + (bas :value-type string :initarg :bas :reader bas) + (abr :value-type string :initarg :abr :reader abr) + (eui2 :value-type integer :initarg :eui2 :reader eui2 :print-formatter fmt-eui) + (bas2 :value-type string :initarg :bas2 :reader bas2)) (:metaclass hyperobject-class) (:default-initargs :eui nil :bas nil :abr nil :eui2 nil :bas2 nil) (:user-name "Abbreviations and Acronyms") (:default-print-slots eui bas abr eui2 bas2)) (defclass lagr (umlsclass) - ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui) - (str :type string :initarg :str :reader str) - (sca :type string :initarg :sca :reader sca) - (agr :type string :initarg :agr :reader agr) - (cit :type string :initarg :cit :reader cit) - (bas :type string :initarg :bas :reader bas)) + ((eui :value-type integer :initarg :eui :reader eui :print-formatter fmt-eui) + (str :value-type string :initarg :str :reader str) + (sca :value-type string :initarg :sca :reader sca) + (agr :value-type string :initarg :agr :reader agr) + (cit :value-type string :initarg :cit :reader cit) + (bas :value-type string :initarg :bas :reader bas)) (:metaclass hyperobject-class) (:default-initargs :eui nil :str nil :sca nil :agr nil :cit nil :bas nil) (:user-name "Agreement and Inflection") (:default-print-slots eui str sca agr cit bas)) (defclass lcmp (umlsclass) - ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui) - (bas :type string :initarg :bas :reader bas) - (sca :type string :initarg :sca :reader sca) - (com :type string :initarg :com :reader com)) + ((eui :value-type integer :initarg :eui :reader eui :print-formatter fmt-eui) + (bas :value-type string :initarg :bas :reader bas) + (sca :value-type string :initarg :sca :reader sca) + (com :value-type string :initarg :com :reader com)) (:metaclass hyperobject-class) (:default-initargs :eui nil :bas nil :sca nil :com nil) (:user-name "Complementation") (:default-print-slots eui bas sca com)) (defclass lmod (umlsclass) - ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui) - (bas :type string :initarg :bas :reader bas) - (sca :type string :initarg :sca :reader sca) - (psnmod :type string :initarg :psnmod :reader psnmod) - (fea :type string :initarg :fea :reader fea)) + ((eui :value-type integer :initarg :eui :reader eui :print-formatter fmt-eui) + (bas :value-type string :initarg :bas :reader bas) + (sca :value-type string :initarg :sca :reader sca) + (psnmod :value-type string :initarg :psnmod :reader psnmod) + (fea :value-type string :initarg :fea :reader fea)) (:metaclass hyperobject-class) (:default-initargs :eui nil :bas nil :sca nil :psnmod nil :fea nil) (:user-name "Modifiers") (:default-print-slots eui bas sca psnmod fea)) (defclass lnom (umlsclass) - ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui) - (bas :type string :initarg :bas :reader bas) - (sca :type string :initarg :sca :reader sca) - (eui2 :type integer :initarg :eui2 :reader eui2 :print-formatter fmt-eui) - (bas2 :type string :initarg :bas2 :reader bas2) - (sca2 :type string :initarg :sca2 :reader sca2)) + ((eui :value-type integer :initarg :eui :reader eui :print-formatter fmt-eui) + (bas :value-type string :initarg :bas :reader bas) + (sca :value-type string :initarg :sca :reader sca) + (eui2 :value-type integer :initarg :eui2 :reader eui2 :print-formatter fmt-eui) + (bas2 :value-type string :initarg :bas2 :reader bas2) + (sca2 :value-type string :initarg :sca2 :reader sca2)) (:metaclass hyperobject-class) (:default-initargs :eui nil :bas nil :sca nil :eui2 nil :bas2 nil :sca2 nil) (:user-name "Nominalizations") (:default-print-slots eui bas sca eui2 bas2 sca2)) (defclass lprn (umlsclass) - ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui) - (bas :type string :initarg :bas :reader bas) - (num :type string :initarg :num :reader num) - (gnd :type string :initarg :gnd :reader gnd) - (cas :type string :initarg :cas :reader cas) - (pos :type string :initarg :pos :reader pos) - (qnt :type string :initarg :qnt :reader qnt) - (fea :type string :initarg :fea :reader fea)) + ((eui :value-type integer :initarg :eui :reader eui :print-formatter fmt-eui) + (bas :value-type string :initarg :bas :reader bas) + (num :value-type string :initarg :num :reader num) + (gnd :value-type string :initarg :gnd :reader gnd) + (cas :value-type string :initarg :cas :reader cas) + (pos :value-type string :initarg :pos :reader pos) + (qnt :value-type string :initarg :qnt :reader qnt) + (fea :value-type string :initarg :fea :reader fea)) (:metaclass hyperobject-class) (:default-initargs :eui nil :bas nil :num nil :gnd nil :cas nil :pos nil :qnt nil :fea nil) @@ -364,11 +364,11 @@ (:default-print-slots eui bas num gnd cas pos qnt fea)) (defclass lprp (umlsclass) - ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui) - (bas :type string :initarg :bas :reader bas) - (str :type string :initarg :str :reader str) - (sca :type string :initarg :sca :reader sca) - (fea :type string :initarg :fea :reader fea)) + ((eui :value-type integer :initarg :eui :reader eui :print-formatter fmt-eui) + (bas :value-type string :initarg :bas :reader bas) + (str :value-type string :initarg :str :reader str) + (sca :value-type string :initarg :sca :reader sca) + (fea :value-type string :initarg :fea :reader fea)) (:metaclass hyperobject-class) (:default-initargs :eui nil :bas nil :str nil :sca nil :fea nil) (:user-name "Properties") @@ -376,9 +376,9 @@ (defclass lspl (umlsclass) - ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui) - (spv :type string :initarg :spv :reader spv) - (bas :type string :initarg :bas :reader bas)) + ((eui :value-type integer :initarg :eui :reader eui :print-formatter fmt-eui) + (spv :value-type string :initarg :spv :reader spv) + (bas :value-type string :initarg :bas :reader bas)) (:metaclass hyperobject-class) (:default-initargs :eui nil :spv nil :bas nil) (:user-name "Spelling Variants") @@ -386,27 +386,27 @@ (defclass ltrm (umlsclass) - ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui) - (bas :type string :initarg :bas :reader bas) - (gen :type string :initarg :gen :reader gen)) + ((eui :value-type integer :initarg :eui :reader eui :print-formatter fmt-eui) + (bas :value-type string :initarg :bas :reader bas) + (gen :value-type string :initarg :gen :reader gen)) (:metaclass hyperobject-class) (:default-initargs :eui nil :bas nil :gen nil) (:user-name "Trade Marks") (:default-print-slots eui bas gen)) (defclass ltyp (umlsclass) - ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui) - (bas :type string :initarg :bas :reader bas) - (sca :type string :initarg :sca :reader sca) - (typ :type string :initarg :typ :reader typ)) + ((eui :value-type integer :initarg :eui :reader eui :print-formatter fmt-eui) + (bas :value-type string :initarg :bas :reader bas) + (sca :value-type string :initarg :sca :reader sca) + (typ :value-type string :initarg :typ :reader typ)) (:metaclass hyperobject-class) (:default-initargs :eui nil :bas nil :sca nil :typ nil) (:user-name "Inflection Type") (:default-print-slots eui bas sca typ)) (defclass lwd (umlsclass) - ((wrd :type string :initarg :wrd :reader wrd) - (euilist :type list :initarg :euilist :reader euilist)) + ((wrd :value-type string :initarg :wrd :reader wrd) + (euilist :value-type list :initarg :euilist :reader euilist)) (:metaclass hyperobject-class) (:default-initargs :wrd nil :euilist nil) (:user-name "Lexical Word Index") @@ -415,16 +415,16 @@ ;;; Semantic NET objects (defclass sdef (umlsclass) - ((rt :type string :initarg :rt :reader rt) - (ui :type integer :initarg :ui :reader ui :print-formatter fmt-tui) - (styrl :type string :initarg :styrl :reader styrl) - (stnrtn :type string :initarg :stnrtn :reader stnrtn) - (def :type string :initarg :def :reader def) - (ex :type string :initarg :ex :reader ex) - (un :type string :initarg :un :reader un) - (rh :type string :initarg :rh :reader rh) - (abr :type string :initarg :abr :reader abr) - (rin :type string :initarg :rin :reader rin)) + ((rt :value-type string :initarg :rt :reader rt) + (ui :value-type integer :initarg :ui :reader ui :print-formatter fmt-tui) + (styrl :value-type string :initarg :styrl :reader styrl) + (stnrtn :value-type string :initarg :stnrtn :reader stnrtn) + (def :value-type string :initarg :def :reader def) + (ex :value-type string :initarg :ex :reader ex) + (un :value-type string :initarg :un :reader un) + (rh :value-type string :initarg :rh :reader rh) + (abr :value-type string :initarg :abr :reader abr) + (rin :value-type string :initarg :rin :reader rin)) (:metaclass hyperobject-class) (:default-initargs :rt nil :ui nil :styrl nil :stnrtn nil :def nil :ex nil :un nil :rh nil @@ -433,28 +433,28 @@ (:default-print-slots rt ui styrl stnrtn def ex un rh abr rin)) (defclass sstr (umlsclass) - ((styrl :type string :initarg :styrl :reader styrl) - (rl :type string :initarg :rl :reader rl) - (styrl2 :type string :initarg :styrl2 :reader styrl2) - (ls :type string :initarg :ls :reader ls)) + ((styrl :value-type string :initarg :styrl :reader styrl) + (rl :value-type string :initarg :rl :reader rl) + (styrl2 :value-type string :initarg :styrl2 :reader styrl2) + (ls :value-type string :initarg :ls :reader ls)) (:metaclass hyperobject-class) (:default-initargs :styrl nil :rl nil :styrl2 nil :ls nil) (:user-name "Structure of the Network") (:default-print-slots styrl rl styrl2 ls)) (defclass sstre1 (umlsclass) - ((ui :type integer :initarg :ui :reader ui :print-formatter fmt-tui) - (ui2 :type integer :initarg :ui2 :reader ui2 :print-formatter fmt-tui) - (ui3 :type integer :initarg :ui3 :reader ui3 :print-formatter fmt-tui)) + ((ui :value-type integer :initarg :ui :reader ui :print-formatter fmt-tui) + (ui2 :value-type integer :initarg :ui2 :reader ui2 :print-formatter fmt-tui) + (ui3 :value-type integer :initarg :ui3 :reader ui3 :print-formatter fmt-tui)) (:metaclass hyperobject-class) (:default-initargs :ui nil :ui2 nil :ui3 nil) (:user-name "Fully Inherited Set of Releatons (TUI's)") (:default-print-slots ui ui2 ui3)) (defclass sstre2 (umlsclass) - ((sty :type string :initarg :ui :reader sty) - (rl :type string :initarg :ui2 :reader rl) - (sty2 :type string :initarg :ui3 :reader sty2)) + ((sty :value-type string :initarg :ui :reader sty) + (rl :value-type string :initarg :ui2 :reader rl) + (sty2 :value-type string :initarg :ui3 :reader sty2)) (:metaclass hyperobject-class) (:default-initargs :sty nil :rl nil :sty2 nil) (:user-name "Fully Inherited Set of Releatons (strings)") diff --git a/composite.lisp b/composite.lisp index 0489853..a5b6f24 100644 --- a/composite.lisp +++ b/composite.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id: composite.lisp,v 1.18 2002/12/13 05:43:38 kevin Exp $ +;;;; $Id: composite.lisp,v 1.19 2002/12/14 02:35:28 kevin Exp $ ;;;; ;;;; This file, part of UMLisp, is ;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D. @@ -65,7 +65,7 @@ ;;; Composite Objects (defclass freq (hyperobject) - ((freq :type integer :initarg :freq :accessor freq :print-formatter fmt-comma-integer)) + ((freq :value-type integer :initarg :freq :accessor freq :print-formatter fmt-comma-integer)) (:metaclass hyperobject-class) (:default-initargs :freq 0) (:user-name "Frequency class") @@ -87,7 +87,7 @@ (:description "Composite object of ustr/freq")) (defclass usty_freq (usty freq) - ((freq :type fixnum :initarg :freq :accessor freq)) + ((freq :value-type fixnum :initarg :freq :accessor freq)) (:metaclass hyperobject-class) (:user-name "Semantic Type and Count") (:default-print-slots tui freq sty) diff --git a/debian/changelog b/debian/changelog index ea4fa24..00fb3c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-umlisp (2.6.0-1) unstable; urgency=low + + * Updates for new version of hyperobject + + -- Kevin M. Rosenberg Fri, 13 Dec 2002 03:08:58 -0700 + cl-umlisp (2.5.1-1) unstable; urgency=low * Updates for hyperobject -- 2.34.1