* debug.c (debug): Use new way of getting line number.

* eval.c (eval_error): Use source_loc_str to get source location.

* match.c (debuglf, sem_err, file_err): Likewise.

* parser.h (source_loc_str): Declared.

* parser.l (parse_init): form_to_ln_hash must be equal based now.

* parser.y (rl): Store new form of read-time source location info.

* txr.1: Documented load.

1 files changed, 2 insertions, 2 deletions

diff --git a/debug.c b/debug.c
index 175dc5b7..5aa2728d 100644
--- a/debug.c
+++ b/debug.c
@@ -60,7 +60,7 @@ static void show_bindings(val env, val stream)
 val debug(val form, val bindings, val data, val line, val pos, val base)
 {
   uses_or2;
-  val lineno = source_loc(form);
+  val lineno = car(source_loc(form));
 
   if (!step_mode && !memqual(lineno, breakpoints) 
       && (debug_depth > next_depth))
@@ -74,7 +74,7 @@ val debug(val form, val bindings, val data, val line, val pos, val base)
       val input, command;
 
       if (print_form) {
-        format(std_output, lit("stopped at line ~a\n"), lineno, nao);
+        format(std_output, lit("stopped at ~a\n"), source_loc_str(form), nao);
         format(std_output, lit("form: ~s\n"), form, nao);
         format(std_output, lit("depth: ~s\n"), num(debug_depth), nao);
         print_form = nil;