From 34bcabf5bca8326d9262fd32e9992cb63555486f Mon Sep 17 00:00:00 2001 From: Yuichi Nishiwaki Date: Mon, 3 Mar 2014 22:19:27 +0900 Subject: [PATCH] s/pic_trampoline/pic_apply_trampoline/g --- include/picrin.h | 2 +- src/cont.c | 4 ++-- src/proc.c | 2 +- src/vm.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/picrin.h b/include/picrin.h index 26291e2f..fa73d7dd 100644 --- a/include/picrin.h +++ b/include/picrin.h @@ -180,7 +180,7 @@ pic_value pic_load(pic_state *, const char *); pic_value pic_apply(pic_state *, struct pic_proc *, pic_value); pic_value pic_apply_argv(pic_state *, struct pic_proc *, size_t, ...); -pic_value pic_trampoline(pic_state *, struct pic_proc *, pic_value); +pic_value pic_apply_trampoline(pic_state *, struct pic_proc *, pic_value); struct pic_proc *pic_compile(pic_state *, pic_value); pic_value pic_macroexpand(pic_state *, pic_value); diff --git a/src/cont.c b/src/cont.c index 30b8f860..88bf3a7b 100644 --- a/src/cont.c +++ b/src/cont.c @@ -257,7 +257,7 @@ pic_callcc_trampoline(pic_state *pic, struct pic_proc *proc) pic_proc_cv_init(pic, c, 1); pic_proc_cv_set(pic, c, 0, pic_obj_value(cont)); - return pic_trampoline(pic, proc, pic_list1(pic, pic_obj_value(c))); + return pic_apply_trampoline(pic, proc, pic_list1(pic, pic_obj_value(c))); } } @@ -328,7 +328,7 @@ pic_cont_call_with_values(pic_state *pic) argc = pic_receive(pic, 256, args); - return pic_trampoline(pic, consumer, pic_list_by_array(pic, argc, args)); + return pic_apply_trampoline(pic, consumer, pic_list_by_array(pic, argc, args)); } void diff --git a/src/proc.c b/src/proc.c index 8d9be2ed..fafa25b6 100644 --- a/src/proc.c +++ b/src/proc.c @@ -132,7 +132,7 @@ pic_proc_apply(pic_state *pic) arg_list = pic_cons(pic, args[argc], arg_list); } - return pic_trampoline(pic, proc, arg_list); + return pic_apply_trampoline(pic, proc, arg_list); } static pic_value diff --git a/src/vm.c b/src/vm.c index 6b88dc73..31025f7d 100644 --- a/src/vm.c +++ b/src/vm.c @@ -855,7 +855,7 @@ static struct pic_code trampoline_iseq[] = { }; pic_value -pic_trampoline(pic_state *pic, struct pic_proc *proc, pic_value args) +pic_apply_trampoline(pic_state *pic, struct pic_proc *proc, pic_value args) { pic_value v, call_list, *fp = pic->ci->fp; pic_callinfo *ci;