bugfix: expand macros in a number of directives.

This is the last round of changes on this topic, bringing
proper macro expansion to the arguments to @(skip),
@(fuzz), @(next), @(call), @(cat), @(load) and @(close).

* match.c (match_expand_keyword_args): Only process the
keyword arguments if they are followed by an argument.
Process @(next) arguments here too: :list and :string
take a Lisp expression, but :tlist and :var take an
argument which is not a Lisp expression and must be
handled properly. Also, expand any non-keyword expression.
This handles the <source> argument of @(next).
(match_expand_elem): New function.

* match.h (match_expand_elem): Declared.

* parser.h (expand_meta): Declared.

* parser.y (expand_meta): Static function becomes external.
(elem): Expand elem other than require or do using
match_expand_elem. We don't fold require and do into this
because match_expand_elem has a backward compat switch
in it that doesn't apply to these.

1 files changed, 1 insertions, 0 deletions

diff --git a/parser.h b/parser.h
index 658178c7..7e1396af 100644
--- a/parser.h
+++ b/parser.h
@@ -102,6 +102,7 @@ int parse_once(val stream, val name, parser_t *parser);
 int parse(parser_t *parser, val name, enum prime_parser);
 val source_loc(val form);
 val source_loc_str(val form, val alt);
+val expand_meta(val form, val menv);
 val rlset(val form, val info);
 void parser_reset(parser_t *);
 INLINE val rlcp(val to, val from)