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, 1 insertions, 1 deletions

diff --git a/match.h b/match.h
index bb69a030..f0398ebe 100644
--- a/match.h
+++ b/match.h
@@ -25,7 +25,7 @@
  */
 
 extern val text_s, choose_s, gather_s, do_s, mod_s, modlast_s, counter_k;
-val format_field(val string_or_list, val modifier, val filter);
+val format_field(val string_or_list, val modifier, val filter, val eval_fun);
 val match_funcall(val name, val arg, val other_args);
 int extract(val spec, val filenames, val bindings);
 void match_init(void);