Re: master 2e9111813b: Add two classic Common Lisp macro-writing macros

[Sean Whitton <spwhitton@spwhitton.name>]

[-- Attachment #1: Type: text/plain, Size: 1059 bytes --]

Hello,

On Tue 12 Apr 2022 at 10:46am +02, Lars Ingebrigtsen wrote:

> Sean Whitton <spwhitton@spwhitton.name> writes:
>
>>     Add two classic Common Lisp macro-writing macros
>>
>>     * lisp/emacs-lisp/cl-macs.el (cl-with-gensyms, cl-once-only): New macros.
>
> Emacs now gives a lot of the following warnings when compiling -- I
> haven't checked that it's due to the commit above, but I guess it's
> either that or 6a480c830b.
>
> Warning: Eager macro-expansion skipped due to cycle:
>   … => (load "cl-macs.el") => (macroexpand-all …) => (macroexpand (cl-psetq …)) => (load "cl-macs.el")
> Warning: Eager macro-expansion skipped due to cycle:
>   … => (load "cl-macs.el") => (macroexpand-all …) => (macroexpand (cl-psetq …)) => (load "cl-macs.el")
>   ELC      calendar/diary-lib.elc
>   ELC      calendar/holidays.elc
> Warning: Eager macro-expansion skipped due to cycle:

Here is the fix.  I'll be at a machine where I can install it later
today, or someone else can sooner.  Apologies again!

-- 
Sean Whitton

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-eager-macroexpansion-cycle-in-cl-once-only.patch --]
[-- Type: text/x-diff, Size: 1416 bytes --]

From f467478832a9041017653a07619acfdb9406ad99 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Tue, 12 Apr 2022 08:48:18 -0700
Subject: [PATCH] Fix eager macroexpansion cycle in cl-once-only

* lisp/emacs-lisp/cl-macs.el (cl-once-only): Use different cl-loop
syntax, with no functional change, but such that the loop does not
expand into cl-psetq.
---
 lisp/emacs-lisp/cl-macs.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index af8855516c..364b5120a0 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2473,11 +2473,11 @@ cl-once-only
        ;; We require this explicit call to `list' rather than using
        ;; (,,@(cl-loop ...)) due to a limitation of Elisp's backquote.
        `(let ,(list
-               ,@(cl-loop for name in names and gensym in our-gensyms
+               ,@(cl-loop for name in names for gensym in our-gensyms
                           for to-eval = (or (cadr name) (car name))
                           collect ``(,,gensym ,,to-eval)))
           ;; During macroexpansion, bind each NAME to its gensym.
-          ,(let ,(cl-loop for name in names and gensym in our-gensyms
+          ,(let ,(cl-loop for name in names for gensym in our-gensyms
                           collect `(,(car name) ,gensym))
              ,@body)))))
 
-- 
2.30.2