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.

1 files changed, 5 insertions, 5 deletions

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);
         }