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

diff --git a/match.c b/match.c
index 5691511d..cbb74e3a 100644
--- a/match.c
+++ b/match.c
@@ -70,8 +70,7 @@ static void debuglf(val form, val fmt, ...)
   if (opt_loglevel >= 2) {
     va_list vl;
     va_start (vl, fmt);
-    format(std_error, lit("~a: (~a:~a) "), prog_string,
-           spec_file_str, source_loc(form), nao);
+    format(std_error, lit("~a: (~a) "), prog_string, source_loc_str(form), nao);
     vformat(std_error, fmt, vl);
     put_char(chr('\n'), std_error);
     va_end (vl);
@@ -85,7 +84,7 @@ static void sem_error(val form, val fmt, ...)
 
   va_start (vl, fmt);
   if (form)
-    format(stream, lit("(~a:~a) "), spec_file_str, source_loc(form), nao);
+    format(stream, lit("(~a) "), source_loc(form), nao);
   (void) vformat(stream, fmt, vl);
   va_end (vl);
 
@@ -100,7 +99,7 @@ static void file_err(val form, val fmt, ...)
 
   va_start (vl, fmt);
   if (form)
-    format(stream, lit("(~a:~a) "), spec_file_str, source_loc(form), nao);
+    format(stream, lit("(~a) "), source_loc(form), nao);
   (void) vformat(stream, fmt, vl);
   va_end (vl);