mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-24 13:31:58 -08:00
Code Issues Projects Releases Packages Wiki Activity

clos: finalize-inheritance: revert a non-conforming change

Browse source 
finalize-inheritance is expected to run regardless of the fact that
class has been already finalized. I suppose that it is in case when
compute-slot-* methods are specialized to return something else.
This commit is contained in:
Daniel Kochmański 2020-04-13 13:44:31 +02:00
parent 5feb42dfa3
commit bee9e8db55
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/clos/standard.lsp
View file

@ -301,10 +301,6 @@ because it contains a reference to the undefined class~% ~A"
(return-from finalize-inheritance
(finalize-inheritance x))))
;; Don't try to finalize a class that is already finalized.
(when (class-finalized-p class)
(return-from finalize-inheritance))
(setf (class-precedence-list class) cpl)
(let ((slots (compute-slots class)))
(setf (class-slots class) slots
@ -362,11 +358,8 @@ because it contains a reference to the undefined class~% ~A"
;; As mentioned above, when a parent is finalized, it is responsible for
;; invoking FINALIZE-INHERITANCE on all of its children. Obviously,
;; this only makes sense when the class has been defined.
(let ((subclasses (reverse (class-direct-subclasses class))))
(dolist (subclass subclasses)
(setf (class-finalized-p subclass) nil))
(dolist (subclass subclasses)
(finalize-unless-forward subclass)))
(dolist (subclass (reverse (class-direct-subclasses class)))
(finalize-unless-forward subclass))
;;
;; We create various caches to more rapidly find the slot locations and
;; slot definitions.