From 79559dec677dcc147d79222e3ce5a30cf17b1164 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Fri, 10 Jul 2015 08:26:08 -0700 Subject: Fix wrong name reported for errors in first top-level form. * parser.c (read_eval_stream): Get name of original stream, and pass that down to lisp_parse as the name argument. --- parser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'parser.c') diff --git a/parser.c b/parser.c index cbb4893b..2bc5879c 100644 --- a/parser.c +++ b/parser.c @@ -277,6 +277,7 @@ val lisp_parse(val source_in, val error_stream, val error_return_val, val name_i val read_eval_stream(val stream, val error_stream, val hash_bang_support) { val error_val = gensym(nil); + val name = stream_get_prop(stream, name_k); if (hash_bang_support) { val firstline = get_line(stream); @@ -292,7 +293,7 @@ val read_eval_stream(val stream, val error_stream, val hash_bang_support) } for (;;) { - val form = lisp_parse(stream, error_stream, error_val, nil); + val form = lisp_parse(stream, error_stream, error_val, name); if (form == error_val) { if (parser_errors(get_parser(stream)) == zero) -- cgit v1.2.3