diff --git a/extlib/benz/include/picrin.h b/extlib/benz/include/picrin.h index 817fc03d..62fa27bd 100644 --- a/extlib/benz/include/picrin.h +++ b/extlib/benz/include/picrin.h @@ -192,7 +192,7 @@ void pic_defvar_(pic_state *, const char *, pic_value, struct pic_proc *); pic_value pic_ref(pic_state *, struct pic_lib *, const char *); void pic_set(pic_state *, struct pic_lib *, const char *, pic_value); -pic_value pic_funcall(pic_state *pic, struct pic_lib *, const char *, pic_list); +pic_value pic_funcall(pic_state *pic, struct pic_lib *, const char *, pic_value); pic_value pic_funcall0(pic_state *pic, struct pic_lib *, const char *); pic_value pic_funcall1(pic_state *pic, struct pic_lib *, const char *, pic_value); pic_value pic_funcall2(pic_state *pic, struct pic_lib *, const char *, pic_value, pic_value); diff --git a/extlib/benz/include/picrin/error.h b/extlib/benz/include/picrin/error.h index 2afd0f3a..ecf59dda 100644 --- a/extlib/benz/include/picrin/error.h +++ b/extlib/benz/include/picrin/error.h @@ -20,7 +20,7 @@ struct pic_error { #define pic_error_p(v) (pic_type(v) == PIC_TT_ERROR) #define pic_error_ptr(v) ((struct pic_error *)pic_ptr(v)) -struct pic_error *pic_make_error(pic_state *, pic_sym *, const char *, pic_list); +struct pic_error *pic_make_error(pic_state *, pic_sym *, const char *, pic_value); /* do not return from try block! */ @@ -55,7 +55,7 @@ struct pic_proc *pic_pop_handler(pic_state *); pic_value pic_raise_continuable(pic_state *, pic_value); PIC_NORETURN void pic_raise(pic_state *, pic_value); -PIC_NORETURN void pic_error(pic_state *, const char *, pic_list); +PIC_NORETURN void pic_error(pic_state *, const char *, pic_value); #if defined(__cplusplus) } diff --git a/extlib/benz/include/picrin/type.h b/extlib/benz/include/picrin/type.h index 4de8d279..7865ffa5 100644 --- a/extlib/benz/include/picrin/type.h +++ b/extlib/benz/include/picrin/type.h @@ -182,7 +182,6 @@ struct pic_error; struct pic_env; /* set aliases to basic types */ -typedef pic_value pic_list; typedef struct pic_symbol pic_sym; typedef struct pic_pair pic_pair; typedef struct pic_string pic_str; diff --git a/extlib/benz/vm.c b/extlib/benz/vm.c index dda6de12..50023062 100644 --- a/extlib/benz/vm.c +++ b/extlib/benz/vm.c @@ -1182,7 +1182,7 @@ pic_set(pic_state *pic, struct pic_lib *lib, const char *name, pic_value val) } pic_value -pic_funcall(pic_state *pic, struct pic_lib *lib, const char *name, pic_list args) +pic_funcall(pic_state *pic, struct pic_lib *lib, const char *name, pic_value args) { pic_value proc;