diff --git a/include/picrin/cont.h b/include/picrin/cont.h index 25f12f46..6bb18623 100644 --- a/include/picrin/cont.h +++ b/include/picrin/cont.h @@ -53,7 +53,7 @@ struct pic_cont { pic_value pic_callcc(pic_state *, struct pic_proc *); pic_value pic_values(pic_state *, size_t, ...); -pic_value pic_values_from_array(pic_state *, size_t, pic_value *); +pic_value pic_values_by_array(pic_state *, size_t, pic_value *); #if defined(__cplusplus) } diff --git a/include/picrin/pair.h b/include/picrin/pair.h index 5c23630c..74399277 100644 --- a/include/picrin/pair.h +++ b/include/picrin/pair.h @@ -15,7 +15,7 @@ pic_value pic_cdr(pic_state *, pic_value); bool pic_list_p(pic_state *, pic_value); pic_value pic_list(pic_state *, size_t, ...); -pic_value pic_list_from_array(pic_state *, size_t, pic_value *); +pic_value pic_list_by_array(pic_state *, size_t, pic_value *); pic_value pic_make_list(pic_state *, int, pic_value); #define PIC_FOR_EACH_HELPER(var, tmp, list) \ diff --git a/src/cont.c b/src/cont.c index db8bc3e7..ae6b3c36 100644 --- a/src/cont.c +++ b/src/cont.c @@ -197,7 +197,7 @@ pic_values(pic_state *pic, size_t c, ...) } pic_value -pic_values_from_array(pic_state *pic, size_t argc, pic_value *argv) +pic_values_by_array(pic_state *pic, size_t argc, pic_value *argv) { size_t i; pic_value head = pic_none_value(); diff --git a/src/error.c b/src/error.c index 1f0061c5..51b0bb0e 100644 --- a/src/error.c +++ b/src/error.c @@ -132,7 +132,7 @@ pic_error_error(pic_state *pic) e = (struct pic_error *)pic_obj_alloc(pic, sizeof(struct pic_error), PIC_TT_ERROR); e->type = PIC_ERROR_OTHER; e->msg = pic_strdup(pic, str); - e->irrs = pic_list_from_array(pic, argc, argv); + e->irrs = pic_list_by_array(pic, argc, argv); pic_raise(pic, pic_obj_value(e)); } diff --git a/src/pair.c b/src/pair.c index 480c070f..ffea835e 100644 --- a/src/pair.c +++ b/src/pair.c @@ -80,7 +80,7 @@ pic_list(pic_state *pic, size_t c, ...) } pic_value -pic_list_from_array(pic_state *pic, size_t c, pic_value *vs) +pic_list_by_array(pic_state *pic, size_t c, pic_value *vs) { pic_value v; size_t i; @@ -397,7 +397,7 @@ pic_pair_list(pic_state *pic) pic_get_args(pic, "*", &argc, &argv); - return pic_list_from_array(pic, argc, argv); + return pic_list_by_array(pic, argc, argv); } static pic_value diff --git a/src/proc.c b/src/proc.c index fa2cabbb..161eab1e 100644 --- a/src/proc.c +++ b/src/proc.c @@ -95,7 +95,7 @@ pic_proc_apply(pic_state *pic) pic_error(pic, "apply: wrong number of arguments"); } - return pic_apply(pic, proc, pic_list_from_array(pic, argc, args)); + return pic_apply(pic, proc, pic_list_by_array(pic, argc, args)); } static pic_value