Bugfix: @(require ...) not expanding forms.

* eval.c (expand_forms): Static function becomes external.
(expand_form): Remove case which handles do_s.

* eval.h (expand_forms): Declared.

* parser.y (elem): Expand both do_s and require_s forms by
using expand_forms.

1 files changed, 5 insertions, 2 deletions

diff --git a/parser.y b/parser.y
index 37fe0814..a29c7f00 100644
--- a/parser.y
+++ b/parser.y
@@ -341,8 +341,11 @@ texts : text %prec LOW          { $$ = rlcp(cons($1, nil), $1); }
 elem : texts                    { $$ = rlcp(cons(text_s, $1), $1);
                                   $$ = rlcp(optimize_text($$), $$); }
      | var                      { $$ = rl($1, num(lineno)); }
-     | list                     { if (first($1) == do_s)
-                                    $$ = expand($1);
+     | list                     { val sym = first($1);
+                                  if (sym == do_s || sym == require_s)
+                                    $$ = rlcp(cons(sym,
+                                                   expand_forms(rest($1))),
+                                              $1);
                                   else
                                     $$ = $1; }
      | COLL exprs_opt ')' elems END     { $$ = list(coll_s, $4, nil, $2, nao);