From: Clément Pit-Claudel <clement.pitclaudel@live.com>
Date: Tue, 18 Aug 2020 14:06:29 +0000 (+0200)
Subject: Fix ert ability to peek inside structures when comparing unequal values
X-Git-Tag: emacs-28.0.90~6554
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=82893e9e8e0dae5cbd3ae26a7ee92896fcadfdae;p=emacs.git

Fix ert ability to peek inside structures when comparing unequal values

* lisp/emacs-lisp/ert.el (ert--explain-equal-rec): Treat records
as arrays (bug#40562).  Also add support for cl-structs.
---

diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 764354b03b7..241eece05b6 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -515,7 +515,14 @@ Returns nil if they are."
                        `(cdr ,cdr-x)
                      (cl-assert (equal a b) t)
                      nil))))))))
-      ((pred arrayp)
+      ((pred cl-struct-p)
+       (cl-loop for slot in (cl-struct-slot-info (type-of a))
+                for ai across a
+                for bi across b
+                for xf = (ert--explain-equal-rec ai bi)
+                do (when xf (cl-return `(struct-field ,(car slot) ,xf)))
+                finally (cl-assert (equal a b) t)))
+      ((or (pred arrayp) (pred recordp))
        ;; For mixed unibyte/multibyte string comparisons, make both multibyte.
        (when (and (stringp a)
                   (xor (multibyte-string-p a) (multibyte-string-p b)))