Fix &map pattern.

okamsn · Jan 26, 2024 · 9421941 · 9421941
1 parent e9195fd
commit 9421941
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/loopy-destructure.el b/loopy-destructure.el
@@ -473,8 +473,7 @@ holding the property list."
                               collect `(,'\, ,pat))))))))
 
 (defun loopy--pcase-pat-&map-pattern (map-vars)
-  (let ((mapsym (gensym "map"))
-        (keysym (gensym "key")))
+  (let ((mapsym (gensym "map")))
     `(and (pred mapp)
           ,@(mapcar (pcase-lambda ((and var-form
                                         (or (seq key var default supplied)
@@ -496,10 +495,10 @@ holding the property list."
                         `(app (lambda (,mapsym)
                                 ;; Using `map-contains-key' is a slower,
                                 ;; but more correct method.
-                                (macroexp-let2* ((,keysym ,key))
-                                    (if (map-contains-key ,mapsym ,keysym)
-                                        (cons t (map-elt ,mapsym ,keysym))
-                                      (cons nil ,default))))
+                                ,(macroexp-let2* ((keysym key))
+                                     `(if (map-contains-key ,mapsym ,keysym)
+                                          (cons t (map-elt ,mapsym ,keysym))
+                                        (cons nil ,default))))
                               (,'\` ((,'\, ,supplied) . (,'\, ,var)))))
                        (default
                         `(app (lambda (,mapsym) (map-elt ,mapsym ,key ,default))