r5044: *** empty log message ***

[umlisp.git] / class-support.lisp

diff --git a/class-support.lisp b/class-support.lisp
index 0a2dc5fa421a4591cd45d865b00dbb63b70c7c48..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.7 2003/05/14 21:34:52 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.
@@ -28,7 +28,7 @@
   (fmt-cui (cui c)))
 
 (defmethod fmt-cui ((c fixnum))
-  (prefixed-fixnum-string c #\C 8))
+  (prefixed-fixnum-string c #\C 7))
 
 (defmethod fmt-cui ((c string))
   (if (eql (aref c 0) #\C)
@@ -43,7 +43,7 @@
   (fmt-lui (lui l)))
 
 (defmethod fmt-lui ((l fixnum))
-  (prefixed-fixnum-string l #\L 8))
+  (prefixed-fixnum-string l #\L 7))
 
 (defmethod fmt-lui ((l string))
   (if (eql (aref l 0) #\L)
@@ -55,7 +55,7 @@
   (fmt-sui (sui s)))
 
 (defmethod fmt-sui ((s fixnum))
-  (prefixed-fixnum-string s #\S 8))
+  (prefixed-fixnum-string s #\S 7))
 
 (defmethod fmt-sui ((s string))
   (if (eql (aref s 0) #\S)
@@ -64,7 +64,7 @@
 
 (defgeneric fmt-tui (tui))
 (defmethod fmt-tui ((tui fixnum))
-  (prefixed-fixnum-string tui #\T 4))
+  (prefixed-fixnum-string tui #\T 3))
 
 (defmethod fmt-tui ((tui string))
   (if (eql (aref tui 0) #\T)
@@ -73,7 +73,7 @@
 
 (defgeneric fmt-eui (e))
 (defmethod fmt-eui ((e fixnum))
-  (prefixed-fixnum-string e #\E 8))
+  (prefixed-fixnum-string e #\E 7))
 
 (defmethod fmt-eui ((e string))
   (if (eql (aref e 0) #\E)
@@ -128,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