projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r11099: add error checking
[umlisp.git]
/
class-support.lisp
diff --git
a/class-support.lisp
b/class-support.lisp
index eb600eb5b45a2de4d6c5b11ed4919cc833e20ddf..a9fae985c89b54108da0d916d6c52c6c7ea19571 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 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)
(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 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)
(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 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)
(defmethod fmt-sui ((s string))
(if (eql (aref s 0) #\S)
@@
-60,8
+72,12
@@
(fmt-sui (parse-integer s))))
(defgeneric fmt-tui (tui))
(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)
(defmethod fmt-tui ((tui string))
(if (eql (aref tui 0) #\T)
@@
-69,8
+85,12
@@
(fmt-tui (parse-integer tui))))
(defgeneric fmt-aui (aui))
(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))
+ (prefixed-fixnum-string aui #\A 7)))
+
+(defmethod fmt-aui ((aui integer))
+ (prefixed-integer-string aui #\A 7))
(defmethod fmt-aui ((aui string))
(if (eql (aref aui 0) #\A)
(defmethod fmt-aui ((aui string))
(if (eql (aref aui 0) #\A)
@@
-78,8
+98,12
@@
(fmt-aui (parse-integer aui))))
(defgeneric fmt-eui (e))
(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)
(defmethod fmt-eui ((e string))
(if (eql (aref e 0) #\E)