r11146: add source finding, add limit and filters to query

[umlisp.git] / class-support.lisp

diff --git a/class-support.lisp b/class-support.lisp
index eb600eb5b45a2de4d6c5b11ed4919cc833e20ddf..e7fe96025c47aa25126d121162bf286b68d4ea2c 100644 (file)
--- a/class-support.lisp
+++ b/class-support.lisp
@@ -24,8 +24,12 @@
 (defmethod fmt-cui ((c ucon))
   (fmt-cui (cui c)))
 
-(defmethod fmt-cui ((c fixnum))
-  (prefixed-fixnum-string c #\C 7))
+(when *has-fixnum-class*
+  (defmethod fmt-cui ((c fixnum))
+    (prefixed-fixnum-string c #\C 7)))
+
+(defmethod fmt-cui ((c integer))
+    (prefixed-integer-string c #\C 7))
 
 (defmethod fmt-cui ((c string))
   (if (eql (aref c 0) #\C)
@@ -39,8 +43,12 @@
 (defmethod fmt-lui ((l uterm))
   (fmt-lui (lui l)))
 
-(defmethod fmt-lui ((l fixnum))
-  (prefixed-fixnum-string l #\L 7))
+(when *has-fixnum-class*
+  (defmethod fmt-lui ((l fixnum))
+    (prefixed-fixnum-string l #\L 7)))
+
+(defmethod fmt-lui ((l integer))
+  (prefixed-integer-string l #\L 7))
 
 (defmethod fmt-lui ((l string))
   (if (eql (aref l 0) #\L)
@@ -51,8 +59,12 @@
 (defmethod fmt-sui ((s ustr))
   (fmt-sui (sui s)))
 
-(defmethod fmt-sui ((s fixnum))
-  (prefixed-fixnum-string s #\S 7))
+(when *has-fixnum-class*
+  (defmethod fmt-sui ((s fixnum))
+    (prefixed-fixnum-string s #\S 7)))
+
+(defmethod fmt-sui ((s integer))
+  (prefixed-integer-string s #\S 7))
 
 (defmethod fmt-sui ((s string))
   (if (eql (aref s 0) #\S)
@@ -60,8 +72,12 @@
       (fmt-sui (parse-integer s))))
 
 (defgeneric fmt-tui (tui))
-(defmethod fmt-tui ((tui fixnum))
-  (prefixed-fixnum-string tui #\T 3))
+(when *has-fixnum-class*
+  (defmethod fmt-tui ((tui fixnum))
+    (prefixed-fixnum-string tui #\T 3)))
+
+(defmethod fmt-tui ((tui integer))
+  (prefixed-integer-string tui #\T 3))
 
 (defmethod fmt-tui ((tui string))
   (if (eql (aref tui 0) #\T)
@@ -69,8 +85,16 @@
     (fmt-tui (parse-integer tui))))
 
 (defgeneric fmt-aui (aui))
-(defmethod fmt-aui ((aui fixnum))
-  (prefixed-fixnum-string aui #\A 7))
+(when *has-fixnum-class*
+  (defmethod fmt-aui ((aui fixnum))
+    (if (>= aui 10000000)
+      (prefixed-fixnum-string aui #\A 8)
+      (prefixed-fixnum-string aui #\A 7))))
+
+(defmethod fmt-aui ((aui integer))
+  (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)
@@ -78,8 +102,12 @@
       (fmt-aui (parse-integer aui))))
 
 (defgeneric fmt-eui (e))
-(defmethod fmt-eui ((e fixnum))
-  (prefixed-fixnum-string e #\E 7))
+(when *has-fixnum-class*
+  (defmethod fmt-eui ((e fixnum))
+    (prefixed-fixnum-string e #\E 7)))
+
+(defmethod fmt-eui ((e integer))
+  (prefixed-integer-string e #\E 7))
 
 (defmethod fmt-eui ((e string))
   (if (eql (aref e 0) #\E)
@@ -194,7 +222,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"
@@ -294,7 +322,7 @@
         ((char-equal #\O c)
          "Other"))))
 
-           
+
 (defun ucon-parents (con &optional sab)
   (ucon-ancestors con sab t))
 
@@ -303,7 +331,7 @@
   (let* ((parent-rels (filter-urels-by-rel (s#rel ucon) "par"))
         (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))
@@ -318,12 +346,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
@@ -340,7 +368,7 @@
         (sort anc-this-cxn (lambda (a b) (< (rank a) (rank b))))
         anc-lists)))))
 
-  
+
 #+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)))