summaryrefslogtreecommitdiffstats
path: root/eval.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 /eval.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 'eval.c')
-rw-r--r--eval.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/eval.c b/eval.c
index 61d1feb4..a5be0c79 100644
--- a/eval.c
+++ b/eval.c
@@ -2889,7 +2889,7 @@ val subst_vars(val forms, val env, val filter)
if (modifiers) {
forms = cons(format_field(str, modifiers, filter,
- curry_123_1(func_n3(eval), env, form)),
+ pa_123_1(func_n3(eval), env, form)),
rest(forms));
} else {
str = fmt_cat(str, lit(" "));
@@ -3395,14 +3395,14 @@ static val xform_listed_quote_f;
static void qquote_init(void)
{
- val eq_to_list_f = curry_12_1(eq_f, list_s);
- val eq_to_quote_f = curry_12_1(eq_f, quote_s);
+ val eq_to_list_f = pa_12_1(eq_f, list_s);
+ val eq_to_quote_f = pa_12_1(eq_f, quote_s);
val cons_f = func_n2(cons);
protect(&consp_f, &second_f, &list_form_p_f,
&quote_form_p_f, &xform_listed_quote_f, convert(val *, 0));
- eq_to_list_f = curry_12_1(eq_f, list_s);
+ eq_to_list_f = pa_12_1(eq_f, list_s);
consp_f = func_n1(consp);
second_f = func_n1(second);
list_form_p_f = andf(consp_f,
@@ -3421,8 +3421,8 @@ static void qquote_init(void)
chain(cdr_f, car_f, car_f, eq_to_quote_f, nao),
nao),
chain(cdr_f, car_f, cdr_f,
- curry_12_1(cons_f, nil),
- curry_12_2(cons_f, quote_s),
+ pa_12_1(cons_f, nil),
+ pa_12_2(cons_f, quote_s),
nao),
nil);
}
@@ -4511,8 +4511,8 @@ static val expand_catch(val form, val menv)
val catch_clauses = args;
val try_form_ex = expand(try_form, menv);
val desc_ex = expand(desc, menv);
- val catch_clauses_ex = rlcp(mapcar(curry_12_1(func_n2(expand_catch_clause),
- menv),
+ val catch_clauses_ex = rlcp(mapcar(pa_12_1(func_n2(expand_catch_clause),
+ menv),
catch_clauses),
catch_clauses);
@@ -5890,7 +5890,7 @@ static val weavev(struct args *args)
{
val lists = args_get_list(args);
val uniq = cons(nil, nil);
- val padded_lists = mapcar(curry_123_1(func_n3(pad), uniq, colon_k), lists);
+ val padded_lists = mapcar(pa_123_1(func_n3(pad), uniq, colon_k), lists);
val tuples = lazy_mapcarl(list_f, padded_lists);
val env = cons(uniq, tuples);
val whil = func_f0(env, weave_while);