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, 5 insertions, 3 deletions

diff --git a/txr.c b/txr.c
index 570a0aa6..9b84aabb 100644
--- a/txr.c
+++ b/txr.c
@@ -262,6 +262,7 @@ int txr_main(int argc, char **argv)
           }
 
           opt_arraydims = c_num(optval);
+          opt_print_bindings = 1;
         }
         break;
       case 'c':
@@ -303,6 +304,7 @@ int txr_main(int argc, char **argv)
       continue;
     } else if (equal(arg, lit("--lisp-bindings"))) {
       opt_lisp_bindings = 1;
+      opt_print_bindings = 1;
       continue;
     } else if (equal(arg, lit("--debugger"))) {
 #if CONFIG_DEBUG_SUPPORT
@@ -330,14 +332,14 @@ int txr_main(int argc, char **argv)
         case 'q':
           match_loglevel = 0;
           break;
-        case 'b':
-          opt_nobindings = 1;
+        case 'b': /* deprecated */
           break;
         case 'B':
-          opt_nobindings = -1;
+          opt_print_bindings = 1;
           break;
         case 'l':
           opt_lisp_bindings = 1;
+          opt_print_bindings = 1;
           break;
         case 'd':
 #if CONFIG_DEBUG_SUPPORT