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 a9fae985c89b54108da0d916d6c52c6c7ea19571..92b39aab617f3a7549c0ed5f587cc1eff0078377 100644 (file)
--- a/class-support.lisp
+++ b/class-support.lisp
@@ -87,16 +87,33 @@
 (defgeneric fmt-aui (aui))
 (when *has-fixnum-class*
   (defmethod fmt-aui ((aui fixnum))
-    (prefixed-fixnum-string aui #\A 7)))
+    (if (>= aui 10000000)
+      (prefixed-fixnum-string aui #\A 8)
+      (prefixed-fixnum-string aui #\A 7))))
 
 (defmethod fmt-aui ((aui integer))
-  (prefixed-integer-string aui #\A 7))
+  (if (>= aui 10000000)
+    (prefixed-integer-string aui #\A 8)
+    (prefixed-integer-string aui #\A 7)))
 
 (defmethod fmt-aui ((aui string))
   (if (eql (aref aui 0) #\A)
       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))
@@ -218,7 +235,7 @@
     (dolist (term (s#term ucon) (nreverse res))
       (dolist (str (s#str term))
        (push str res)))))
-                    
+
 
 (defmethod pfstr ((uterm uterm))
   "Return the preferred string for a uterm"
@@ -318,16 +335,19 @@
         ((char-equal #\O c)
          "Other"))))
 
-           
-(defun ucon-parents (con &optional sab)
-  (ucon-ancestors con sab t))
 
-(defun ucon-ancestors (ucon &optional sab single-level)
+(defun ucon-parents (con &key sab include-rb)
+  (ucon-ancestors con :sab sab :include-rb include-rb 
+                  :single-level t))
+
+(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 
+      (setq parent-rels (delete-if-not
                         (lambda (rel) (string-equal sab (sab rel)))
                         parent-rels)))
     (dolist (rel parent-rels (nreverse anc))
@@ -342,12 +362,12 @@
 (defmethod cxt-ancestors ((con ucon))
   (loop for term in (s#term con)
       append (cxt-ancestors term)))
-                   
+
 
 (defmethod cxt-ancestors ((term uterm))
   (loop for str in (s#str term)
       append (cxt-ancestors str)))
-    
+
 (defmethod cxt-ancestors ((str ustr))
   "Return the ancestory contexts of a ustr"
   (let* ((anc (remove-if-not
@@ -364,7 +384,18 @@
         (sort anc-this-cxn (lambda (a b) (< (rank a) (rank b))))
         anc-lists)))))
 
-  
+(defun uso-unique-codes (usos)
+  (let ((sab-codes (make-hash-table :test 'equal)))
+    (dolist (uso usos)
+      (setf (gethash (sab uso) sab-codes) (code uso)))
+    (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)))