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

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