r11156: fix trans extension for sbcl, fix index for mrrel

[umlisp.git] / class-support.lisp

diff --git a/class-support.lisp b/class-support.lisp
index dd969038bc87ee7e65396631be22e207d85c1d2c..92b39aab617f3a7549c0ed5f587cc1eff0078377 100644 (file)
--- a/class-support.lisp
+++ b/class-support.lisp
@@ -101,6 +101,19 @@
       aui
       (fmt-aui (parse-integer aui))))
 
+(defgeneric fmt-rui (rui))
+(when *has-fixnum-class*
+  (defmethod fmt-rui ((rui fixnum))
+    (prefixed-fixnum-string rui #\A 8)))
+
+(defmethod fmt-rui ((rui integer))
+  (prefixed-integer-string rui #\A 8))
+
+(defmethod fmt-rui ((rui string))
+  (if (eql (aref rui 0) #\R)
+      rui
+    (fmt-rui (parse-integer rui))))
+
 (defgeneric fmt-eui (e))
 (when *has-fixnum-class*
   (defmethod fmt-eui ((e fixnum))
@@ -323,12 +336,15 @@
          "Other"))))
 
 
-(defun ucon-parents (con &optional sab)
-  (ucon-ancestors con sab t))
+(defun ucon-parents (con &key sab include-rb)
+  (ucon-ancestors con :sab sab :include-rb include-rb 
+                  :single-level t))
 
-(defun ucon-ancestors (ucon &optional sab single-level)
+(defun ucon-ancestors (ucon &key sab single-level include-rb)
   "Returns a list of ancestor lists for a concept"
-  (let* ((parent-rels (filter-urels-by-rel (s#rel ucon) "par"))
+  (let* ((parent-rels (append (filter-urels-by-rel (s#rel ucon) "par")
+                              (when include-rb 
+                                (filter-urels-by-rel (s#rel ucon) "rb"))))
         (anc nil))
     (when sab
       (setq parent-rels (delete-if-not
@@ -375,7 +391,11 @@
     (loop for key being the hash-key in sab-codes
         collect (list key (gethash key sab-codes)))))
 
-                                          
+
+(defun ucon-has-sab (ucon sab)
+  (and (find-if (lambda (uso) (string-equal sab (sab uso))) (s#so ucon)) t))
+
+    
 #+scl
 (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))
     (let ((cl (find-class c)))