conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more fixes

This commit is contained in:
Yuichi Nishiwaki 2014-09-27 20:21:54 +09:00
parent 186c468c16
commit 0403ca5570
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cont.c
View File

@ -184,14 +184,14 @@ pic_values5(pic_state *pic, pic_value arg1, pic_value arg2, pic_value arg3, pic_
} }
pic_value pic_value
pic_values_by_array(pic_state *pic, int argc, pic_value *argv) pic_values_by_array(pic_state *pic, size_t argc, pic_value *argv)
{ {
int i; size_t i;
for (i = 0; i < argc; ++i) { for (i = 0; i < argc; ++i) {
pic->sp[i] = argv[i]; pic->sp[i] = argv[i];
} }
pic->ci->retc = argc; pic->ci->retc = (int)argc;
return argc == 0 ? pic_none_value() : pic->sp[0]; return argc == 0 ? pic_none_value() : pic->sp[0];
} }
@ -211,15 +211,15 @@ pic_values_by_list(pic_state *pic, pic_value list)
return pic_nil_p(list) ? pic_none_value() : pic->sp[0]; return pic_nil_p(list) ? pic_none_value() : pic->sp[0];
} }
int size_t
pic_receive(pic_state *pic, int n, pic_value *argv) pic_receive(pic_state *pic, size_t n, pic_value *argv)
{ {
pic_callinfo *ci; pic_callinfo *ci;
int i, retc; size_t i, retc;
/* take info from discarded frame */ /* take info from discarded frame */
ci = pic->ci + 1; ci = pic->ci + 1;
retc = ci->retc; retc = (size_t)ci->retc;
for (i = 0; i < retc && i < n; ++i) { for (i = 0; i < retc && i < n; ++i) {
argv[i] = ci->fp[i]; argv[i] = ci->fp[i];
@ -263,7 +263,7 @@ static pic_value
pic_cont_call_with_values(pic_state *pic) pic_cont_call_with_values(pic_state *pic)
{ {
struct pic_proc *producer, *consumer; struct pic_proc *producer, *consumer;
int argc; size_t argc;
pic_value args[256]; pic_value args[256];
pic_get_args(pic, "ll", &producer, &consumer); pic_get_args(pic, "ll", &producer, &consumer);

4
include/picrin/cont.h
View File

@ -40,9 +40,9 @@ pic_value pic_values2(pic_state *, pic_value, pic_value);
pic_value pic_values3(pic_state *, pic_value, pic_value, pic_value); pic_value pic_values3(pic_state *, pic_value, pic_value, pic_value);
pic_value pic_values4(pic_state *, pic_value, pic_value, pic_value, pic_value); pic_value pic_values4(pic_state *, pic_value, pic_value, pic_value, pic_value);
pic_value pic_values5(pic_state *, pic_value, pic_value, pic_value, pic_value, pic_value); pic_value pic_values5(pic_state *, pic_value, pic_value, pic_value, pic_value, pic_value);
pic_value pic_values_by_array(pic_state *, int, pic_value *); pic_value pic_values_by_array(pic_state *, size_t, pic_value *);
pic_value pic_values_by_list(pic_state *, pic_value); pic_value pic_values_by_list(pic_state *, pic_value);
int pic_receive(pic_state *, int, pic_value *); size_t pic_receive(pic_state *, size_t, pic_value *);
pic_value pic_escape(pic_state *, struct pic_proc *); pic_value pic_escape(pic_state *, struct pic_proc *);

2
include/picrin/pair.h
View File

@ -56,7 +56,7 @@ pic_value pic_list4(pic_state *, pic_value, pic_value, pic_value, pic_value);
pic_value pic_list5(pic_state *, pic_value, pic_value, pic_value, pic_value, pic_value); pic_value pic_list5(pic_state *, pic_value, pic_value, pic_value, pic_value, pic_value);
pic_value pic_list6(pic_state *, pic_value, pic_value, pic_value, pic_value, pic_value, pic_value); pic_value pic_list6(pic_state *, pic_value, pic_value, pic_value, pic_value, pic_value, pic_value);
pic_value pic_list7(pic_state *, pic_value, pic_value, pic_value, pic_value, pic_value, pic_value, pic_value); pic_value pic_list7(pic_state *, pic_value, pic_value, pic_value, pic_value, pic_value, pic_value, pic_value);
pic_value pic_list_by_array(pic_state *, int, pic_value *); pic_value pic_list_by_array(pic_state *, size_t, pic_value *);
pic_value pic_make_list(pic_state *, size_t, pic_value); pic_value pic_make_list(pic_state *, size_t, pic_value);
#define pic_for_each(var, list) \ #define pic_for_each(var, list) \

2
pair.c
View File

@ -160,7 +160,7 @@ pic_list7(pic_state *pic, pic_value obj1, pic_value obj2, pic_value obj3, pic_va
} }
pic_value pic_value
pic_list_by_array(pic_state *pic, int c, pic_value *vs) pic_list_by_array(pic_state *pic, size_t c, pic_value *vs)
{ {
pic_value v; pic_value v;