Changeset 11834

Timestamp:

05/05/09 22:01:50 (14 years ago)

Author:

astalla

Message:

Relaxed type checking when invoking Java methods from Lisp, as discussed on the mailing list.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Java.java (modified) (1 diff)
• LispObject.java (modified) (1 diff)

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

@@ -626 +626 @@
             instance = ((JavaObject)instanceArg).getObject();
         else {
-            type_error(instanceArg,
-                            list(Symbol.OR, Symbol.STRING, Symbol.JAVA_OBJECT));
-            // Not reached.
-            return null;
+      instance = instanceArg.javaInstance();
         }
         try {

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

@@ -103 +103 @@
   {
         return this;
-    /*return error(new LispError("The value " + writeToString() +
-                                " is not of primitive type."));*/
   }
 
   public Object javaInstance(Class c) throws ConditionThrowable
   {
-    if (c == LispObject.class)
-      return this;
-    return error(new LispError("The value " + writeToString() +
-                                " is not of primitive type."));
+      if (getClass().isAssignableFrom(c))
+    return this;
+      return error(new LispError("The value " + writeToString() +
+         " is not of class " + c.getName()));
   }