diff options
| -rw-r--r-- | src/array.c | 18 | ||||
| -rw-r--r-- | src/class.c | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/array.c b/src/array.c index 6bbabca78..b55a47f66 100644 --- a/src/array.c +++ b/src/array.c @@ -223,10 +223,10 @@ mrb_value mrb_ary_s_create(mrb_state *mrb, mrb_value self) { mrb_value *vals; - mrb_int len; + int len; mrb_get_args(mrb, "*", &vals, &len); - return mrb_ary_new_from_values(mrb, (int)len, vals); + return mrb_ary_new_from_values(mrb, len, vals); } static void @@ -462,7 +462,7 @@ mrb_value mrb_ary_push_m(mrb_state *mrb, mrb_value self) { mrb_value *argv; - mrb_int len; + int len; mrb_get_args(mrb, "*", &argv, &len); while(len--) { @@ -548,7 +548,7 @@ mrb_ary_unshift_m(mrb_state *mrb, mrb_value self) { struct RArray *a = mrb_ary_ptr(self); mrb_value *vals; - mrb_int len; + int len; mrb_get_args(mrb, "*", &vals, &len); if ((a->flags & MRB_ARY_SHARED) @@ -658,7 +658,7 @@ mrb_ary_splice(mrb_state *mrb, mrb_value ary, mrb_int head, mrb_int len, mrb_val return ary; } -int +mrb_int mrb_ary_len(mrb_state *mrb, mrb_value ary) { return RARRAY_LEN(ary); @@ -696,7 +696,7 @@ mrb_ary_aget(mrb_state *mrb, mrb_value self) struct RArray *a = mrb_ary_ptr(self); mrb_int index, len; mrb_value *argv; - mrb_int size; + int size; mrb_get_args(mrb, "i*", &index, &argv, &size); switch(size) { @@ -712,7 +712,7 @@ mrb_ary_aget(mrb_state *mrb, mrb_value self) len = mrb_fixnum(argv[0]); if (len < 0) return mrb_nil_value(); if (a->len == (int)index) return mrb_ary_new(mrb); - if ((int)len > a->len - index) len = a->len - index; + if (len > a->len - index) len = a->len - index; return ary_subseq(mrb, a, index, len); default: @@ -726,7 +726,7 @@ mrb_value mrb_ary_aset(mrb_state *mrb, mrb_value self) { mrb_value *argv; - mrb_int argc; + int argc; mrb_get_args(mrb, "*", &argv, &argc); switch(argc) { @@ -803,7 +803,7 @@ mrb_ary_last(mrb_state *mrb, mrb_value self) struct RArray *a = mrb_ary_ptr(self); mrb_int size; mrb_value *vals; - mrb_int len; + int len; mrb_get_args(mrb, "*", &vals, &len); if (len > 1) { diff --git a/src/class.c b/src/class.c index a7fae4f63..8ea323945 100644 --- a/src/class.c +++ b/src/class.c @@ -367,7 +367,7 @@ to_hash(mrb_state *mrb, mrb_value val) H: Hash [mrb_value] s: String [char*,int] z: String [char*] - a: Array [mrb_value*,int] + a: Array [mrb_value*,mrb_int] f: Float [mrb_float] i: Integer [mrb_int] b: Binary [int] @@ -489,10 +489,10 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) mrb_value aa; struct RArray *a; mrb_value **pb; - int *pl; + mrb_int *pl; pb = va_arg(ap, mrb_value**); - pl = va_arg(ap, int*); + pl = va_arg(ap, mrb_int*); if (i < argc) { aa = to_ary(mrb, *sp++); a = mrb_ary_ptr(aa); |