Changeset 14088

Timestamp:

08/14/12 20:02:16 (9 years ago)

Author:

rschlatte

Message:

Tell compile, set-function-definition about funcallable objects

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• compiler-pass2.lisp (modified) (1 diff)
• precompiler.lisp (modified) (1 diff)

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

@@ -7493 +7493 @@
     (unless (and (consp definition) (eq (car definition) 'LAMBDA))
       (let ((function definition))
-        (when (typep definition 'standard-generic-function)
+        (when (typep definition 'mop:funcallable-standard-object)
           (setf function (mop::funcallable-instance-function function)))
         (multiple-value-setq

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

@@ -1070 +1070 @@
     (when (macro-function name)
       (setf new (make-macro name new)))
-    (if (typep old 'standard-generic-function)
+    (if (typep old 'mop:funcallable-standard-object)
         (mop:set-funcallable-instance-function old new)
         (setf (fdefinition name) new))))