* eval.c (expand_op): When the variant is do, and the symbol

is an operator, then suppress the addition of the rest
parameter in the dotted cons position at the end of the form,
since this mechanism for applying additional arguments is only
supported by function calls, not by special forms.

* lib.h (and2, and3): New macros.

1 files changed, 4 insertions, 0 deletions

diff --git a/lib.h b/lib.h
index 5c9b89ce..6a12cf36 100644
--- a/lib.h
+++ b/lib.h
@@ -726,6 +726,10 @@ INLINE val eq(val a, val b) { return ((a) == (b) ? t : nil); }
 
 #define or4(a, b, c, d) or2(a, or3(b, c, d))
 
+#define and2(a, b) ((a) ? (b) : nil)
+
+#define and3(a, b, c) ((a) && (b) ? (c) : nil)
+
 #define c_true(c_cond) ((c_cond) ? t : nil)
 
 #define list_collect_decl(OUT, PTAIL)           \