Task #11486: continuation. Take into account base position

in debug reporting.

* debug.c (debug): New argument, base.

* debug.h (debug_check): New argument, base.
(debug): Declaration updated.

* eval.c (do_eval): Pass new argument of debug_check as nil.

* match.c (LOG_MISMATCH, LOG_MATCH): Take into account base
when displaying character position.
(do_match_line): Pass base position to debug_check.
(match_files): Pass nil as base to debug_check.

5 files changed, 33 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 7355f133..5c0dad7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2012-02-12  Kaz Kylheku  <kaz@kylheku.com>
+
+	Task #11486: continuation. Take into account base position
+	in debug reporting.
+
+	* debug.c (debug): New argument, base.
+
+	* debug.h (debug_check): New argument, base.
+	(debug): Declaration updated.
+
+	* eval.c (do_eval): Pass new argument of debug_check as nil.
+
+	* match.c (LOG_MISMATCH, LOG_MATCH): Take into account base
+	when displaying character position.
+	(do_match_line): Pass base position to debug_check.
+	(match_files): Pass nil as base to debug_check.
+
 2012-02-11  Kaz Kylheku  <kaz@kylheku.com>
 
 	Task #11486: continuation. Now able to @(skip) through
diff --git a/debug.c b/debug.c
index f7b74642..ab20f5aa 100644
--- a/debug.c
+++ b/debug.c
@@ -56,7 +56,7 @@ static void show_bindings(val env, val stream)
   }
 }
 
-val debug(val form, val bindings, val data, val line, val chr)
+val debug(val form, val bindings, val data, val line, val val pos, val base)
 {
   uses_or2;
   val lineno = source_loc(form);
@@ -80,12 +80,12 @@ val debug(val form, val bindings, val data, val line, val chr)
       }
 
       if (print_data) {
-        if (data && chr) {
-          val prefix = sub_str(data, zero, chr);
-          val suffix = sub_str(data, chr, nil);
+        if (data && pos) {
+          val prefix = sub_str(data, zero, pos);
+          val suffix = sub_str(data, pos, nil);
 
           format(std_output, lit("data (~s:~s):\n~s . ~s\n"),
-                 line, chr, prefix, suffix, nao);
+                 line, plus(pos, base), prefix, suffix, nao);
         } else {
           format(std_output, lit("data (~s):\n~s\n"), line, data, nao);
         }
diff --git a/debug.h b/debug.h
index cfa3c3ce..a915ce6c 100644
--- a/debug.h
+++ b/debug.h
@@ -28,7 +28,7 @@ extern int opt_debugger;
 extern int debug_depth;
 extern val debug_block_s;
 
-val debug(val form, val bindings, val data, val line, val chr);
+val debug(val form, val bindings, val data, val line, val pos, val base);
 
 #if CONFIG_DEBUG_SUPPORT
 
@@ -51,9 +51,10 @@ val debug(val form, val bindings, val data, val line, val chr);
 #define debug_return(VAL)                               \
   uw_block_return(debug_block_s, VAL)
 
-INLINE val debug_check(val form, val bindings, val data, val line, val chr)
+INLINE val debug_check(val form, val bindings, val data, val line,
+                       val pos, val base)
 {
-  return (opt_debugger) ? debug(form, bindings, data, line, chr) : nil;
+  return (opt_debugger) ? debug(form, bindings, data, line, pos, base) : nil;
 }
 
 void debug_init(void);
diff --git a/eval.c b/eval.c
index 947d53d8..598e25a2 100644
--- a/eval.c
+++ b/eval.c
@@ -361,7 +361,7 @@ static val do_eval(val form, val env, val ctx_form,
   debug_enter;
 
   type_check(env, ENV);
-  debug_check(consp(form) ? form : ctx_form, env, nil, nil, nil);
+  debug_check(consp(form) ? form : ctx_form, env, nil, nil, nil, nil);
 
   if (nullp(form)) {
     debug_return (nil);
diff --git a/match.c b/match.c
index 6fe35112..d99b1173 100644
--- a/match.c
+++ b/match.c
@@ -380,14 +380,14 @@ typedef val (*h_match_func)(match_line_ctx *c);
 
 #define LOG_MISMATCH(KIND)                                              \
   debuglf(elem, lit(KIND " mismatch, position ~a (~a:~a)"),             \
-          c->pos, c->file, c->data_lineno, nao);                        \
+          plus(c->pos, c->base), c->file, c->data_lineno, nao);         \
   debuglf(elem, lit("  ~a"), c->dataline, nao);                         \
   if (c_num(c->pos) < 77)                                               \
     debuglf(elem, lit("  ~*~a^"), c->pos, lit(""), nao)
 
 #define LOG_MATCH(KIND, EXTENT)                                         \
   debuglf(elem, lit(KIND " matched, position ~a-~a (~a:~a)"),           \
-          c->pos, EXTENT, c->file, c->data_lineno, nao);                \
+          plus(c->pos, c->base), EXTENT, c->file, c->data_lineno, nao); \
   debuglf(elem, lit("  ~a"), c->dataline, nao);                         \
   if (c_num(EXTENT) < 77)                                               \
     debuglf(elem, lit("  ~*~a~<*~a^"), c->pos, lit(""),                 \
@@ -1110,7 +1110,8 @@ static val do_match_line(match_line_ctx *c)
 
     elem = first(c->specline);
 
-    debug_check(elem, c->bindings, c->dataline, c->data_lineno, c->pos);
+    debug_check(elem, c->bindings, c->dataline, c->data_lineno,
+                c->pos, c->base);
 
     switch (elem ? type(elem) : 0) {
     case CONS: /* directive */
@@ -3437,7 +3438,8 @@ repeat_spec_same_data:
   {
     spec_bind (specline, first_spec, c.spec);
 
-    debug_check(first_spec, c.bindings, if2(consp(c.data), car(c.data)), c.data_lineno, nil);
+    debug_check(first_spec, c.bindings, if2(consp(c.data), car(c.data)), 
+                c.data_lineno, nil, nil);
 
     if (consp(first_spec) && !rest(specline)) {
       val sym = first(first_spec);