Bugfix: expand macros in collect, coll, gather.

In the argument lists of @(collect)/@(repeat), @(coll)/@(rep)
and @(gather), Lisp expressions can appear as arguments
to keywords or for supplying default values for variables.
These are not being macro-expanded.

* match.c (match_expand_vars): New static function.
(match_expand_keyword_args): New function.

* match.h (match_expand_keyword_args): Declared.

* parser.y (gather_clause, collect_clause, elem): Use new
function in match.c to expand the argument lists.

1 files changed, 52 insertions, 0 deletions

diff --git a/match.c b/match.c
index dd376ef2..01b1fe9f 100644
--- a/match.c
+++ b/match.c
@@ -2860,6 +2860,58 @@ static val v_gather(match_files_ctx *c)
   return next_spec_k;
 }
 
+
+static val match_expand_vars(val vars)
+{
+  list_collect_decl (out, ptail);
+
+  for (; vars; vars = cdr(vars)) {
+    val var = car(vars);
+    if (consp(var)) {
+      val sym = car(var);
+      val dfl = cadr(var);
+      val dfl_ex = expand(dfl, nil);
+
+      ptail = list_collect(ptail, if3(dfl == dfl_ex,
+                                      var, list(sym, dfl_ex, nao)));
+    } else {
+      ptail = list_collect(ptail, var);
+    }
+  }
+
+  return out;
+}
+
+val match_expand_keyword_args(val args)
+{
+  list_collect_decl (out, ptail);
+
+  if (opt_compat && opt_compat <= 165)
+    return args;
+
+  while (consp(args)) {
+    val sym = car(args);
+    if (sym == maxgap_k || sym == mingap_k || sym == gap_k || sym == times_k ||
+        sym == mintimes_k || sym == maxtimes_k || sym == lines_k ||
+        sym == counter_k || sym == vars_k)
+    {
+      val d = cdr(args);
+      val form = car(d);
+      val form_ex = if3(sym == vars_k,
+                        match_expand_vars(form),
+                        expand(form, nil));
+      ptail = list_collect(ptail, sym);
+      ptail = list_collect(ptail, form_ex);
+      args = cdr(d);
+    } else {
+      ptail = list_collect(ptail, sym);
+      args = cdr(args);
+    }
+  }
+
+  return out;
+}
+
 static val v_collect(match_files_ctx *c)
 {
   spec_bind (specline, first_spec, c->spec);