From dcd14af875e74e92379031076d48c526b57a06bf Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Thu, 16 Feb 2012 17:24:19 -0800 Subject: * match.c (match_funcall): Function renamed to match_filter. * match.h (match_funcall): Declaration updated. * filter.c (get_filter): Updated. --- ChangeLog | 8 ++++++++ filter.c | 2 +- match.c | 2 +- match.h | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76bd5ef1..ee49c755 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-02-16 Kaz Kylheku + + * match.c (match_funcall): Function renamed to match_filter. + + * match.h (match_funcall): Declaration updated. + + * filter.c (get_filter): Updated. + 2012-02-16 Kaz Kylheku * eval.c (op_catch): Treat the nil exception object as an empty diff --git a/filter.c b/filter.c index 29378f48..a3b2cb65 100644 --- a/filter.c +++ b/filter.c @@ -141,7 +141,7 @@ val get_filter(val spec) { if (consp(spec)) { if (car(spec) == fun_k) { - return curry_123_2(func_n3(match_funcall), second(spec), rest(rest(spec))); + return curry_123_2(func_n3(match_filter), second(spec), rest(rest(spec))); } else { val filter_list = mapcar(func_n1(get_filter), spec); diff --git a/match.c b/match.c index 93b55dbf..21e3d51a 100644 --- a/match.c +++ b/match.c @@ -3506,7 +3506,7 @@ repeat_spec_same_data: debug_leave; } -val match_funcall(val name, val arg, val other_args) +val match_filter(val name, val arg, val other_args) { cons_bind (in_spec, in_bindings, uw_get_match_context()); spec_bind (specline, first_spec, in_spec); diff --git a/match.h b/match.h index f0398ebe..bb9a174d 100644 --- a/match.h +++ b/match.h @@ -26,6 +26,6 @@ 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 eval_fun); -val match_funcall(val name, val arg, val other_args); +val match_filter(val name, val arg, val other_args); int extract(val spec, val filenames, val bindings); void match_init(void); -- cgit v1.2.3