Changeset 13976


Ignore:
Timestamp:
06/17/12 17:05:19 (9 years ago)
Author:
rschlatte
Message:

Correct default superclass for funcallable-standard-classes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/clos.lisp

    r13975 r13976  
    114114(defconstant +the-structure-class+ (find-class 'structure-class))
    115115(defconstant +the-standard-object-class+ (find-class 'standard-object))
     116(defconstant +the-funcallable-standard-object-class+
     117  (find-class 'funcallable-standard-object))
    116118(defconstant +the-standard-method-class+ (find-class 'standard-method))
    117119(defconstant +the-forward-referenced-class+
     
    844846                                             direct-default-initargs
    845847                                             &allow-other-keys)
    846   (let ((supers (or direct-superclasses
    847                     (list +the-standard-object-class+))))
     848  (let ((supers (cond (direct-superclasses)
     849                      ((subtypep (class-of class)
     850                                 +the-funcallable-standard-class+)
     851                       (list +the-funcallable-standard-object-class+))
     852                      ((subtypep (class-of class) +the-standard-class+)
     853                       (list +the-standard-object-class+)))))
    848854    (setf (class-direct-superclasses class) supers)
    849855    ;; FIXME (rudi 2012-03-22: follow the AMOP spec here when classes
Note: See TracChangeset for help on using the changeset viewer.