Changeset 13221

Timestamp:

02/14/11 23:03:12 (13 years ago)

Author:

astalla

Message:

Fix LispClass?.subclassp(LispObject) used by register-java-exception. More checks in register-java-exception.

Location:

trunk/abcl

Files:

• pom.xml (modified) (1 diff)
• src/org/armedbear/lisp/Java.java (modified) (2 diffs)
• src/org/armedbear/lisp/LispClass.java (modified) (2 diffs)

trunk/abcl/pom.xml

@@ -14 +14 @@
   <groupId>org.armedbear.lisp</groupId>
   <artifactId>abcl</artifactId>
+  <version>0.24.0</version>
   <packaging>jar</packaging>
   <name>ABCL - Armed Bear Common Lisp</name>
-  <version>0.24.0</version>
   <description>Common Lisp implementation running on the JVM</description>
   <url>http://common-lisp/project/armedbear</url>

trunk/abcl/src/org/armedbear/lisp/Java.java

@@ -92 +92 @@
 
         {
-            // FIXME Verify that CONDITION-SYMBOL is a symbol that names a condition.
+            LispClass lispClass = (LispClass) LispClass.findClass(symbol, true);
             // FIXME Signal a continuable error if the exception is already registered.
-            if ((symbol instanceof Symbol) && isJavaException(LispClass.findClass((Symbol) symbol))) {
+            if (isJavaException(lispClass)) {
                 registeredExceptions.put(classForName(className.getStringValue()),
                                          (Symbol)symbol);
@@ -123 +123 @@
     };
 
-    static Symbol getCondition(Class cl)
-    {
-  Class o = classForName("java.lang.Object");
-      for (Class c = cl ; c != o ; c = c.getSuperclass()) {
+    static Symbol getCondition(Class cl) {
+        Class o = classForName("java.lang.Object");
+        for (Class c = cl ; c != o ; c = c.getSuperclass()) {
             Object object = registeredExceptions.get(c);
-            if (object != null && isJavaException(LispClass.findClass((Symbol) object))) {
-                return (Symbol) object;
+            if (object instanceof Symbol) {
+                LispClass lispClass = (LispClass) LispClass.findClass((Symbol) object, true);
+                if(isJavaException(lispClass)) {
+                    return (Symbol) object;
+                }
             }
         }

trunk/abcl/src/org/armedbear/lisp/LispClass.java

@@ -288 +288 @@
   public boolean subclassp(LispObject obj)
   {
-    return false;
+      return subclassp(this, obj);
   }
 
@@ -306 +306 @@
         cpl = ((Cons)cpl).cdr;
       }
-
-    if (cls instanceof LispClass)
-      // additional checks (currently because of JavaClass)
-      return ((LispClass)cls).subclassp(obj);
-
     return false;
   }