From 41c1ca013d6bc3ba2d6634703be8c5fb7cae9f9d Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Thu, 10 Dec 2020 12:23:42 -0800 Subject: txr, eval: eliminate some func_n1 calls. * match.c (do_output_line, do_repeat, v_deffiler): Replace func_n1(cdr) and func_n1(rest) with cdr_f. * eval.c (eval_init): Replace func_n1(car) and func_n1(cdr) with car_f and cdr_f. Should have been done in 2011 when this was done for the registrations of car and cdr. --- eval.c | 4 ++-- match.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eval.c b/eval.c index e5f08407..aaf34aaf 100644 --- a/eval.c +++ b/eval.c @@ -6509,8 +6509,8 @@ void eval_init(void) reg_fun(rplacd_s, func_n2(rplacd)); reg_fun(intern(lit("rplaca"), system_package), func_n2(sys_rplaca)); reg_fun(intern(lit("rplacd"), system_package), func_n2(sys_rplacd)); - reg_fun(intern(lit("first"), user_package), func_n1(car)); - reg_fun(rest_s, func_n1(cdr)); + reg_fun(intern(lit("first"), user_package), car_f); + reg_fun(rest_s, cdr_f); reg_fun(intern(lit("sub-list"), user_package), func_n3o(sub_list, 1)); reg_fun(intern(lit("replace-list"), user_package), func_n4o(replace_list, 2)); reg_fun(append_s, func_n0v(appendv)); diff --git a/match.c b/match.c index 1d7bc986..606c6d0c 100644 --- a/match.c +++ b/match.c @@ -1974,7 +1974,7 @@ static void do_output_line(val bindings, val specline, val filter, val out) val bind_cp = extract_bindings(bindings, elem, vars, occur_vars); val max_depth = reduce_left(func_n2(max2), bind_cp, zero, - chain(func_n1(cdr), + chain(cdr_f, func_n1(robust_length), nao)); @@ -2110,7 +2110,7 @@ static void do_repeat(val bindings, val repeat_syntax, val filter, val out) val bind_cp = extract_bindings(bindings, repeat_syntax, vars, occur_vars); val max_depth = reduce_left(func_n2(max2), bind_cp, zero, - chain(func_n1(cdr), + chain(cdr_f, func_n1(robust_length), nao)); @@ -4100,7 +4100,7 @@ static val v_deffilter(match_files_ctx *c) if (!all_satisfy(table_evaled, andf(func_n1(listp), chain(func_n1(length_list), pa_12_1(func_n2(ge), two), nao), - chain(func_n1(rest), + chain(cdr_f, pa_123_1(func_n3(all_satisfy), func_n1(stringp), nil), -- cgit v1.2.3