Changeset 13750 for trunk

Timestamp:

01/10/12 20:11:27 (11 years ago)

Author:

Mark Evenson

Message:

Fix #172: DOCUMENTATION now works for generic functions.

LispObject.java didn't know that things other than Function could be
in a symbol's function slot.

# From: Rudolf Schlatte <rudi@…>
# Subject: [armedbear-devel] Patch for bug 172
# Date: January 10, 2012 8:54:16 PM GMT+01:00

File:

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

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

@@ -659 +659 @@
       }
     if(docType == Symbol.FUNCTION && this instanceof Symbol) {
-        Object fn = ((Symbol)this).getSymbolFunction();
+        LispObject fn = ((Symbol)this).getSymbolFunction();
         if(fn instanceof Function) {
             DocString ds = fn.getClass().getAnnotation(DocString.class);
@@ -671 +671 @@
                     ((Symbol)this).setDocumentation(Symbol.FUNCTION, doc);
                     return doc;
+                } else if (fn instanceof StandardGenericFunction) {
+                    return 
+                        StandardGenericFunction.checkStandardGenericFunction(fn)
+                        .slots[StandardGenericFunctionClass.SLOT_INDEX_DOCUMENTATION];
                 }
             }