Merge branch 'never-use-size_t'

contrib/10.callcc/callcc.c

@@ -219,7 +219,7 @@ PIC_NORETURN static pic_value
 cont_call(pic_state *pic)
 {
   struct pic_proc *proc;
-  size_t argc;
+  int argc;
   pic_value *argv;
   struct pic_fullcont *cont;
 

contrib/20.r7rs/src/mutable-string.c

@@ -1,7 +1,7 @@
 #include "picrin.h"
 
 void
-pic_str_set(pic_state *pic, pic_str *str, size_t i, char c)
+pic_str_set(pic_state *pic, pic_str *str, int i, char c)
 {
   pic_str *x, *y, *z, *tmp;
   char buf[1];

contrib/20.r7rs/src/system.c

@@ -102,7 +102,7 @@ pic_system_getenvs(pic_state *pic)
 
   for (envp = pic->envp; *envp; ++envp) {
     pic_str *key, *val;
-    size_t i;
+    int i;
 
     for (i = 0; (*envp)[i] != '='; ++i)
       ;

extlib/benz/blob.c

@@ -5,7 +5,7 @@
 #include "picrin.h"
 
 struct pic_blob *
-pic_make_blob(pic_state *pic, size_t len)
+pic_make_blob(pic_state *pic, int len)
 {
   struct pic_blob *bv;
 
@@ -29,7 +29,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;
 
@@ -56,10 +56,9 @@ static pic_value
 pic_blob_make_bytevector(pic_state *pic)
 {
   pic_blob *blob;
-  size_t k, i;
-  int b = 0;
+  int k, i, b = 0;
 
-  pic_get_args(pic, "k|i", &k, &b);
+  pic_get_args(pic, "i|i", &k, &b);
 
   if (b < 0 || b > 255)
     pic_errorf(pic, "byte out of range");
@@ -79,7 +78,7 @@ pic_blob_bytevector_length(pic_state *pic)
 
   pic_get_args(pic, "b", &bv);
 
-  return pic_size_value(bv->len);
+  return pic_int_value(bv->len);
 }
 
 static pic_value
@@ -112,10 +111,9 @@ static pic_value
 pic_blob_bytevector_copy_i(pic_state *pic)
 {
   pic_blob *to, *from;
-  int n;
-  size_t at, start, end;
+  int n, at, start, end;
 
-  n = pic_get_args(pic, "bkb|kk", &to, &at, &from, &start, &end);
+  n = pic_get_args(pic, "bib|ii", &to, &at, &from, &start, &end);
 
   switch (n) {
   case 3:
@@ -144,10 +142,9 @@ static pic_value
 pic_blob_bytevector_copy(pic_state *pic)
 {
   pic_blob *from, *to;
-  int n;
-  size_t start, end, i = 0;
+  int n, start, end, i = 0;
 
-  n = pic_get_args(pic, "b|kk", &from, &start, &end);
+  n = pic_get_args(pic, "b|ii", &from, &start, &end);
 
   switch (n) {
   case 1:
@@ -171,7 +168,7 @@ pic_blob_bytevector_copy(pic_state *pic)
 static pic_value
 pic_blob_bytevector_append(pic_state *pic)
 {
-  size_t argc, i, j, len;
+  int argc, i, j, len;
   pic_value *argv;
   pic_blob *blob;
 
@@ -225,10 +222,9 @@ pic_blob_bytevector_to_list(pic_state *pic)
 {
   pic_blob *blob;
   pic_value list;
-  int n;
-  size_t start, end, i;
+  int n, start, end, i;
 
-  n = pic_get_args(pic, "b|kk", &blob, &start, &end);
+  n = pic_get_args(pic, "b|ii", &blob, &start, &end);
 
   switch (n) {
   case 1:

extlib/benz/bool.c

@@ -8,10 +8,10 @@ KHASH_DECLARE(m, void *, int)
 KHASH_DEFINE2(m, void *, int, 0, kh_ptr_hash_func, kh_ptr_hash_equal)
 
 static bool
-internal_equal_p(pic_state *pic, pic_value x, pic_value y, size_t depth, khash_t(m) *h)
+internal_equal_p(pic_state *pic, pic_value x, pic_value y, int depth, khash_t(m) *h)
 {
   pic_value local = pic_nil_value();
-  size_t c = 0;
+  int c = 0;
 
   if (depth > 10) {
     if (depth > 200) {
@@ -49,7 +49,7 @@ internal_equal_p(pic_state *pic, pic_value x, pic_value y, size_t depth, khash_t
   }
   case PIC_TT_BLOB: {
     pic_blob *blob1, *blob2;
-    size_t i;
+    int i;
 
     blob1 = pic_blob_ptr(x);
     blob2 = pic_blob_ptr(y);
@@ -84,7 +84,7 @@ internal_equal_p(pic_state *pic, pic_value x, pic_value y, size_t depth, khash_t
     goto LOOP;                  /* tail-call optimization */
   }
   case PIC_TT_VECTOR: {
-    size_t i;
+    int i;
     struct pic_vector *u, *v;
 
     u = pic_vec_ptr(x);
@@ -167,7 +167,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);

extlib/benz/char.c

@@ -34,15 +34,15 @@ pic_char_integer_to_char(pic_state *pic)
   if (i < 0 || i > 127) {
     pic_errorf(pic, "integer->char: integer out of char range: %d", i);
   }
-
+  
   return pic_char_value((char)i);
 }
 
 #define DEFINE_CHAR_CMP(op, name)			\
   static pic_value					\
   pic_char_##name##_p(pic_state *pic)			\
   {							\
-    size_t argc, i;                                     \
+    int argc, i;                                        \
     pic_value *argv;					\
     char c, d;						\
     							\

extlib/benz/codegen.c

@@ -505,7 +505,7 @@ analyze_lambda(pic_state *pic, analyze_scope *up, pic_value form)
   pic_value formals, body;
   pic_value rest = pic_undef_value();
   pic_vec *args, *locals, *captures;
-  size_t i, j;
+  int i, j;
   khiter_t it;
 
   formals = pic_list_ref(pic, form, 1);
@@ -752,33 +752,33 @@ codegen_context_destroy(pic_state *pic, codegen_context *cxt)
 static int
 index_capture(codegen_context *cxt, pic_sym *sym, int depth)
 {
-  size_t i;
+  int i;
 
   while (depth-- > 0) {
     cxt = cxt->up;
   }
 
   for (i = 0; i < cxt->captures->len; ++i) {
     if (pic_sym_ptr(cxt->captures->data[i]) == sym)
-      return (int)i;
+      return i;
   }
   return -1;
 }
 
 static int
 index_local(codegen_context *cxt, pic_sym *sym)
 {
-  size_t i, offset;
+  int i, offset;
 
   offset = 1;
   for (i = 0; i < cxt->args->len; ++i) {
     if (pic_sym_ptr(cxt->args->data[i]) == sym)
-      return (int)(i + offset);
+      return i + offset;
   }
   offset += i;
   for (i = 0; i < cxt->locals->len; ++i) {
     if (pic_sym_ptr(cxt->locals->data[i]) == sym)
-      return (int)(i + offset);
+      return i + offset;
   }
   return -1;
 }
@@ -802,13 +802,12 @@ index_global(pic_state *pic, codegen_context *cxt, pic_sym *name)
 static void
 create_activation(pic_state *pic, codegen_context *cxt)
 {
-  size_t i;
-  int n;
+  int i, n;
 
   for (i = 0; i < cxt->captures->len; ++i) {
     n = index_local(cxt, pic_sym_ptr(cxt->captures->data[i]));
     assert(n != -1);
-    if (n <= (int)cxt->args->len || cxt->rest == pic_sym_ptr(cxt->captures->data[i])) {
+    if (n <= cxt->args->len || cxt->rest == pic_sym_ptr(cxt->captures->data[i])) {
       /* copy arguments to capture variable area */
       emit_i(pic, cxt, OP_LREF, n);
     } else {

extlib/benz/cont.c

@@ -86,7 +86,7 @@ static pic_value
 cont_call(pic_state *pic)
 {
   struct pic_proc *self = pic_get_proc(pic);
-  size_t argc;
+  int argc;
   pic_value *argv;
   int id;
   struct pic_cont *cc, *cont;
@@ -155,11 +155,11 @@ pic_callcc(pic_state *pic, struct pic_proc *proc)
 }
 
 static pic_value
-pic_va_values(pic_state *pic, size_t n, ...)
+pic_va_values(pic_state *pic, int n, ...)
 {
   pic_vec *args = pic_make_vec(pic, n);
   va_list ap;
-  size_t i = 0;
+  int i = 0;
 
   va_start(ap, n);
 
@@ -209,9 +209,9 @@ pic_values5(pic_state *pic, pic_value arg1, pic_value arg2, pic_value arg3, pic_
 }
 
 pic_value
-pic_values(pic_state *pic, size_t argc, pic_value *argv)
+pic_values(pic_state *pic, int argc, pic_value *argv)
 {
-  size_t i;
+  int i;
 
   for (i = 0; i < argc; ++i) {
     pic->sp[i] = argv[i];
@@ -236,15 +236,15 @@ pic_values_by_list(pic_state *pic, pic_value list)
   return pic_nil_p(list) ? pic_undef_value() : pic->sp[0];
 }
 
-size_t
-pic_receive(pic_state *pic, size_t n, pic_value *argv)
+int
+pic_receive(pic_state *pic, int n, pic_value *argv)
 {
   pic_callinfo *ci;
-  size_t i, retc;
+  int i, retc;
 
   /* take info from discarded frame */
   ci = pic->ci + 1;
-  retc = (size_t)ci->retc;
+  retc = ci->retc;
 
   for (i = 0; i < retc && i < n; ++i) {
     argv[i] = ci->fp[i];
@@ -276,7 +276,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);
@@ -288,7 +288,7 @@ static pic_value
 pic_cont_call_with_values(pic_state *pic)
 {
   struct pic_proc *producer, *consumer;
-  size_t argc;
+  int argc;
   pic_vec *args;
 
   pic_get_args(pic, "ll", &producer, &consumer);

extlib/benz/dict.c

@@ -41,7 +41,7 @@ pic_dict_set(pic_state PIC_UNUSED(*pic), struct pic_dict *dict, pic_sym *key, pi
   kh_val(h, it) = val;
 }
 
-size_t
+int
 pic_dict_size(pic_state PIC_UNUSED(*pic), struct pic_dict *dict)
 {
   return kh_size(&dict->hash);
@@ -83,7 +83,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);
 

extlib/benz/error.c

@@ -188,7 +188,7 @@ 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);

extlib/benz/gc.c

@@ -325,7 +325,7 @@ gc_mark_object(pic_state *pic, struct pic_object *obj)
     break;
   }
   case PIC_TT_VECTOR: {
-    size_t i;
+    int i;
     for (i = 0; i < obj->u.vec.len; ++i) {
       gc_mark(pic, obj->u.vec.data[i]);
     }

extlib/benz/include/picrin.h

@@ -205,7 +205,7 @@ pic_value pic_apply2(pic_state *, struct pic_proc *, pic_value, pic_value);
 pic_value pic_apply3(pic_state *, struct pic_proc *, pic_value, pic_value, pic_value);
 pic_value pic_apply4(pic_state *, struct pic_proc *, pic_value, pic_value, pic_value, pic_value);
 pic_value pic_apply5(pic_state *, struct pic_proc *, pic_value, pic_value, pic_value, pic_value, pic_value);
-pic_value pic_apply_trampoline(pic_state *, struct pic_proc *, size_t, pic_value *);
+pic_value pic_apply_trampoline(pic_state *, struct pic_proc *, int, pic_value *);
 pic_value pic_apply_trampoline_list(pic_state *, struct pic_proc *, pic_value);
 pic_value pic_eval(pic_state *, pic_value, struct pic_env *);
 

extlib/benz/include/picrin/blob.h

@@ -12,13 +12,13 @@ extern "C" {
 struct pic_blob {
   PIC_OBJECT_HEADER
   unsigned char *data;
-  size_t len;
+  int len;
 };
 
 #define pic_blob_p(v) (pic_type(v) == PIC_TT_BLOB)
 #define pic_blob_ptr(v) ((struct pic_blob *)pic_ptr(v))
 
-struct pic_blob *pic_make_blob(pic_state *, size_t);
+struct pic_blob *pic_make_blob(pic_state *, int);
 
 #if defined(__cplusplus)
 }

extlib/benz/include/picrin/cont.h

@@ -41,9 +41,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_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_values(pic_state *, size_t, pic_value *);
+pic_value pic_values(pic_state *, int, pic_value *);
 pic_value pic_values_by_list(pic_state *, pic_value);
-size_t pic_receive(pic_state *, size_t, pic_value *);
+int pic_receive(pic_state *, int, pic_value *);
 
 pic_value pic_callcc(pic_state *, struct pic_proc *);
 

extlib/benz/include/picrin/dict.h

@@ -30,7 +30,7 @@ struct pic_dict *pic_make_dict(pic_state *);
 pic_value pic_dict_ref(pic_state *, struct pic_dict *, pic_sym *);
 void pic_dict_set(pic_state *, struct pic_dict *, pic_sym *, pic_value);
 void pic_dict_del(pic_state *, struct pic_dict *, pic_sym *);
-size_t pic_dict_size(pic_state *, struct pic_dict *);
+int pic_dict_size(pic_state *, struct pic_dict *);
 bool pic_dict_has(pic_state *, struct pic_dict *, pic_sym *);
 
 #if defined(__cplusplus)