* eval.c (force): Default the new second argument of source_loc_str.

(eval_error): Derive location of error from
the last_form_evaled, if form doesn't have it.
(eval_init): Re-register source-loc-str as binary with an optional arg.

* match.c (debuglf, sem_error, file_err, typed_error): Default new
argument of source_loc_str.

* parser.h (source_loc_str): Declaration updated.

* parser.l (source_loc_str): Take second argument which specifies
alternative value if the source loc info is not found.

* unwind.c (uw_throw): Simplify code thanks to source_loc_str
default argument.

* txr.1: Document new argument of source-loc-str.

1 files changed, 2 insertions, 4 deletions

diff --git a/unwind.c b/unwind.c
index 51c2dae0..12878d9b 100644
--- a/unwind.c
+++ b/unwind.c
@@ -313,10 +313,8 @@ val uw_throw(val sym, val args)
     if (opt_loglevel >= 1) {
       val is_msg = and2(stringp(car(args)), null(cdr(args)));
       val msg_or_args = if3(is_msg, car(args), args);
-      val info = if2(source_loc(last_form_evaled),
-                     source_loc_str(last_form_evaled));
-      val ex_info = if2(source_loc(last_form_expanded),
-                        source_loc_str(last_form_expanded));
+      val info = source_loc_str(last_form_evaled, nil);
+      val ex_info = source_loc_str(last_form_expanded, nil);
       format(std_error, lit("~a: unhandled exception of type ~a:\n"),
              prog_string, sym, nao);