From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Mon, 14 Oct 2002 15:03:43 +0000 (+0000)
Subject: r3018: *** empty log message ***
X-Git-Tag: v2006ac.2~326
X-Git-Url: http://git.kpe.io/?p=umlisp.git;a=commitdiff_plain;h=452d8de6a4083dec69347f3cafb49d0b9d5cd7b0

r3018: *** empty log message ***
---

diff --git a/classes.lisp b/classes.lisp
index 460878f..a81cdc3 100644
--- a/classes.lisp
+++ b/classes.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: classes.lisp,v 1.4 2002/10/14 09:25:20 kevin Exp $
+;;;; $Id: classes.lisp,v 1.5 2002/10/14 15:03:43 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -451,6 +451,7 @@
 
 ;;; Formatting routines
 
+(defgeneric fmt-cui (c))
 (defmethod fmt-cui ((c ucon))
   (format nil "C~7,'0d" (cui c)))
 
@@ -465,6 +466,7 @@
 (defmethod fmt-cui ((c null))
   (format nil "nil"))
 
+(defgeneric fmt-lui (c))
 (defmethod fmt-lui ((l uterm))
   (format nil "L~7,'0d" (lui l)))
 
@@ -476,6 +478,7 @@
       l
   (format nil "L~7,'0d" (parse-integer l))))
 
+(defgeneric fmt-sui (s))
 (defmethod fmt-sui ((s ustr))
   (format nil "S~7,'0d" (sui s)))
 
@@ -487,6 +490,7 @@
       s
   (format nil "S~7,'0d" (parse-integer s))))
 
+(defgeneric fmt-tui (t))
 (defmethod fmt-tui ((s fixnum))
   (format nil "T~3,'0d" s))
 
@@ -495,6 +499,7 @@
       s
   (format nil "T~3,'0d" (parse-integer s))))
 
+(defgeneric fmt-eui (e))
 (defmethod fmt-eui ((e fixnum))
   (format nil "E~7,'0d" e))
 
@@ -537,12 +542,10 @@
 (defludisp-ml-class disp-term #'find-uterm-lui)
 (defludisp-ml-class disp-str #'find-ustr-sui)
 
-#+(or cmu sbcl)
+#+cmu
 (dolist (c '(urank udef usat uso ucxt ustr ulo uterm usty urel ucoc uatx ucon uxw uxnw uxns lexterm labr lagr lcmp lmod lnom lprn lprp lspl ltrm ltyp lwd sdef sstr sstre1 sstre2 ))
-  (let ((cl #+cmu (pcl:find-class c)
-	    #+sbcl (sb-pcl:find-class c)))
-    #+cmu (pcl:finalize-inheritance cl)
-    #+sbcl (sb-pcl:finalize-inheritance cl)))
+  (let ((cl (pcl:find-class c)))
+    (pcl:finalize-inheritance cl)))
 
 
 	 
diff --git a/composite.lisp b/composite.lisp
index b49eec4..4dcc194 100644
--- a/composite.lisp
+++ b/composite.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: composite.lisp,v 1.4 2002/10/14 09:25:20 kevin Exp $
+;;;; $Id: composite.lisp,v 1.5 2002/10/14 15:03:43 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -202,6 +202,7 @@
 (defun find-ucon2_freq-coc-tui-all (tui)
   (find-ucon2_freq-tui-all tui #'find-ucon2-coc-tui))
 
+#+cmu
 (dolist (c '(ucon_freq ustr_freq usty_freq usrl_freq))
   (let ((cl #+cmu (pcl:find-class c)
 	    #+sbcl (sb-pcl:find-class c)))