From cd68cb82560345ca6c97c5780837c2873c819fa6 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 14 Apr 2020 06:57:00 -0700 Subject: txr-parse: release deferred warnings. * parser.c (txr_parse): The function must ensure that deferred warnings are released, if it is not wrapped in a larger translation unit. If *load-recursive* is false, we release the warnings after the parser. --- parser.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/parser.c b/parser.c index bbc1a427..ad892e91 100644 --- a/parser.c +++ b/parser.c @@ -798,6 +798,9 @@ val txr_parse(val source_in, val error_stream, val saved_dyn = dyn_env; val parser_obj = ensure_parser(input_stream, name); parser_t *pi = parser_get_impl(self, parser_obj); + val loading = cdr(lookup_var(dyn_env, load_recursive_s)); + + uw_simple_catch_begin; dyn_env = make_env(nil, nil, dyn_env); error_stream = default_null_arg(error_stream); @@ -806,8 +809,14 @@ val txr_parse(val source_in, val error_stream, parse_once(self, input_stream, name); - dyn_env = saved_dyn; - gc_state(gc); + uw_unwind { + dyn_env = saved_dyn; + gc_state(gc); + if (!loading) + uw_release_deferred_warnings(); + } + + uw_catch_end; if (pi->errors || pi->syntax_tree == nao) { if (missingp(error_return_val)) -- cgit v1.2.3