* debug.c (help): Added missing help for w command.

(debug): In backtrace, show the renaming pairs for unbound
variables (up_p_a_pairs) if they are present.

* debug.h (debug_begin): Renamed to debug_frame.

* eval.c (eval): Wrap debug_begin/debug_end around function dispatch,
so TXR Lisp functions are included in backtraces.

* match.c (h_fun): Follow rename of debug_begin to debug_frame.
Pass in evaluated args, not the original ones.
(v_fun): Likewise.

* unwind.c (uw_push_debug): bindings argument renamed to env.
Bugfix: args argument was being assigned to ub_p_a_pairs.

* unwind.h (struct uw_debug): Member bindings renamed to env.
(uw_push_debug): Declaration updated.

1 files changed, 2 insertions, 2 deletions

diff --git a/unwind.h b/unwind.h
index 03e43982..f9c69ad0 100644
--- a/unwind.h
+++ b/unwind.h
@@ -71,7 +71,7 @@ struct uw_debug {
   val func;
   val args;
   val ub_p_a_pairs;
-  val bindings;
+  val env;
   val data;
   val line;
   val chr;
@@ -100,7 +100,7 @@ val uw_register_subtype(val sub, val super);
 val uw_exception_subtype_p(val sub, val sup);
 void uw_continue(uw_frame_t *curr, uw_frame_t *target);
 void uw_push_debug(uw_frame_t *, val func, val args,
-                   val ub_p_a_pairs, val bindings, val data,
+                   val ub_p_a_pairs, val env, val data,
                    val line, val chr);
 void uw_pop_frame(uw_frame_t *);
 uw_frame_t *uw_current_frame(void);