Changeset 12311

Timestamp:

12/28/09 23:11:35 (14 years ago)

Author:

ehuelsmann

Message:

Followup to r12306: "unbreak" Slime, at least partially.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• AutoloadedFunctionProxy.java (modified) (2 diffs)
• LispObject.java (modified) (1 diff)
• compiler-pass2.lisp (modified) (1 diff)

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

@@ -69 +69 @@
     }
 
+    /** Resolve this instance by returning the function we're proxy for */
+    @Override
+    public LispObject resolve() {
+        return load();
+    }
+
     final private synchronized Function load() {
         if (fun != null)
@@ -250 +256 @@
 
         if (cache instanceof Nil)
+            // during EVAL-WHEN :compile-toplevel, this function will
+            // be called without a caching environment; we'll need to
+            // forward to the compiled function loader
             return loadCompiledFunction(name.getStringValue());
         else {

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

@@ -39 +39 @@
 public class LispObject //extends Lisp
 {
+
+  /** Function to allow objects to return the value
+   * "they stand for". Used by AutoloadedFunctionProxy to return
+   * the function it is proxying.
+   */
+  public LispObject resolve()
+  {
+    return this;
+  }
+
   public LispObject typeOf()
   {

trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

@@ -2049 +2049 @@
                                  "getSymbolFunctionOrDie")
                              nil +lisp-object+)
+         ;; make sure we're not cacheing a proxied function
+         ;; (AutoloadedFunctionProxy) by allowing it to resolve itself
+         (emit-invokevirtual +lisp-object-class+
+                             "resolve" nil +lisp-object+)
          (emit 'putstatic *this-class* f +lisp-object+)
          (if *declare-inline*