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

diff --git a/parser.h b/parser.h
index ccc1ad23..fdd45e44 100644
--- a/parser.h
+++ b/parser.h
@@ -63,7 +63,7 @@ void prime_parser(parser_t *, int hold_byte, val name);
 int parse_once(val stream, val name, parser_t *parser);
 int parse(parser_t *parser, val name);
 val source_loc(val form);
-val source_loc_str(val form);
+val source_loc_str(val form, val alt);
 val rlset(val form, val info);
 INLINE val rlcp(val to, val from)
 {