From c50f6538cfc43d856b361347c945f6348c6f2dc9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mattias=20Engdeg=C3=A5rd?= Date: Tue, 25 Jul 2023 12:15:00 +0200 Subject: [PATCH] ; bytecode backtrace test clean-up --- test/lisp/emacs-lisp/bytecomp-tests.el | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/lisp/emacs-lisp/bytecomp-tests.el b/test/lisp/emacs-lisp/bytecomp-tests.el index 9813e9459c8..16c6408c921 100644 --- a/test/lisp/emacs-lisp/bytecomp-tests.el +++ b/test/lisp/emacs-lisp/bytecomp-tests.el @@ -1967,17 +1967,17 @@ EXPECTED-POINT BINDINGS (MODES \\='\\='(ruby-mode js-mode python-mode)) \ ;; Test both calling the function directly, and calling ;; a byte-compiled η-expansion (lambda (ARGS...) (FUN ARGS...)) ;; which should turn the function call into a byte-op. - (dolist (byte-op '(nil t)) - (ert-info ((prin1-to-string byte-op) :prefix "byte-op: ") - (let* ((fun - (if byte-op - (let* ((nargs (length (cdr call))) - (formals (mapcar (lambda (i) - (intern (format "x%d" i))) - (number-sequence 1 nargs)))) - (byte-compile - `(lambda ,formals (,fun-sym ,@formals)))) - fun-sym)) + (dolist (mode '(funcall byte-op)) + (ert-info ((symbol-name mode) :prefix "mode: ") + (let* ((fun (pcase-exhaustive mode + ('funcall fun-sym) + ('byte-op + (let* ((nargs (length (cdr call))) + (formals (mapcar (lambda (i) + (intern (format "x%d" i))) + (number-sequence 1 nargs)))) + (byte-compile + `(lambda ,formals (,fun-sym ,@formals))))))) (error-frame (bytecomp-tests--error-frame fun actuals))) (should (consp error-frame)) (should (equal (car error-frame) (list 'error expected-error))) -- 2.39.5