r5032: *** empty log message ***

[umlisp.git] / class-support.lisp

diff --git a/class-support.lisp b/class-support.lisp
index 8f97dd150001680086fac9885689c2350441bb0d..f7975e714f02143631b0f18921fb38b622a928b4 100644 (file)
--- a/class-support.lisp
+++ b/class-support.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:       Kevin M. Rosenberg
 ;;;; Date Started: Apr 2000
 ;;;;
-;;;; $Id: class-support.lisp,v 1.5 2003/05/07 22:53:36 kevin Exp $
+;;;; $Id: class-support.lisp,v 1.9 2003/05/26 14:53:33 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -21,62 +21,64 @@
 
 ;;; Formatting routines
 
+
+
 (defgeneric fmt-cui (c))
 (defmethod fmt-cui ((c ucon))
-  (format nil "C~7,'0d" (cui c)))
+  (fmt-cui (cui c)))
 
 (defmethod fmt-cui ((c fixnum))
-  (format nil "C~7,'0d" c))
+  (prefixed-fixnum-string c #\C 7))
 
 (defmethod fmt-cui ((c string))
   (if (eql (aref c 0) #\C)
       c
-    (format nil "C~7,'0d" (parse-integer c))))
+      (fmt-cui (parse-integer c))))
 
 (defmethod fmt-cui ((c null))
   (format nil "nil"))
 
 (defgeneric fmt-lui (c))
 (defmethod fmt-lui ((l uterm))
-  (format nil "L~7,'0d" (lui l)))
+  (fmt-lui (lui l)))
 
 (defmethod fmt-lui ((l fixnum))
-  (format nil "L~7,'0d" l))
+  (prefixed-fixnum-string l #\L 7))
 
 (defmethod fmt-lui ((l string))
   (if (eql (aref l 0) #\L)
       l
-  (format nil "L~7,'0d" (parse-integer l))))
+      (fmt-lui (parse-integer l))))
 
 (defgeneric fmt-sui (s))
 (defmethod fmt-sui ((s ustr))
-  (format nil "S~7,'0d" (sui s)))
+  (fmt-sui (sui s)))
 
 (defmethod fmt-sui ((s fixnum))
-  (format nil "S~7,'0d" s))
+  (prefixed-fixnum-string s #\S 7))
 
 (defmethod fmt-sui ((s string))
   (if (eql (aref s 0) #\S)
       s
-  (format nil "S~7,'0d" (parse-integer s))))
+      (fmt-sui (parse-integer s))))
 
-(defgeneric fmt-tui (t))
-(defmethod fmt-tui ((s fixnum))
-  (format nil "T~3,'0d" s))
+(defgeneric fmt-tui (tui))
+(defmethod fmt-tui ((tui fixnum))
+  (prefixed-fixnum-string tui #\T 3))
 
-(defmethod fmt-tui ((s string))
-  (if (eql (aref s 0) #\T)
-      s
-  (format nil "T~3,'0d" (parse-integer s))))
+(defmethod fmt-tui ((tui string))
+  (if (eql (aref tui 0) #\T)
+      tui
+      (fmt-tui (parse-integer tui))))
 
 (defgeneric fmt-eui (e))
 (defmethod fmt-eui ((e fixnum))
-  (format nil "E~7,'0d" e))
+  (prefixed-fixnum-string e #\E 7))
 
 (defmethod fmt-eui ((e string))
   (if (eql (aref e 0) #\E)
       e
-    (format nil "E~7,'0d" (parse-integer e))))
+      (fmt-eui (parse-integer e))))
 
 (defmethod fmt-eui ((e null))
   (format nil "nil"))
@@ -126,6 +128,16 @@
   "Return the string for a ulo object"
   (find-string-sui (sui lo)))
 
+(defmethod uterm-pfstr (uterm)
+  "Return the preferred string for a uterm"
+  (dolist (ustr (s#str uterm))
+    (when (string= "PF" (stt ustr))
+      (return-from uterm-pfstr (str ustr)))))
+
+(defmethod remove-non-english-terms (uterms)
+  (remove-if-not #'english-term-p uterms))
+
+
 #+(or scl 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 usrl))
     #+cmu