From 57f7ed87b589c471009726089a574890bb018571 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Sat, 7 Apr 2018 20:14:56 -0700 Subject: case macros: reduce consing. * eval.c (compares_with_eq): New static function. (me_case): Instead of check_fun, call compares_with_eq directly. For the case when we map over check fun, allocate the function just once, outside the loop. --- eval.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index d4973217..072e38b6 100644 --- a/eval.c +++ b/eval.c @@ -3798,6 +3798,11 @@ static val me_flet_labels(val form, val menv) cons(lambdas, body)); } +static val compares_with_eq(val obj) +{ + return tnil(fixnump(obj) || chrp(obj) || symbolp(obj)); +} + static val me_case(val form, val menv) { val form_orig = form; @@ -3809,10 +3814,7 @@ static val me_case(val form, val menv) val star = tnil(casesym == caseq_star_s || casesym == caseql_star_s || casesym == casequal_star_s); int compat = (opt_compat && opt_compat <= 156 && !star); - val check_fun = orf(func_n1(fixnump), - func_n1(chrp), - func_n1(symbolp), nao); - + val comp_eq_f = func_n1(compares_with_eq); val all_keys_eq = t; val hash_fallback_clause = nil; val hash = nil; @@ -3861,13 +3863,13 @@ static val me_case(val form, val menv) if (atom(keys)) { sethash(hash, keys, index); - if (!funcall1(check_fun, keys)) + if (!compares_with_eq(keys)) all_keys_eq = nil; } else { val iter; for (iter = hash_keys; iter; iter = cdr(iter)) sethash(hash, car(iter), index); - if (!all_satisfy(keys, check_fun, nil)) + if (!all_satisfy(keys, comp_eq_f, nil)) all_keys_eq = nil; } -- cgit v1.2.3