X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=classes.lisp;h=0a4e40b69fff33c5a82cff97d37c4c132c380b2c;hb=946518fbe81146e1bbe84486ba2daa787dad6bc0;hp=e1cf6ccf863becf926689486fff7aebf178b36d3;hpb=e64483a505270cf10a3e1525214f66ed78d30c17;p=umlisp.git

diff --git a/classes.lisp b/classes.lisp
index e1cf6cc..0a4e40b 100644
--- a/classes.lisp
+++ b/classes.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: classes.lisp,v 1.13 2002/11/23 18:41:41 kevin Exp $
+;;;; $Id: classes.lisp,v 1.15 2002/11/23 22:19:17 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -78,8 +78,8 @@
    (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 ho:comma-integer)
-   (cfr :type fixnum :initarg :cfr :reader cfr :print-formatter ho:comma-integer)
+   (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)
@@ -218,7 +218,7 @@
   (:metaclass hyperobject-class)
   (:default-initargs :sab nil :rel nil :atx nil)
   (:title "Associated Expression")
-  (print-slots sab rel atx))
+  (:print-slots sab rel atx))
 
 (defclass ucon (umlsclass)
   ((cui :type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
@@ -286,7 +286,7 @@
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :wrd nil)
   (:title "Lexical Term")
-  (:print-list eui wrd))
+  (:print-slots eui wrd))
 
 
 (defclass labr  (umlsclass)
@@ -446,7 +446,7 @@
   (:metaclass hyperobject-class)
   (:default-initargs :ui nil :ui2 nil :ui3 nil)
   (:title "Fully Inherited Set of Releatons (TUI's)")
-  (:print-slots ui ui2 ui3)
+  (:print-slots ui ui2 ui3))
 
 (defclass sstre2 (umlsclass)
   ((sty :type string :initarg :ui :reader sty)
@@ -459,6 +459,9 @@
 
 ;;; Formatting routines
 
+(defun fmt-comma-integer (i)
+  (format nil "~:d" i))
+
 (defgeneric fmt-cui (c))
 (defmethod fmt-cui ((c ucon))
   (format nil "C~7,'0d" (cui c)))
@@ -524,7 +527,7 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
 (defun english-term-p (obj)
   "Returns two values: T/NIL if term is english and T/NIL if obj is a TERM"
-  (if (eq (hyperobject::portable-class-name (hyperobject::portable-class-of obj)) 'uterm)
+  (if (eq (hyperobject::class-name (hyperobject::class-of obj)) 'uterm)
       (values (string-equal (lat obj) "ENG") t)
     (values nil nil))))