r3291: *** empty log message ***

[umlisp.git] / composite.lisp

diff --git a/composite.lisp b/composite.lisp
index 9b5f60199a65eede49754dfa5d8624bf178cc0a6..263c28aaee17781e72ebcc41855beffc57b0ceb8 100644 (file)
--- a/composite.lisp
+++ b/composite.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: composite.lisp,v 1.6 2002/10/16 16:05:23 kevin Exp $
+;;;; $Id: composite.lisp,v 1.9 2002/11/04 18:02:13 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -68,7 +68,7 @@
 (defclass ucon_freq (umlsclass)
   ((ucon :type ucon :initarg :ucon :reader ucon)
    (freq :type fixnum :initarg :freq :accessor freq))
-  (:metaclass kmrcl:ml-class)
+  (:metaclass hyperobject-class)
   (:default-initargs :cui nil :pfstr nil :freq nil)
   (:title "Concept and Count")
   (:fields (cui :string fmt-cui) (freq :fixnum) (pfstr :cdata))
@@ -84,7 +84,7 @@
 (defclass ustr_freq (umlsclass)
   ((ustr :type ustr :initarg :ustr :reader ustr)
    (freq :type fixnum :initarg :freq :accessor freq))
-  (:metaclass kmrcl:ml-class)
+  (:metaclass hyperobject-class)
   (:default-initargs :cui nil :pfstr nil :freq nil)
   (:title "String and Count")
   (:fields (sui :string fmt-sui) (freq :fixnum) (stt :string) (lrl :fixnum) (str :cdata))
@@ -106,18 +106,19 @@
 (defclass usty_freq (umlsclass)
   ((usty :type usty :initarg :usty :reader usty)
    (freq :type fixnum :initarg :freq :accessor freq))
-  (:metaclass kmrcl:ml-class)
+  (:metaclass hyperobject-class)
   (:default-initargs :usty nil :freq nil)
   (:title "Semantic Type and Count")
-  (:ref-fields (tui find-ucon-tui "subobjects=no"))
+;;  (:ref-fields (tui find-ucon-tui "subobjects=no"))
+  (:ref-fields (tui find-ucon-tui))
   (:fields (tui :string fmt-tui) (freq :fixnum) (sty :string))
   (:documentation "Composite object of usty/freq"))
 
 (defmethod tui ((s usty_freq))
-  (usty-tui (usty_freq-usty s)))
+  (tui (usty s)))
 
 (defmethod sty ((s usty_freq))
-  (usty-sty (usty_freq-usty s)))
+  (sty (usty s)))
 
 
 (defun find-usty_freq-all ()
@@ -134,7 +135,7 @@
 (defclass usrl_freq (umlsclass)
   ((usrl :type usrl :initarg :usrl :reader usrl)
    (freq :type fixnum :initarg :freq :accessor freq))
-  (:metaclass kmrcl:ml-class)
+  (:metaclass hyperobject-class)
   (:default-initargs :usrl nil :freq nil)
   (:title "Source and Count")
   (:ref-fields (sab find-ustr-sab))
@@ -215,9 +216,9 @@
 (defun find-ucon2_freq-coc-tui-all (tui)
   (find-ucon2_freq-tui-all tui #'find-ucon2-coc-tui))
 
-#+cmu
+#+(or cmu scl)
 (dolist (c '(ucon_freq ustr_freq usty_freq usrl_freq))
   (let ((cl #+cmu (pcl:find-class c)
-           #+sbcl (sb-pcl:find-class c)))
+           #+scl (find-class c)))
     #+cmu (pcl:finalize-inheritance cl)
-    #+sbcl (sb-pcl:finalize-inheritance cl)))
+    #+scl (clos:finalize-inheritance cl)))