summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--parser.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 94506078..09e1a1bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2015-07-10 Kaz Kylheku <kaz@kylheku.com>
+ 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.
+
+2015-07-10 Kaz Kylheku <kaz@kylheku.com>
+
Fix off by one error line numbers for .tl files.
* parser.c (read_eval_stream): Add terminating newline to
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)