From 6dc9186c6afc5f8e7f4b3dee3d6cffa144555fdd Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Wed, 18 Apr 2018 06:59:52 -0700 Subject: apply: remove remaining apply_intrinsic uses. * eval.c (apply_intrinsic): Function removed. (to_apf): Use applyv instead of apply_intrinsic. * eval.h (apply_intrinsic): Declaration removed. * vm.c (vm_gapply): Use applyv instead of apply_intrinsic. --- eval.c | 7 +------ eval.h | 1 - vm.c | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/eval.c b/eval.c index 1ff89af2..610c9b40 100644 --- a/eval.c +++ b/eval.c @@ -1137,11 +1137,6 @@ static val apply_intrinsic_frob_args(val args) } } -val apply_intrinsic(val fun, val args) -{ - return apply(fun, apply_intrinsic_frob_args(z(args))); -} - val applyv(val fun, struct args *args) { args_normalize_least(args, 1); @@ -5853,7 +5848,7 @@ val retf(val ret) static val do_apf(val fun, struct args *args) { - return apply_intrinsic(fun, args_get_list(args)); + return applyv(fun, args); } static val apf(val fun) diff --git a/eval.h b/eval.h index 4122d174..6a69714d 100644 --- a/eval.h +++ b/eval.h @@ -66,7 +66,6 @@ void reg_fun(val sym, val fun); void reg_mac(val sym, val fun); val set_get_symacro(val sym, val form); val apply(val fun, val arglist); -val apply_intrinsic(val fun, val args); val applyv(val fun, struct args *args); val eval_progn(val forms, val env, val ctx_form); val eval(val form, val env, val ctx_form); diff --git a/vm.c b/vm.c index c0370343..f2dc3bd7 100644 --- a/vm.c +++ b/vm.c @@ -539,7 +539,7 @@ static void vm_gapply(struct vm *vm, vm_word_t insn) } } - result = apply_intrinsic(deref(vm_ftab(vm, fun)), args_get_list(args)); + result = applyv(deref(vm_ftab(vm, fun)), args); vm_set(vm->dspl, dest, result); } -- cgit v1.2.3