;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: classes.lisp,v 1.14 2002/11/23 22:15:13 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.
(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)
;;; 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)))
(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))))