r11151: make RUI a int4eger (unique identifier) field, add MRREL indices

[umlisp.git] / class-support.lisp

diff --git a/class-support.lisp b/class-support.lisp
index e7fe96025c47aa25126d121162bf286b68d4ea2c..2b94e91a93c2451f861100aa3446168d3686f837 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 aui #\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))
@@ -368,7 +381,14 @@
         (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)))))
 
+                                          
 #+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)))