Changeset 12382

Timestamp:

01/17/10 20:53:21 (11 years ago)

Author:

vvoutilainen

Message:

Backport r12376-r12379 and r12381. This fixes maxima,
adds support for disassembling proxied functions, and
adds fixes to printing java objects.

Location:

branches/0.18.x/abcl/src/org/armedbear/lisp

Files:

• AutoloadedFunctionProxy.java (modified) (3 diffs)
• JavaClass.java (modified) (1 diff)
• LispStackFrame.java (modified) (1 diff)
• print-object.lisp (modified) (1 diff)

branches/0.18.x/abcl/src/org/armedbear/lisp/AutoloadedFunctionProxy.java

@@ -82 +82 @@
     }
 
+
     final private synchronized Function load() {
         if (fun != null)
@@ -91 +92 @@
         for (int i = 0; i < symsToSave.length; i++)
             thread.bindSpecial(symsToSave[i], savedSyms[i]);
+
+        // set a specific reader environment, because we may be triggered in
+        // any undefined dynamic environment; we want something predictable
+        thread.bindSpecial(Symbol.READ_SUPPRESS, NIL);
+        thread.bindSpecial(Symbol.READ_EVAL, T);
+        thread.bindSpecial(Symbol.READ_BASE, LispInteger.getInstance(10));
+        // don't need to bind *READ-DEFAULT-FLOAT-FORMAT*,
+        // because DUMP-FORM sets it to NIL, forcing exponent markers everywhere
 
         byte[] classbytes =
@@ -276 +285 @@
             fun = new AutoloadedFunctionProxy(sym, name, cache,
                                               cachedSyms, fType);
-
+            fun.setClassBytes((byte[])((Hashtable)cache.javaInstance())
+                              .get(name.getStringValue()));
         }
 

branches/0.18.x/abcl/src/org/armedbear/lisp/JavaClass.java

@@ -41 +41 @@
 
   private JavaClass(Class<?> javaClass) {
-    this.javaClass = javaClass;
-    setDirectSuperclass(BuiltInClass.JAVA_OBJECT);
+      super(new Symbol(javaClass.getCanonicalName()));
+      this.javaClass = javaClass;
+      setDirectSuperclass(BuiltInClass.JAVA_OBJECT);
   }
 

branches/0.18.x/abcl/src/org/armedbear/lisp/LispStackFrame.java

@@ -120 +120 @@
      final String LISP_STACK_FRAME = "LISP-STACK-FRAME";
      try {
-       result =  unreadableString(LISP_STACK_FRAME + " " 
-          + toLispString().getStringValue());
+   result = Symbol.PRIN1_TO_STRING.execute(this.toLispList()).writeToString();
      } catch (Throwable t) { // error while printing stack
        Debug.trace("Serious printing error: ");

branches/0.18.x/abcl/src/org/armedbear/lisp/print-object.lisp

@@ -50 +50 @@
     (format stream "~S" (class-name (class-of object))))
   object)
+
+(defmethod print-object ((obj java:java-object) stream)
+  (write-string (%write-to-string obj) stream))
 
 (defmethod print-object ((class java:java-class) stream)