r3465: *** empty log message ***

diff --git a/classes.lisp b/classes.lisp
index dbb4bc1b8c91e7edc7131bff5b8f13560b99f7c4..0a4e40b69fff33c5a82cff97d37c4c132c380b2c 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -7,7 +7,7 @@
 ;;;; 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.
@@ -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)
@@ -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))))
 

diff --git a/composite.lisp b/composite.lisp
index ddda98f6cd9aeda7179ed11c0e77e27794b4b74c..739faa23ce1164e73846ec5bc26718ab9a7e7b0b 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.11 2002/11/23 22:15:13 kevin Exp $
+;;;; $Id: composite.lisp,v 1.12 2002/11/23 22:19:17 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -66,7 +66,7 @@
 ;;; Composite Objects
 
 (defclass ucon_freq (ucon)
-  ((freq :type integer :initarg :freq :accessor freq :print-formatter ho:comma-integer))
+  ((freq :type integer :initarg :freq :accessor freq :print-formatter fmt-comma-integer))
   (:metaclass hyperobject-class)
   (:default-initargs :freq 0)
   (:title "Concept and Count")
@@ -74,7 +74,7 @@
   (:documentation "Composite object of ucon/freq"))
 
 (defclass ustr_freq (ustr)
-  ((freq :type fixnum :initarg :freq :accessor freq :print-formatter ho:comma-integer))
+  ((freq :type fixnum :initarg :freq :accessor freq :print-formatter fmt-comma-integer))
   (:metaclass hyperobject-class)
   (:default-initargs :freq 0)
   (:title "String and Count")
@@ -101,7 +101,7 @@
 
 
 (defclass usrl_freq (usrl)
-  ((freq :type fixnum :initarg :freq :accessor freq :print-formatter ho:comma-integer))
+  ((freq :type fixnum :initarg :freq :accessor freq :print-formatter fmt-comma-integer))
   (:metaclass hyperobject-class)
   (:default-initargs :freq 0)
   (:title "Source and Count")