procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eieio-core.el: Try and fix bug#69631

Browse source 
* lisp/emacs-lisp/eieio-core.el (eieio--class-precedence-c3)
(eieio--class-precedence-dfs, eieio--class-precedence-bfs): Use
`cl--class-parents` since some of the parents aren't EIEIO classes.
This commit is contained in:
Stefan Monnier 2024-03-08 10:47:01 -05:00
parent 966d0a62a1
commit 055e31f1d0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/emacs-lisp/eieio-core.el
View file

@ -960,7 +960,7 @@ need be... May remove that later...)"
(defun eieio--class-precedence-c3 (class)
"Return all parents of CLASS in c3 order."
(let ((parents (eieio--class-parents class)))
(let ((parents (cl--class-parents class)))
(cons class
(merge-ordered-lists
(append
@ -974,7 +974,7 @@ need be... May remove that later...)"
(defun eieio--class-precedence-dfs (class)
"Return all parents of CLASS in depth-first order."
(let* ((parents (eieio--class-parents class))
(let* ((parents (cl--class-parents class))
(classes (copy-sequence
(apply #'append
(list class)
@ -995,12 +995,12 @@ need be... May remove that later...)"
(defun eieio--class-precedence-bfs (class)
"Return all parents of CLASS in breadth-first order."
(let* ((result)
(queue (eieio--class-parents class)))
(queue (cl--class-parents class)))
(while queue
(let ((head (pop queue)))
(unless (member head result)
(push head result)
(setq queue (append queue (eieio--class-parents head))))))
(setq queue (append queue (cl--class-parents head))))))
(cons class (nreverse result)))
)