Changeset 14254

Timestamp:

11/26/12 19:38:28 (9 years ago)

Author:

rschlatte

Message:

Fix (documentation symbol 'function) when symbol names a generic function

• fixes #270

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Primitives.java (modified) (2 diffs)
• clos.lisp (modified) (1 diff)

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

@@ -5671 +5671 @@
             if (doc == NIL) {
                 if (docType == Symbol.FUNCTION && object instanceof Symbol) {
+                    // Generic functions are handled at lisp-level, not here
                     LispObject function = object.getSymbolFunction();
                     if (function != null)
@@ -5693 +5694 @@
 
         {
+            // Generic functions are handled at lisp-level, not here
             object.setDocumentation(docType, documentation);
             return documentation;

trunk/abcl/src/org/armedbear/lisp/clos.lisp

@@ -3341 +3341 @@
 
 (defmethod documentation ((x symbol) (doc-type (eql 'function)))
-  (%documentation x 'function))
+  (if (typep (fdefinition x) 'generic-function)
+      (documentation (fdefinition x) doc-type)
+      (%documentation x doc-type)))
+
+(defmethod (setf documentation) (new-value (x symbol) (doc-type (eql 'function)))
+  (if (typep (fdefinition x) 'generic-function)
+      (setf (documentation (fdefinition x) 'function) new-value)
+      (%set-documentation x 'function new-value)))
 
 (defmethod documentation ((x symbol) (doc-type (eql 'type)))