* lib.h (or2): Restore macro version of or2, because we need

the sequencing! Making it an inline function broke the tests.
But we can't have multiple evaluation either, so it's going to use
a temporary lexical variable.
(uses_or2): Macro which declares the lexical variable needed by or2.

* debug.c (debug): add uses_or2.

* eval.c (eval_intrinsic, op_modplace): Likewise.

* lib.c (lazy_str, lazy_str_force_upto, lazy_str_get_trailing_list):
Likewise.

* match.c (h_parallel, v_freeform, v_parallel, v_output): Likewise.

* parser.y (unquotes_occur): Likewise.

* stream.c (format): Likewise.

1 files changed, 2 insertions, 0 deletions

diff --git a/parser.y b/parser.y
index 6df6452e..affcd636 100644
--- a/parser.y
+++ b/parser.y
@@ -887,6 +887,8 @@ static val optimize_text(val text_form)
 
 static val unquotes_occur(val quoted_form)
 {
+  uses_or2;
+
   if (atom(quoted_form)) {
     return nil;
   } else {