Changeset 13978

Timestamp:

06/18/12 16:32:48 (9 years ago)

Author:

rschlatte

Message:

Don't defer compute-discriminating-function

File:

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

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

@@ -1575 +1575 @@
           gf))))
 
-(defun initial-discriminating-function (gf args)
-  (set-funcallable-instance-function
-   gf
-   (funcall (if (eq (class-of gf) +the-standard-generic-function-class+)
-                #'std-compute-discriminating-function
-                #'compute-discriminating-function)
-            gf))
-  (apply gf args))
-
 (defun collect-eql-specializer-objects (generic-function)
   (let ((result nil))
@@ -1601 +1592 @@
   (%init-eql-specializations gf (collect-eql-specializer-objects gf))
   (set-funcallable-instance-function
-   gf #'(lambda (&rest args)
-          (initial-discriminating-function gf args)))
+   gf
+   (if (eq (class-of gf) +the-standard-generic-function-class+)
+       (std-compute-discriminating-function gf)
+       (compute-discriminating-function gf)))
   ;; FIXME Do we need to warn on redefinition somewhere else?
   (let ((*warn-on-redefinition* nil))