The dumping of bindings and printing of false must now

be explicitly requested by the -B option.

* match.c (opt_nobindings): Variable removed.
(opt_print_bindings): New variable.
(extract): Print bindings or "false" if opt_print_bindings is true.

* stream.c (output_produced): Variable removed.
(stdio_put_string, stdio_put_char, stdio_put_byte): Remove
update of output_produced.

* stream.h (output_produced): Declaration removed.

* txr.1: Documentation updated.

* txr.c (txr_main): Option 'b' does nothing. 'B', 'l', 'a',
and '--lisp-bindings' set opt_print_bindings to 1.

* txr.h (opt_nobindings): Declaration removed.
(opt_print_bindings): Declared.

* unwind.c (uw_throw): When exiting due to a query error or
file error, print false when opt_print_bindings is true.

1 files changed, 0 insertions, 11 deletions

diff --git a/stream.c b/stream.c
index 75b51c97..b12d06e0 100644
--- a/stream.c
+++ b/stream.c
@@ -62,8 +62,6 @@
 #include "utf8.h"
 #include "eval.h"
 
-val output_produced;
-
 val stdin_s, stdout_s, stddebug_s, stderr_s, stdnull_s;
 
 val dev_k, ino_k, mode_k, nlink_k, uid_k;
@@ -219,9 +217,6 @@ static val stdio_put_string(val stream, val str)
 {
   struct stdio_handle *h = (struct stdio_handle *) stream->co.handle;
 
-  if (stream != std_debug && stream != std_error)
-    output_produced = t;
-
   if (h->f != 0) {
     const wchar_t *s = c_str(str);
 
@@ -238,9 +233,6 @@ static val stdio_put_char(val stream, val ch)
 {
   struct stdio_handle *h = (struct stdio_handle *) stream->co.handle;
 
-  if (stream != std_debug && stream != std_error)
-    output_produced = t;
-
   return h->f != 0 && utf8_encode(c_chr(ch), stdio_put_char_callback, (mem_t *) h->f)
          ? t : stdio_maybe_error(stream, lit("writing"));
 }
@@ -249,9 +241,6 @@ static val stdio_put_byte(val stream, int b)
 {
   struct stdio_handle *h = (struct stdio_handle *) stream->co.handle;
 
-  if (stream != std_debug && stream != std_error)
-    output_produced = t;
-
   return h->f != 0 && se_putc(b, (FILE *) h->f) != EOF
          ? t : stdio_maybe_error(stream, lit("writing"));
 }