From 4f2f300bb835af37b86b8a1239bec6fb469b289f Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Sun, 21 Apr 2019 04:15:01 -0700 Subject: bugfix: source lineno off by one under hash bang. * eval.c (load): When we read and discard a hash bang line, we must set the parser line number to two. * parser.c (parser_set_lineno): New function. * parser.h (parser_set_lineno): Declared. * txr.c (check_hash_bang): New argument, occurs. (txr_main): Track whether hash bang has occurred in a new local variable hb_occurs. Then, before parsing, if hash bang has occurred, set the line number to two. --- txr.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'txr.c') diff --git a/txr.c b/txr.c index 5c9ce0c6..fccbb89a 100644 --- a/txr.c +++ b/txr.c @@ -189,13 +189,14 @@ static void hint(void) } #endif -static val check_hash_bang(val stream, val args) +static val check_hash_bang(val stream, val args, int *occurs) { val line = get_line(stream); if (line) { if (match_str(line, lit("#!"), nil)) { val pos = search_str(line, lit("\xdc00"), nil, nil); + *occurs = 1; if (pos) { val after_null = sub_str(line, succ(pos), t); @@ -511,6 +512,7 @@ int txr_main(int argc, char **argv) val compat_var = lit("TXR_COMPAT"); val compat_val = getenv_wrap(compat_var); val orig_args = nil, ref_arg_list = nil; + int hb_occurs = 0; list_collect_decl(arg_list, arg_tail); list_collect_decl(eff_arg_list, eff_arg_tail); @@ -576,7 +578,7 @@ int txr_main(int argc, char **argv) simulate_setuid_setgid(parse_stream); dyn_env = make_env(nil, nil, dyn_env); env_vbind(dyn_env, load_path_s, spec_file_str); - arg_list = check_hash_bang(parse_stream, arg_undo); + arg_list = check_hash_bang(parse_stream, arg_undo, &hb_occurs); set(eff_arg_tail, butlastn(one, deref(eff_arg_tail))); continue; } @@ -877,7 +879,7 @@ int txr_main(int argc, char **argv) simulate_setuid_setgid(parse_stream); dyn_env = make_env(nil, nil, dyn_env); env_vbind(dyn_env, load_path_s, spec_file_str); - arg_list = check_hash_bang(parse_stream, arg_list); + arg_list = check_hash_bang(parse_stream, arg_list, &hb_occurs); } else { drop_privilege(); spec_file_str = lit("stdin"); @@ -1050,6 +1052,9 @@ int txr_main(int argc, char **argv) env_vbind(dyn_env, load_recursive_s, t); + if (hb_occurs) + parser_set_lineno(prog_string, parse_stream, two); + if (!txr_lisp_p) { int gc = gc_state(0); -- cgit v1.2.3