Changeset 11586

Timestamp:

01/24/09 20:36:52 (15 years ago)

Author:

ehuelsmann

Message:

Eliminate the pesky beeps in TYPE-OF.1; however unfortunately, this breaks TYPE-OF.4 for the case of "". Now go and search!

File:

• trunk/abcl/src/org/armedbear/lisp/subtypep.lisp (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/subtypep.lisp

@@ -94 +94 @@
                  (SIMPLE-CONDITION CONDITION)
                  (SIMPLE-ERROR SIMPLE-CONDITION ERROR)
-                 (SIMPLE-STRING SIMPLE-BASE-STRING BASE-STRING STRING SIMPLE-ARRAY)
+                 (SIMPLE-STRING BASE-STRING STRING SIMPLE-ARRAY)
                  (SIMPLE-TYPE-ERROR SIMPLE-CONDITION TYPE-ERROR)
                  (SIMPLE-VECTOR VECTOR SIMPLE-ARRAY)
@@ -484 +484 @@
             (and (classp type2) (eq (%class-name type2) t)))
     (return-from %subtypep (values t t)))
+  (when (classp type1)
+    (setf type1 (%class-name type1)))
+  (when (classp type2)
+    (setf type2 (%class-name type2)))
   (let ((ct1 (ctype type1))
         (ct2 (ctype type2)))