From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 30 Mar 2022 17:49:31 +0000 (-0400)
Subject: EIEIO tests: Fix failure when `eieio-core.el` is interpreted
X-Git-Tag: emacs-29.0.90~1931^2~856
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b12ad270ebffb2b048f01d2992b472503b78dc33;p=emacs.git

EIEIO tests: Fix failure when `eieio-core.el` is interpreted

* lisp/emacs-lisp/eieio-core.el (eieio--validate-slot-value)
(eieio--slot-name-index): Use the `cl--class` accessor functions.
---

diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el
index 19aa20fa086..ed1a28a24fb 100644
--- a/lisp/emacs-lisp/eieio-core.el
+++ b/lisp/emacs-lisp/eieio-core.el
@@ -704,7 +704,7 @@ an error."
       nil
     ;; Trim off object IDX junk added in for the object index.
     (setq slot-idx (- slot-idx (eval-when-compile eieio--object-num-slots)))
-    (let* ((sd (aref (eieio--class-slots class)
+    (let* ((sd (aref (cl--class-slots class)
                      slot-idx))
            (st (cl--slot-descriptor-type sd)))
       (cond
@@ -712,7 +712,7 @@ an error."
 	(signal 'invalid-slot-type
                 (list (eieio--class-name class) slot st value)))
        ((alist-get :read-only (cl--slot-descriptor-props sd))
-        (signal 'eieio-read-only (list (eieio--class-name class) slot)))))))
+        (signal 'eieio-read-only (list (cl--class-name class) slot)))))))
 
 (defun eieio--validate-class-slot-value (class slot-idx value slot)
   "Make sure that for CLASS referencing SLOT-IDX, VALUE is valid.
@@ -896,7 +896,7 @@ The slot is a symbol which is installed in CLASS by the `defclass' call.
 If SLOT is the value created with :initarg instead,
 reverse-lookup that name, and recurse with the associated slot value."
   ;; Removed checks to outside this call
-  (let* ((fsi (gethash slot (eieio--class-index-table class))))
+  (let* ((fsi (gethash slot (cl--class-index-table class))))
     (if (integerp fsi)
         fsi
       (let ((fn (eieio--initarg-to-attribute class slot)))