[elpa] externals/compat 18152ca068 76/84: Fix edge-case of binding nil in if-let* and related macros

[ELPA Syncer]

branch: externals/compat
commit 18152ca06805dc93bc9f15e26c5b298323683afb
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>

    Fix edge-case of binding nil in if-let* and related macros
---
 compat-25.el    |  4 ++--
 compat-26.el    |  6 +++---
 compat-tests.el | 20 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/compat-25.el b/compat-25.el
index 54ea191f45..ace517d502 100644
--- a/compat-25.el
+++ b/compat-25.el
@@ -158,7 +158,7 @@ with an old syntax that accepted only one binding."
         (last t) list)
     (dolist (var spec)
       (push `(,(if (cdr var) (car var) empty)
-              (and ,last ,(or (cadr var) (car var))))
+              (and ,last ,(if (cdr var) (cadr var) (car var))))
             list)
       (when (or (cdr var) (consp (car var)))
         (setq last (caar list))))
@@ -183,7 +183,7 @@ The variable list SPEC is the same as in `if-let'."
         (last t) list)
     (dolist (var spec)
       (push `(,(if (cdr var) (car var) empty)
-              (and ,last ,(or (cadr var) (car var))))
+              (and ,last ,(if (cdr var) (cadr var) (car var))))
             list)
       (when (or (cdr var) (consp (car var)))
         (setq last (caar list))))
diff --git a/compat-26.el b/compat-26.el
index 6df2545cd7..fd87057805 100644
--- a/compat-26.el
+++ b/compat-26.el
@@ -373,7 +373,7 @@ This is like `if-let' but doesn't handle a VARLIST of the 
form
         (last t) list)
     (dolist (var varlist)
       (push `(,(if (cdr var) (car var) empty)
-              (and ,last ,(or (cadr var) (car var))))
+              (and ,last ,(if (cdr var) (cadr var) (car var))))
             list)
       (when (or (cdr var) (consp (car var)))
         (setq last (caar list))))
@@ -391,7 +391,7 @@ This is like `when-let' but doesn't handle a VARLIST of the 
form
         (last t) list)
     (dolist (var varlist)
       (push `(,(if (cdr var) (car var) empty)
-              (and ,last ,(or (cadr var) (car var))))
+              (and ,last ,(if (cdr var) (cadr var) (car var))))
             list)
       (when (or (cdr var) (consp (car var)))
         (setq last (caar list))))
@@ -410,7 +410,7 @@ are non-nil, then the result is non-nil."
         (last t) list)
     (dolist (var varlist)
       (push `(,(if (cdr var) (car var) empty)
-              (and ,last ,(or (cadr var) (car var))))
+              (and ,last ,(if (cdr var) (cadr var) (car var))))
             list)
       (when (or (cdr var) (consp (car var)))
         (setq last (caar list))))
diff --git a/compat-tests.el b/compat-tests.el
index 38fcc724b9..e19c5905a9 100644
--- a/compat-tests.el
+++ b/compat-tests.el
@@ -1174,6 +1174,12 @@ being compared against."
 
 (ert-deftest compat-if-let* ()
   "Check if `compat--if-let*' was implemented properly."
+  (should                               ;trivial condition
+   (eq (compat--if-let* ((test t)) 'true 'false) 'true))
+  (should                               ;trivial non-condition
+   (eq (compat--if-let* ((test nil)) 'true 'false) 'false))
+  (should                               ;non-binding non-condition
+   (eq (compat--if-let* (((ignore))) 'true 'false) 'false))
   (should
    (compat--if-let*
     ((x 3)
@@ -1187,6 +1193,14 @@ being compared against."
 
 (ert-deftest compat-if-let ()
   "Check if `compat--if-let' was implemented properly."
+  (should                               ;trivial condition
+   (eq (compat--if-let ((test t)) 'true 'false) 'true))
+  (should                               ;trivial non-condition
+   (eq (compat--if-let ((test nil)) 'true 'false) 'false))
+  (should                               ;trivial non-condition
+   (eq (compat--if-let (test nil) 'true 'false) 'false))
+  (should                               ;non-binding non-condition
+   (eq (compat--if-let (((ignore))) 'true 'false) 'false))
   (should (compat--if-let ((e (memq 0 '(1 2 3 0 5 6))))
               e))
   (should-not (compat--if-let ((e (memq 0 '(1 2 3 5 6)))
@@ -1200,6 +1214,12 @@ being compared against."
 
 (ert-deftest compat-and-let* ()
   "Check if `compat--and-let*' was implemented properly."
+  (should                               ;trivial condition
+   (compat--and-let* ((test t))))
+  (should                               ;trivial non-condition
+   (not (compat--and-let* ((test nil)))))
+  (should                               ;non-binding non-condition
+   (not (compat--and-let* (((ignore))))))
   (should                               ;trivial body
    (compat--and-let*
     ((x 3)