summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2012-02-16 17:24:19 -0800
committerKaz Kylheku <kaz@kylheku.com>2012-02-16 17:24:19 -0800
commitdcd14af875e74e92379031076d48c526b57a06bf (patch)
treed3a18d837b98e5912b7e8913ecb242b4b8a6fbfd
parentd7ba2b97d8c03bf47c25978d96fa055e7d11ba5a (diff)
downloadtxr-dcd14af875e74e92379031076d48c526b57a06bf.tar.gz
txr-dcd14af875e74e92379031076d48c526b57a06bf.tar.bz2
txr-dcd14af875e74e92379031076d48c526b57a06bf.zip
* match.c (match_funcall): Function renamed to match_filter.
* match.h (match_funcall): Declaration updated. * filter.c (get_filter): Updated.
-rw-r--r--ChangeLog8
-rw-r--r--filter.c2
-rw-r--r--match.c2
-rw-r--r--match.h2
4 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 76bd5ef1..ee49c755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2012-02-16 Kaz Kylheku <kaz@kylheku.com>
+ * 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 <kaz@kylheku.com>
+
* eval.c (op_catch): Treat the nil exception object as an empty
list, and not the atom nil.
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);