Compiles as C++ again.

* lib.h (cons_set): New macro.

* match.c (match_line, match_files): In collect clause handlers,
move variable declarations above goto, and initialize with
cons_set, instead of declaring and initializing with cons_bind.
This eliminates the stupid C++ error that goto skips a variable
initialization (which happens even when it can be trivially
proven that the has no next use at the goto site!)

1 files changed, 8 insertions, 0 deletions

diff --git a/lib.h b/lib.h
index 329504a5..ae5bb79e 100644
--- a/lib.h
+++ b/lib.h
@@ -445,6 +445,14 @@ INLINE val eq(val a, val b) { return ((a) == (b) ? t : nil); }
   obj_t *CAR = car(c_o_n_s ## CAR ## CDR);      \
   obj_t *CDR = cdr(c_o_n_s ## CAR ## CDR)
 
+#define cons_set(CAR, CDR, CONS)                \
+  do {                                          \
+     obj_t *c_o_n_s ## CAR ## CDR = CONS;       \
+     CAR = car(c_o_n_s ## CAR ## CDR);          \
+     CDR = cdr(c_o_n_s ## CAR ## CDR);          \
+  } while (0)
+
+
 #define zero num_fast(0)
 #define one num_fast(1)
 #define two num_fast(2)