[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 055e31f1d02: eieio-core.el: Try and fix bug#69631
From: |
Stefan Monnier |
Subject: |
master 055e31f1d02: eieio-core.el: Try and fix bug#69631 |
Date: |
Fri, 8 Mar 2024 10:47:10 -0500 (EST) |
branch: master
commit 055e31f1d021ef2c8ac5cca505b5f73118736cff
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
eieio-core.el: Try and fix bug#69631
* 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.
---
lisp/emacs-lisp/eieio-core.el | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el
index 5418f53be35..7af6e9ff1bb 100644
--- a/lisp/emacs-lisp/eieio-core.el
+++ b/lisp/emacs-lisp/eieio-core.el
@@ -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)))
)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 055e31f1d02: eieio-core.el: Try and fix bug#69631,
Stefan Monnier <=