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

diff --git a/unwind.c b/unwind.c
index 03ae0104..bb081994 100644
--- a/unwind.c
+++ b/unwind.c
@@ -158,14 +158,14 @@ val uw_set_match_context(val context)
 }
 
 void uw_push_debug(uw_frame_t *fr, 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)
 {
   fr->db.type = UW_DBG;
   fr->db.func = func;
   fr->db.args = args;
-  fr->db.ub_p_a_pairs = args;
-  fr->db.bindings = bindings;
+  fr->db.ub_p_a_pairs = ub_p_a_pairs;
+  fr->db.env = env;
   fr->db.data = data;
   fr->db.line = line;
   fr->db.chr = chr;