From a75ff9f2b0790d3398f969cc3a4079b69f10967a Mon Sep 17 00:00:00 2001
From: Yuichi Nishiwaki <yuichi.nishiwaki@gmail.com>
Date: Fri, 26 Sep 2014 17:04:20 +0900
Subject: [PATCH] argc should be int

---
 blob.c   |  5 +++--
 bool.c   |  2 +-
 char.c   |  3 +--
 cont.c   |  4 ++--
 dict.c   |  2 +-
 error.c  |  4 ++--
 lib.c    |  8 ++++----
 number.c |  9 +++------
 pair.c   | 10 ++++------
 proc.c   |  2 +-
 string.c | 14 +++++++-------
 symbol.c |  2 +-
 vector.c | 12 +++++++-----
 vm.c     |  4 ++--
 14 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/blob.c b/blob.c
index e927f4ff..d87afc83 100644
--- a/blob.c
+++ b/blob.c
@@ -33,7 +33,7 @@ static pic_value
 pic_blob_bytevector(pic_state *pic)
 {
   pic_value *argv;
-  size_t argc, i;
+  int argc, i;
   pic_blob *blob;
   unsigned char *data;
 
@@ -176,7 +176,8 @@ pic_blob_bytevector_copy(pic_state *pic)
 static pic_value
 pic_blob_bytevector_append(pic_state *pic)
 {
-  size_t argc, i, j, len;
+  size_t j, len;
+  int argc, i;
   pic_value *argv;
   pic_blob *blob;
 
diff --git a/bool.c b/bool.c
index 8f8c75f1..ff5528e9 100644
--- a/bool.c
+++ b/bool.c
@@ -172,7 +172,7 @@ pic_bool_boolean_p(pic_state *pic)
 static pic_value
 pic_bool_boolean_eq_p(pic_state *pic)
 {
-  size_t argc, i;
+  int argc, i;
   pic_value *argv;
 
   pic_get_args(pic, "*", &argc, &argv);
diff --git a/char.c b/char.c
index 98eed6f7..f08fcdd0 100644
--- a/char.c
+++ b/char.c
@@ -42,9 +42,8 @@ pic_char_integer_to_char(pic_state *pic)
   static pic_value					\
   pic_char_##name##_p(pic_state *pic)			\
   {							\
-    size_t argc;					\
+    int argc, i;                                        \
     pic_value *argv;					\
-    size_t i;						\
     char c, d;						\
     							\
     pic_get_args(pic, "cc*", &c, &d, &argc, &argv);	\
diff --git a/cont.c b/cont.c
index f010f532..39ec7861 100644
--- a/cont.c
+++ b/cont.c
@@ -96,7 +96,7 @@ pic_load_point(pic_state *pic, struct pic_escape *escape)
 noreturn static pic_value
 escape_call(pic_state *pic)
 {
-  size_t argc;
+  int argc;
   pic_value *argv;
   struct pic_data *e;
 
@@ -251,7 +251,7 @@ pic_cont_dynamic_wind(pic_state *pic)
 static pic_value
 pic_cont_values(pic_state *pic)
 {
-  size_t argc;
+  int argc;
   pic_value *argv;
 
   pic_get_args(pic, "*", &argc, &argv);
diff --git a/dict.c b/dict.c
index 13200c08..2a8fcd41 100644
--- a/dict.c
+++ b/dict.c
@@ -142,7 +142,7 @@ pic_dict_dictionary(pic_state *pic)
 {
   struct pic_dict *dict;
   pic_value *argv;
-  size_t argc, i;
+  int argc, i;
 
   pic_get_args(pic, "*", &argc, &argv);
 
diff --git a/error.c b/error.c
index b25cbb42..568e523b 100644
--- a/error.c
+++ b/error.c
@@ -243,7 +243,7 @@ noreturn static pic_value
 pic_error_error(pic_state *pic)
 {
   const char *str;
-  size_t argc;
+  int argc;
   pic_value *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;
   pic_sym type;
   pic_str *msg;
-  size_t argc;
+  int argc;
   pic_value *argv;
 
   pic_get_args(pic, "ms*", &type, &msg, &argc, &argv);
diff --git a/lib.c b/lib.c
index 37cba2bd..cd760f18 100644
--- a/lib.c
+++ b/lib.c
@@ -253,7 +253,7 @@ static pic_value
 pic_lib_condexpand(pic_state *pic)
 {
   pic_value *clauses;
-  size_t argc, i;
+  int argc, i;
 
   pic_get_args(pic, "*", &argc, &clauses);
 
@@ -269,7 +269,7 @@ pic_lib_condexpand(pic_state *pic)
 static pic_value
 pic_lib_import(pic_state *pic)
 {
-  size_t argc, i;
+  int argc, i;
   pic_value *argv;
 
   pic_get_args(pic, "*", &argc, &argv);
@@ -284,7 +284,7 @@ pic_lib_import(pic_state *pic)
 static pic_value
 pic_lib_export(pic_state *pic)
 {
-  size_t argc, i;
+  int argc, i;
   pic_value *argv;
 
   pic_get_args(pic, "*", &argc, &argv);
@@ -300,7 +300,7 @@ static pic_value
 pic_lib_define_library(pic_state *pic)
 {
   struct pic_lib *prev = pic->lib;
-  size_t argc, i;
+  int argc, i;
   pic_value spec, *argv;
 
   pic_get_args(pic, "o*", &spec, &argc, &argv);
diff --git a/number.c b/number.c
index 2ed93a79..c72f58ca 100644
--- a/number.c
+++ b/number.c
@@ -162,9 +162,8 @@ pic_number_nan_p(pic_state *pic)
   static pic_value					\
   pic_number_##name(pic_state *pic)			\
   {							\
-    size_t argc;					\
+    int argc, i;                                        \
     pic_value *argv;					\
-    size_t i;						\
     double f,g;						\
     							\
     pic_get_args(pic, "ff*", &f, &g, &argc, &argv);	\
@@ -198,9 +197,8 @@ DEFINE_ARITH_CMP(>=, ge)
   static pic_value                                              \
   pic_number_##name(pic_state *pic)                             \
   {                                                             \
-    size_t argc;                                                \
+    int argc, i;                                                \
     pic_value *argv;                                            \
-    size_t i;                                                   \
     double f;                                                   \
     bool e = true;                                              \
                                                                 \
@@ -230,9 +228,8 @@ DEFINE_ARITH_OP(*, mul, 1)
   static pic_value                                                      \
   pic_number_##name(pic_state *pic)                                     \
   {                                                                     \
-   size_t argc;                                                         \
+    int argc, i;                                                        \
    pic_value *argv;                                                     \
-   size_t i;                                                            \
    double f;                                                            \
    bool e;                                                              \
                                                                         \
diff --git a/pair.c b/pair.c
index ee2263c7..b6def852 100644
--- a/pair.c
+++ b/pair.c
@@ -544,7 +544,7 @@ pic_pair_make_list(pic_state *pic)
 static pic_value
 pic_pair_list(pic_state *pic)
 {
-  size_t argc;
+  int argc;
   pic_value *argv;
 
   pic_get_args(pic, "*", &argc, &argv);
@@ -565,7 +565,7 @@ pic_pair_length(pic_state *pic)
 static pic_value
 pic_pair_append(pic_state *pic)
 {
-  size_t argc;
+  int argc;
   pic_value *args, list;
 
   pic_get_args(pic, "*", &argc, &args);
@@ -641,9 +641,8 @@ static pic_value
 pic_pair_map(pic_state *pic)
 {
   struct pic_proc *proc;
-  size_t argc;
+  int argc, i;
   pic_value *args;
-  int i;
   pic_value cars, ret;
 
   pic_get_args(pic, "l*", &proc, &argc, &args);
@@ -670,9 +669,8 @@ static pic_value
 pic_pair_for_each(pic_state *pic)
 {
   struct pic_proc *proc;
-  size_t argc;
+  int argc, i;
   pic_value *args;
-  int i;
   pic_value cars;
 
   pic_get_args(pic, "l*", &proc, &argc, &args);
diff --git a/proc.c b/proc.c
index 210f157d..0d67ddd7 100644
--- a/proc.c
+++ b/proc.c
@@ -61,7 +61,7 @@ pic_proc_apply(pic_state *pic)
 {
   struct pic_proc *proc;
   pic_value *args;
-  size_t argc;
+  int argc;
   pic_value arg_list;
 
   pic_get_args(pic, "l*", &proc, &argc, &args);
diff --git a/string.c b/string.c
index b53055f4..2372ea31 100644
--- a/string.c
+++ b/string.c
@@ -233,11 +233,10 @@ pic_str_string_p(pic_state *pic)
 static pic_value
 pic_str_string(pic_state *pic)
 {
-  size_t argc;
+  int argc, i;
   pic_value *argv;
   pic_str *str;
   char *buf;
-  size_t i;
 
   pic_get_args(pic, "*", &argc, &argv);
 
@@ -290,9 +289,8 @@ pic_str_string_ref(pic_state *pic)
   static pic_value                                                      \
   pic_str_string_##name(pic_state *pic)                                 \
   {                                                                     \
-    size_t argc;                                                        \
+    int argc, i;                                                        \
     pic_value *argv;                                                    \
-    size_t i;                                                           \
                                                                         \
     pic_get_args(pic, "*", &argc, &argv);                               \
                                                                         \
@@ -338,7 +336,7 @@ pic_str_string_copy(pic_state *pic)
 static pic_value
 pic_str_string_append(pic_state *pic)
 {
-  size_t argc, i;
+  int argc, i;
   pic_value *argv;
   pic_str *str;
 
@@ -358,8 +356,9 @@ static pic_value
 pic_str_string_map(pic_state *pic)
 {
   struct pic_proc *proc;
-  size_t argc, i, len, j;
+  int argc, i;
   pic_value *argv, vals, val;
+  size_t len, j;
 
   pic_get_args(pic, "l*", &proc, &argc, &argv);
 
@@ -396,7 +395,8 @@ static pic_value
 pic_str_string_for_each(pic_state *pic)
 {
   struct pic_proc *proc;
-  size_t argc, i, len, j;
+  int argc, i;
+  size_t len, j;
   pic_value *argv, vals, val;
 
   pic_get_args(pic, "l*", &proc, &argc, &argv);
diff --git a/symbol.c b/symbol.c
index 0cbbf78a..d6feab13 100644
--- a/symbol.c
+++ b/symbol.c
@@ -108,7 +108,7 @@ pic_symbol_symbol_p(pic_state *pic)
 static pic_value
 pic_symbol_symbol_eq_p(pic_state *pic)
 {
-  size_t argc, i;
+  int argc, i;
   pic_value *argv;
 
   pic_get_args(pic, "*", &argc, &argv);
diff --git a/vector.c b/vector.c
index 775895d3..4378e66c 100644
--- a/vector.c
+++ b/vector.c
@@ -51,10 +51,9 @@ pic_vec_vector_p(pic_state *pic)
 static pic_value
 pic_vec_vector(pic_state *pic)
 {
-  size_t argc;
+  int argc, i;
   pic_value *argv;
   pic_vec *vec;
-  size_t i;
 
   pic_get_args(pic, "*", &argc, &argv);
 
@@ -191,8 +190,9 @@ pic_vec_vector_copy(pic_state *pic)
 static pic_value
 pic_vec_vector_append(pic_state *pic)
 {
-  size_t argc, i, j, len;
+  int argc, i;
   pic_value *argv;
+  size_t j, len;
   pic_vec *vec;
 
   pic_get_args(pic, "*", &argc, &argv);
@@ -243,8 +243,9 @@ static pic_value
 pic_vec_vector_map(pic_state *pic)
 {
   struct pic_proc *proc;
-  size_t argc, i, len, j;
+  int argc, i;
   pic_value *argv, vals;
+  size_t len, j;
   pic_vec *vec;
 
   pic_get_args(pic, "l*", &proc, &argc, &argv);
@@ -275,8 +276,9 @@ static pic_value
 pic_vec_vector_for_each(pic_state *pic)
 {
   struct pic_proc *proc;
-  size_t argc, i, len, j;
+  int argc, i;
   pic_value *argv, vals;
+  size_t len, j;
 
   pic_get_args(pic, "l*", &proc, &argc, &argv);
 
diff --git a/vm.c b/vm.c
index 92af1ce7..a996742e 100644
--- a/vm.c
+++ b/vm.c
@@ -386,10 +386,10 @@ pic_get_args(pic_state *pic, const char *format, ...)
     }
   }
   if ('*' == c) {
-    size_t *n;
+    int *n;
     pic_value **argv;
 
-    n = va_arg(ap, size_t *);
+    n = va_arg(ap, int *);
     argv = va_arg(ap, pic_value **);
     if (i <= argc) {
       *n = argc - i;