summaryrefslogtreecommitdiffstats
path: root/regex.c
diff options
context:
space:
mode:
authorKaz Kyheku <kaz@kylheku.com>2020-03-17 22:45:05 -0700
committerKaz Kylheku <kaz@kylheku.com>2020-03-17 22:45:05 -0700
commitfa14bd3eccbd211c16dc7ecc06d3132f9f9539a2 (patch)
treeca9a7cba8edd6385f96b1ed6bb158912ce090b5e /regex.c
parentff36d718a997d24db9ac0e49042a99d5f5fad7a2 (diff)
downloadtxr-fa14bd3eccbd211c16dc7ecc06d3132f9f9539a2.tar.gz
txr-fa14bd3eccbd211c16dc7ecc06d3132f9f9539a2.tar.bz2
txr-fa14bd3eccbd211c16dc7ecc06d3132f9f9539a2.zip
internals: rename misnamed curry_* functions.
The various curry_xx_yy functions perform partial application, not currying. The curry prefix is being renamed to pa (partially apply). * lib.c (remq_lazy, remql_lazy, remqual_lazy, tree_Find): Updated. (do_curry_12_1, do_curry_12_1_v, do_curry_12_2, do_curry_123_1, do_curry_123_23, do_curry_123_2, do_curry_123_3, do_curry_1234_1, do_curry_1234_34): Renamed to do_pa_12_1, do_pa_12_1_v, do_pa_12_2, do_pa_123_1, do_pa_123_23, do_pa_123_2, do_pa_123_3, do_pa_1234_1, do_pa_1234_34. (curry_12_1, curry_12_1_v, curry_12_2, curry_123_1, curry_123_23, curry_123_2, curry_123_3, curry_1234_1, curry_1234_34): Renamed to pa_12_1, pa_12_1_v, pa_12_2, pa_123_1, pa_123_23, pa_123_2, pa_123_3, pa_1234_1, pa_1234_34. (transposev, do_juxt): Updated. * lib.h: Declarations renamed. * eval.c (subst_vars, qquote_init, expand_catch, weavev): Updated. * filter.c (get_filter, build_filter_from_list, filter_string_tree, filter_init): Updated. * match.c (tx_subst_vars, do_txeval, v_freeform, v_bind, v_throw, v_deffilter, v_assert, h_assert): Updated. * parser.y (gather_clause): Updated. * regex.c (regex_range_full_fun, regex_range_left_fun, regex_range_right_fun, regex_range_search_fun): Updated. * stream.c (open_files, open_files_star): Updated. * txr.c (txr_main): Updated. * unwind.c (me_defex): Updated.
Diffstat (limited to 'regex.c')
-rw-r--r--regex.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/regex.c b/regex.c
index beb61387..a4dc69eb 100644
--- a/regex.c
+++ b/regex.c
@@ -3092,26 +3092,26 @@ val regex_range_all(val regex, val arg1, val arg2, val arg3)
val regex_range_full_fun(val regex, val pos)
{
- return curry_123_3(func_n3(regex_range_full),
- regex, default_arg(pos, zero));
+ return pa_123_3(func_n3(regex_range_full),
+ regex, default_arg(pos, zero));
}
val regex_range_left_fun(val regex, val pos)
{
- return curry_123_3(func_n3(regex_range_left),
- regex, default_arg(pos, zero));
+ return pa_123_3(func_n3(regex_range_left),
+ regex, default_arg(pos, zero));
}
val regex_range_right_fun(val regex, val end)
{
if (null_or_missing_p(end))
- return curry_123_2(func_n3(regex_range_right), regex, end);
- return curry_123_3(func_n3(regex_range_left), regex, end);
+ return pa_123_2(func_n3(regex_range_right), regex, end);
+ return pa_123_3(func_n3(regex_range_left), regex, end);
}
val regex_range_search_fun(val regex, val start, val from_end)
{
- return curry_1234_1(func_n4(range_regex), regex, start, from_end);
+ return pa_1234_1(func_n4(range_regex), regex, start, from_end);
}
static val scan_until_common(val self, val regex, val stream_in,