* 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, 1 insertions, 0 deletions

diff --git a/stream.c b/stream.c
index 395d9ab6..e337e523 100644
--- a/stream.c
+++ b/stream.c
@@ -1018,6 +1018,7 @@ val vformat_to_string(val fmtstr, va_list vl)
 
 val format(val stream, val str, ...)
 {
+  uses_or2;
   val st = if3(stream == t,
                std_output,
                or2(stream, make_string_output_stream()));