From 6ddb4b8f329b14e6133f29573cfeb88d1ee30846 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Sat, 22 Oct 2011 16:18:11 -0400 Subject: * filter.c (get_filter_trie): Function renamed to get_filter. A filter is not necessarily a trie. (string_filter, compound_filter): New functions. (get_filter): Recognize a compound filters and return a function which implements it. * filter.h (get_filter_trie): Declaration renamed. * match.c (format_field, v_bind, v_output): Follow get_filter_trie rename. Error message text updated. * txr.1: Describe compound filters. --- match.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'match.c') diff --git a/match.c b/match.c index ec153f82..9c8def60 100644 --- a/match.c +++ b/match.c @@ -1002,10 +1002,10 @@ static val format_field(val string_or_list, val modifier, val filter) val filter_sym = getplist(plist, filter_k); if (filter_sym) { - filter = get_filter_trie(filter_sym); + filter = get_filter(filter_sym); if (!filter) { - uw_throwf(query_error_s, lit("format_field: filter ~s not known"), + uw_throwf(query_error_s, lit("format_field: ~s specifies unknown filter"), filter_sym, nao); } } @@ -2144,10 +2144,10 @@ static val v_bind(match_files_ctx c, match_files_ctx *cout) val filter_sym = getplist(keywords, filter_k); if (filter_sym) { - val filter = get_filter_trie(filter_sym); + val filter = get_filter(filter_sym); if (!filter) { - uw_throwf(query_error_s, lit("bind: filter ~s not known"), + uw_throwf(query_error_s, lit("bind: ~s specifies unknown filter"), filter_sym, nao); } @@ -2239,10 +2239,10 @@ static val v_output(match_files_ctx c, match_files_ctx *cout) val filter_sym = cdr(assoc(alist, filter_k)); if (filter_sym) { - filter = get_filter_trie(filter_sym); + filter = get_filter(filter_sym); if (!filter) - sem_error(spec_linenum, lit("unknown filter ~s"), filter_sym, nao); + sem_error(spec_linenum, lit("~s specifies unknown filter"), filter_sym, nao); } } -- cgit v1.2.3