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

argc should be int

This commit is contained in:
Yuichi Nishiwaki 2014-09-26 17:04:20 +09:00
parent de362c8f37
commit a75ff9f2b0
14 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
blob.c
View File

@ -33,7 +33,7 @@ static pic_value
pic_blob_bytevector(pic_state *pic) pic_blob_bytevector(pic_state *pic)
{ {
pic_value *argv; pic_value *argv;
size_t argc, i; int argc, i;
pic_blob *blob; pic_blob *blob;
unsigned char *data; unsigned char *data;
@ -176,7 +176,8 @@ pic_blob_bytevector_copy(pic_state *pic)
static pic_value static pic_value
pic_blob_bytevector_append(pic_state *pic) pic_blob_bytevector_append(pic_state *pic)
{ {
size_t argc, i, j, len; size_t j, len;
int argc, i;
pic_value *argv; pic_value *argv;
pic_blob *blob; pic_blob *blob;

2
bool.c
View File

@ -172,7 +172,7 @@ pic_bool_boolean_p(pic_state *pic)
static pic_value static pic_value
pic_bool_boolean_eq_p(pic_state *pic) pic_bool_boolean_eq_p(pic_state *pic)
{ {
size_t argc, i; int argc, i;
pic_value *argv; pic_value *argv;
pic_get_args(pic, "*", &argc, &argv); pic_get_args(pic, "*", &argc, &argv);

3
char.c
View File

@ -42,9 +42,8 @@ pic_char_integer_to_char(pic_state *pic)
static pic_value \ static pic_value \
pic_char_##name##_p(pic_state *pic) \ pic_char_##name##_p(pic_state *pic) \
{ \ { \
size_t argc; \ int argc, i; \
pic_value *argv; \ pic_value *argv; \
size_t i; \
char c, d; \ char c, d; \
\ \
pic_get_args(pic, "cc*", &c, &d, &argc, &argv); \ pic_get_args(pic, "cc*", &c, &d, &argc, &argv); \

4
cont.c
View File

@ -96,7 +96,7 @@ pic_load_point(pic_state *pic, struct pic_escape *escape)
noreturn static pic_value noreturn static pic_value
escape_call(pic_state *pic) escape_call(pic_state *pic)
{ {
size_t argc; int argc;
pic_value *argv; pic_value *argv;
struct pic_data *e; struct pic_data *e;
@ -251,7 +251,7 @@ pic_cont_dynamic_wind(pic_state *pic)
static pic_value static pic_value
pic_cont_values(pic_state *pic) pic_cont_values(pic_state *pic)
{ {
size_t argc; int argc;
pic_value *argv; pic_value *argv;
pic_get_args(pic, "*", &argc, &argv); pic_get_args(pic, "*", &argc, &argv);

2
dict.c
View File

@ -142,7 +142,7 @@ pic_dict_dictionary(pic_state *pic)
{ {
struct pic_dict *dict; struct pic_dict *dict;
pic_value *argv; pic_value *argv;
size_t argc, i; int argc, i;
pic_get_args(pic, "*", &argc, &argv); pic_get_args(pic, "*", &argc, &argv);

4
error.c
View File

@ -243,7 +243,7 @@ noreturn static pic_value
pic_error_error(pic_state *pic) pic_error_error(pic_state *pic)
{ {
const char *str; const char *str;
size_t argc; int argc;
pic_value *argv; pic_value *argv;
pic_get_args(pic, "z*", &str, &argc, &argv); pic_get_args(pic, "z*", &str, &argc, &argv);
@ -257,7 +257,7 @@ pic_error_make_error_object(pic_state *pic)
struct pic_error *e; struct pic_error *e;
pic_sym type; pic_sym type;
pic_str *msg; pic_str *msg;
size_t argc; int argc;
pic_value *argv; pic_value *argv;
pic_get_args(pic, "ms*", &type, &msg, &argc, &argv); pic_get_args(pic, "ms*", &type, &msg, &argc, &argv);

8
lib.c
View File

@ -253,7 +253,7 @@ static pic_value
pic_lib_condexpand(pic_state *pic) pic_lib_condexpand(pic_state *pic)
{ {
pic_value *clauses; pic_value *clauses;
size_t argc, i; int argc, i;
pic_get_args(pic, "*", &argc, &clauses); pic_get_args(pic, "*", &argc, &clauses);
@ -269,7 +269,7 @@ pic_lib_condexpand(pic_state *pic)
static pic_value static pic_value
pic_lib_import(pic_state *pic) pic_lib_import(pic_state *pic)
{ {
size_t argc, i; int argc, i;
pic_value *argv; pic_value *argv;
pic_get_args(pic, "*", &argc, &argv); pic_get_args(pic, "*", &argc, &argv);
@ -284,7 +284,7 @@ pic_lib_import(pic_state *pic)
static pic_value static pic_value
pic_lib_export(pic_state *pic) pic_lib_export(pic_state *pic)
{ {
size_t argc, i; int argc, i;
pic_value *argv; pic_value *argv;
pic_get_args(pic, "*", &argc, &argv); pic_get_args(pic, "*", &argc, &argv);
@ -300,7 +300,7 @@ static pic_value
pic_lib_define_library(pic_state *pic) pic_lib_define_library(pic_state *pic)
{ {
struct pic_lib *prev = pic->lib; struct pic_lib *prev = pic->lib;
size_t argc, i; int argc, i;
pic_value spec, *argv; pic_value spec, *argv;
pic_get_args(pic, "o*", &spec, &argc, &argv); pic_get_args(pic, "o*", &spec, &argc, &argv);

9
number.c
View File

@ -162,9 +162,8 @@ pic_number_nan_p(pic_state *pic)
static pic_value \ static pic_value \
pic_number_##name(pic_state *pic) \ pic_number_##name(pic_state *pic) \
{ \ { \
size_t argc; \ int argc, i; \
pic_value *argv; \ pic_value *argv; \
size_t i; \
double f,g; \ double f,g; \
\ \
pic_get_args(pic, "ff*", &f, &g, &argc, &argv); \ pic_get_args(pic, "ff*", &f, &g, &argc, &argv); \
@ -198,9 +197,8 @@ DEFINE_ARITH_CMP(>=, ge)
static pic_value \ static pic_value \
pic_number_##name(pic_state *pic) \ pic_number_##name(pic_state *pic) \
{ \ { \
size_t argc; \ int argc, i; \
pic_value *argv; \ pic_value *argv; \
size_t i; \
double f; \ double f; \
bool e = true; \ bool e = true; \
\ \
@ -230,9 +228,8 @@ DEFINE_ARITH_OP(*, mul, 1)
static pic_value \ static pic_value \
pic_number_##name(pic_state *pic) \ pic_number_##name(pic_state *pic) \
{ \ { \
size_t argc; \ int argc, i; \
pic_value *argv; \ pic_value *argv; \
size_t i; \
double f; \ double f; \
bool e; \ bool e; \
\ \

10
pair.c
View File

@ -544,7 +544,7 @@ pic_pair_make_list(pic_state *pic)
static pic_value static pic_value
pic_pair_list(pic_state *pic) pic_pair_list(pic_state *pic)
{ {
size_t argc; int argc;
pic_value *argv; pic_value *argv;
pic_get_args(pic, "*", &argc, &argv); pic_get_args(pic, "*", &argc, &argv);
@ -565,7 +565,7 @@ pic_pair_length(pic_state *pic)
static pic_value static pic_value
pic_pair_append(pic_state *pic) pic_pair_append(pic_state *pic)
{ {
size_t argc; int argc;
pic_value *args, list; pic_value *args, list;
pic_get_args(pic, "*", &argc, &args); pic_get_args(pic, "*", &argc, &args);
@ -641,9 +641,8 @@ static pic_value
pic_pair_map(pic_state *pic) pic_pair_map(pic_state *pic)
{ {
struct pic_proc *proc; struct pic_proc *proc;
size_t argc; int argc, i;
pic_value *args; pic_value *args;
int i;
pic_value cars, ret; pic_value cars, ret;
pic_get_args(pic, "l*", &proc, &argc, &args); pic_get_args(pic, "l*", &proc, &argc, &args);
@ -670,9 +669,8 @@ static pic_value
pic_pair_for_each(pic_state *pic) pic_pair_for_each(pic_state *pic)
{ {
struct pic_proc *proc; struct pic_proc *proc;
size_t argc; int argc, i;
pic_value *args; pic_value *args;
int i;
pic_value cars; pic_value cars;
pic_get_args(pic, "l*", &proc, &argc, &args); pic_get_args(pic, "l*", &proc, &argc, &args);

2
proc.c
View File

@ -61,7 +61,7 @@ pic_proc_apply(pic_state *pic)
{ {
struct pic_proc *proc; struct pic_proc *proc;
pic_value *args; pic_value *args;
size_t argc; int argc;
pic_value arg_list; pic_value arg_list;
pic_get_args(pic, "l*", &proc, &argc, &args); pic_get_args(pic, "l*", &proc, &argc, &args);

14
string.c
View File

@ -233,11 +233,10 @@ pic_str_string_p(pic_state *pic)
static pic_value static pic_value
pic_str_string(pic_state *pic) pic_str_string(pic_state *pic)
{ {
size_t argc; int argc, i;
pic_value *argv; pic_value *argv;
pic_str *str; pic_str *str;
char *buf; char *buf;
size_t i;
pic_get_args(pic, "*", &argc, &argv); pic_get_args(pic, "*", &argc, &argv);
@ -290,9 +289,8 @@ pic_str_string_ref(pic_state *pic)
static pic_value \ static pic_value \
pic_str_string_##name(pic_state *pic) \ pic_str_string_##name(pic_state *pic) \
{ \ { \
size_t argc; \ int argc, i; \
pic_value *argv; \ pic_value *argv; \
size_t i; \
\ \
pic_get_args(pic, "*", &argc, &argv); \ pic_get_args(pic, "*", &argc, &argv); \
\ \
@ -338,7 +336,7 @@ pic_str_string_copy(pic_state *pic)
static pic_value static pic_value
pic_str_string_append(pic_state *pic) pic_str_string_append(pic_state *pic)
{ {
size_t argc, i; int argc, i;
pic_value *argv; pic_value *argv;
pic_str *str; pic_str *str;
@ -358,8 +356,9 @@ static pic_value
pic_str_string_map(pic_state *pic) pic_str_string_map(pic_state *pic)
{ {
struct pic_proc *proc; struct pic_proc *proc;
size_t argc, i, len, j; int argc, i;
pic_value *argv, vals, val; pic_value *argv, vals, val;
size_t len, j;
pic_get_args(pic, "l*", &proc, &argc, &argv); pic_get_args(pic, "l*", &proc, &argc, &argv);
@ -396,7 +395,8 @@ static pic_value
pic_str_string_for_each(pic_state *pic) pic_str_string_for_each(pic_state *pic)
{ {
struct pic_proc *proc; struct pic_proc *proc;
size_t argc, i, len, j; int argc, i;
size_t len, j;
pic_value *argv, vals, val; pic_value *argv, vals, val;
pic_get_args(pic, "l*", &proc, &argc, &argv); pic_get_args(pic, "l*", &proc, &argc, &argv);

2
symbol.c
View File

@ -108,7 +108,7 @@ pic_symbol_symbol_p(pic_state *pic)
static pic_value static pic_value
pic_symbol_symbol_eq_p(pic_state *pic) pic_symbol_symbol_eq_p(pic_state *pic)
{ {
size_t argc, i; int argc, i;
pic_value *argv; pic_value *argv;
pic_get_args(pic, "*", &argc, &argv); pic_get_args(pic, "*", &argc, &argv);

12
vector.c
View File

@ -51,10 +51,9 @@ pic_vec_vector_p(pic_state *pic)
static pic_value static pic_value
pic_vec_vector(pic_state *pic) pic_vec_vector(pic_state *pic)
{ {
size_t argc; int argc, i;
pic_value *argv; pic_value *argv;
pic_vec *vec; pic_vec *vec;
size_t i;
pic_get_args(pic, "*", &argc, &argv); pic_get_args(pic, "*", &argc, &argv);
@ -191,8 +190,9 @@ pic_vec_vector_copy(pic_state *pic)
static pic_value static pic_value
pic_vec_vector_append(pic_state *pic) pic_vec_vector_append(pic_state *pic)
{ {
size_t argc, i, j, len; int argc, i;
pic_value *argv; pic_value *argv;
size_t j, len;
pic_vec *vec; pic_vec *vec;
pic_get_args(pic, "*", &argc, &argv); pic_get_args(pic, "*", &argc, &argv);
@ -243,8 +243,9 @@ static pic_value
pic_vec_vector_map(pic_state *pic) pic_vec_vector_map(pic_state *pic)
{ {
struct pic_proc *proc; struct pic_proc *proc;
size_t argc, i, len, j; int argc, i;
pic_value *argv, vals; pic_value *argv, vals;
size_t len, j;
pic_vec *vec; pic_vec *vec;
pic_get_args(pic, "l*", &proc, &argc, &argv); pic_get_args(pic, "l*", &proc, &argc, &argv);
@ -275,8 +276,9 @@ static pic_value
pic_vec_vector_for_each(pic_state *pic) pic_vec_vector_for_each(pic_state *pic)
{ {
struct pic_proc *proc; struct pic_proc *proc;
size_t argc, i, len, j; int argc, i;
pic_value *argv, vals; pic_value *argv, vals;
size_t len, j;
pic_get_args(pic, "l*", &proc, &argc, &argv); pic_get_args(pic, "l*", &proc, &argc, &argv);

4
vm.c
View File

@ -386,10 +386,10 @@ pic_get_args(pic_state *pic, const char *format, ...)
} }
} }
if ('*' == c) { if ('*' == c) {
size_t *n; int *n;
pic_value **argv; pic_value **argv;
n = va_arg(ap, size_t *); n = va_arg(ap, int *);
argv = va_arg(ap, pic_value **); argv = va_arg(ap, pic_value **);
if (i <= argc) { if (i <= argc) {
*n = argc - i; *n = argc - i;