Non-broken way to achieve intent of previous commit.

* eval.c (subst_vars): Do not evaluate modifiers
as an argument list locally. Pass form-evaluating
function to format_field.

* match.c (format_field): Modified to accept new argument,
a one-argument function for reducing a form to a value.
Error checking for invalid modifiers made stricter.
(subst_vars): Do not evaluate modifiers as an argument
list. Pass form-evaluating function to format_field.

* match.h (format_field): Declaration updated.

1 files changed, 4 insertions, 2 deletions

diff --git a/eval.c b/eval.c
index 70711b45..11998a81 100644
--- a/eval.c
+++ b/eval.c
@@ -744,7 +744,7 @@ static val subst_vars(val forms, val env)
       if (sym == var_s) {
         val sym = second(form);
         val pat = third(form);
-        val modifiers = eval_args(fourth(form), env, form);
+        val modifiers = fourth(form);
         val pair = lookup_var(env, sym);
 
         if (pair) {
@@ -756,7 +756,9 @@ static val subst_vars(val forms, val env)
           if (pat)
             forms = cons(str, cons(pat, rest(forms)));
           else if (modifiers)
-            forms = cons(format_field(str, modifiers, nil), rest(forms));
+            forms = cons(format_field(str, modifiers, nil, 
+                                      curry_123_1(func_n3(eval), env, form)),
+                         rest(forms));
           else
             forms = cons(str, rest(forms));
           continue;