From a8449a74871f420759b26b60e368548b7938e35c Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Thu, 6 Mar 2014 20:42:02 -0800 Subject: * match.c: (v_next): Set the "curfile" in the context to "env" when scanning environment. (open_data_source): Regression: was not setting c->curfile when opening anything. --- ChangeLog | 7 +++++++ match.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d7521c86..301ef5d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-03-06 Kaz Kylheku + + * match.c: (v_next): Set the "curfile" in the context to "env" when + scanning environment. + (open_data_source): Regression: was not setting c->curfile when opening + anything. + 2014-03-06 Kaz Kylheku * eval.c (apply_intrinsic, lazy_mapcar): Changed linkage to external. diff --git a/match.c b/match.c index 8cb61f95..69baad5d 100644 --- a/match.c +++ b/match.c @@ -2267,7 +2267,7 @@ static val v_next(match_files_ctx *c) sem_error(specline, lit("(next :env) takes no additional arguments"), nao); } else { cons_bind (new_bindings, success, - match_files(mf_data(*c, env(), num(1)))); + match_files(mf_file_data(*c, lit("env"), env(), num(1)))); if (success) return cons(new_bindings, @@ -3689,6 +3689,7 @@ static void open_data_source(match_files_ctx *c) } c->files = cons(name, cdr(c->files)); /* Get rid of cons and nothrow */ + c->curfile = source_spec; if ((c->data = complex_snarf(fp, name)) != nil) c->data_lineno = num(1); -- cgit v1.2.3