diff options
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | eval.c | 13 | ||||
| -rw-r--r-- | match.c | 9 | ||||
| -rw-r--r-- | parser.h | 2 | ||||
| -rw-r--r-- | parser.l | 8 | ||||
| -rw-r--r-- | txr.1 | 11 | ||||
| -rw-r--r-- | unwind.c | 6 |
7 files changed, 47 insertions, 22 deletions
@@ -1,5 +1,25 @@ 2015-08-04 Kaz Kylheku <kaz@kylheku.com> + * 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. + +2015-08-04 Kaz Kylheku <kaz@kylheku.com> + * hash.c (hash_revget): New function. * hash.h (hash_revget): Declared. @@ -151,16 +151,17 @@ static void env_vb_to_fb(val env) noreturn static val eval_error(val form, val fmt, ...) { + uses_or2; va_list vl; val stream = make_string_output_stream(); + val loc = or2(source_loc_str(form, nil), + source_loc_str(last_form_evaled, nil)); va_start (vl, fmt); - if (!form) - form = last_form_evaled; + if (loc) + format(stream, lit("(~a) "), loc, nao); - if (form) - format(stream, lit("(~a) "), source_loc_str(form), nao); (void) vformat(stream, fmt, vl); va_end (vl); @@ -3743,7 +3744,7 @@ static val force(val promise) return ret; } else if (deref(pstate) == promise_inprogress_s) { val form = second(cdr(cd)); - val sloc = source_loc_str(form); + val sloc = source_loc_str(form, colon_k); eval_error(nil, lit("force: recursion forcing delayed form ~s (~a)"), form, sloc, nao); } else { @@ -4627,7 +4628,7 @@ void eval_init(void) reg_fun(intern(lit("make-time-utc"), user_package), func_n7(make_time_utc)); reg_fun(intern(lit("source-loc"), user_package), func_n1(source_loc)); - reg_fun(intern(lit("source-loc-str"), user_package), func_n1(source_loc_str)); + reg_fun(intern(lit("source-loc-str"), user_package), func_n2o(source_loc_str, 1)); reg_fun(intern(lit("rlcp"), user_package), func_n2(rlcp)); eval_error_s = intern(lit("eval-error"), user_package); @@ -75,7 +75,8 @@ static void debuglf(val form, val fmt, ...) if (opt_loglevel >= 2) { va_list vl; va_start (vl, fmt); - format(std_error, lit("~a: (~a) "), prog_string, source_loc_str(form), nao); + format(std_error, lit("~a: (~a) "), prog_string, + source_loc_str(form, colon_k), nao); vformat(std_error, fmt, vl); put_char(chr('\n'), std_error); va_end (vl); @@ -89,7 +90,7 @@ static void sem_error(val form, val fmt, ...) va_start (vl, fmt); if (form) - format(stream, lit("(~a) "), source_loc_str(form), nao); + format(stream, lit("(~a) "), source_loc_str(form, colon_k), nao); (void) vformat(stream, fmt, vl); va_end (vl); @@ -104,7 +105,7 @@ static void file_err(val form, val fmt, ...) va_start (vl, fmt); if (form) - format(stream, lit("(~a) "), source_loc_str(form), nao); + format(stream, lit("(~a) "), source_loc_str(form, colon_k), nao); (void) vformat(stream, fmt, vl); va_end (vl); @@ -119,7 +120,7 @@ static void typed_error(val type, val form, val fmt, ...) va_start (vl, fmt); if (form) - format(stream, lit("(~a) "), source_loc_str(form), nao); + format(stream, lit("(~a) "), source_loc_str(form, colon_k), nao); (void) vformat(stream, fmt, vl); va_end (vl); @@ -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) { @@ -991,12 +991,12 @@ val source_loc(val form) return gethash(form_to_ln_hash, form); } -val source_loc_str(val form) +val source_loc_str(val form, val alt) { cons_bind (line, file, gethash(form_to_ln_hash, form)); - return if3(line, - format(nil, lit("~a:~a"), file, line, nao), - lit("source location n/a")); + if (missingp(alt)) + alt = lit("source location n/a"); + return if3(line, format(nil, lit("~a:~a"), file, line, nao), alt); } void parser_l_init(void) @@ -30985,7 +30985,7 @@ one specifies the result of .coNP Functions @ source-loc and @ source-loc-str .synb .mets (source-loc << form ) -.mets (source-loc-str << form ) +.mets (source-loc-str << form <> [ alternative ]) .syne .desc These functions map an expression in a \*(TX program to the file name and @@ -31009,9 +31009,14 @@ is not a piece of the program source code that was constructed by the .code source-loc returns .codn nil , -and +and, in the absence of the +.meta alternative +argument, .code source-loc-str -returns a string whose text says that source location is not available. +returns a string whose text says that source location is not available, +otherwise it returns the +.meta alternative +argument. .coNP Function @ rlcp .synb @@ -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); |