diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2020-12-10 12:23:42 -0800 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2020-12-10 12:23:42 -0800 |
| commit | b16e0a6ba541332bf0f6849ba4af28b4e233fe46 (patch) | |
| tree | 3ddd6aa421daeea71866276586d9ff40ac8cf75f | |
| parent | 03f971327bb178059b66a2930a1bd346354feae8 (diff) | |
| download | txr-b16e0a6ba541332bf0f6849ba4af28b4e233fe46.tar.gz txr-b16e0a6ba541332bf0f6849ba4af28b4e233fe46.tar.bz2 txr-b16e0a6ba541332bf0f6849ba4af28b4e233fe46.zip | |
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.
| -rw-r--r-- | eval.c | 4 | ||||
| -rw-r--r-- | match.c | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -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)); @@ -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), |