diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/class.c | 11 | ||||
| -rw-r--r-- | src/object.c | 28 |
2 files changed, 25 insertions, 14 deletions
diff --git a/src/class.c b/src/class.c index f97cc4c40..ec9c648e5 100644 --- a/src/class.c +++ b/src/class.c @@ -929,13 +929,6 @@ mrb_block_given_p(mrb_state *mrb) MRB_API mrb_int mrb_get_args(mrb_state *mrb, const char *format, ...) { -#define ADJUST_STACK() do { \ - if (argv_on_stack) { \ - ci = mrb->c->ci; \ - argv = mrb->c->ci->stack + 1; \ - } \ -} while (0) - const char *fmt = format; char c; int i = 0; @@ -1198,7 +1191,6 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) p = va_arg(ap, mrb_float*); if (pickarg) { *p = mrb_as_float(mrb, *pickarg); - ADJUST_STACK(); } } break; @@ -1210,7 +1202,6 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) p = va_arg(ap, mrb_int*); if (pickarg) { *p = mrb_as_int(mrb, *pickarg); - ADJUST_STACK(); } } break; @@ -1373,8 +1364,6 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) finish: va_end(ap); return i; - -#undef ADJUST_STACK } static struct RClass* diff --git a/src/object.c b/src/object.c index 21376d08c..a42293016 100644 --- a/src/object.c +++ b/src/object.c @@ -484,6 +484,17 @@ mrb_obj_is_kind_of(mrb_state *mrb, mrb_value obj, struct RClass *c) return FALSE; } +#ifdef MRB_USE_RATIONAL +// provided by mruby-rational with MRB_USE_RATIONAL +mrb_value mrb_rational_to_i(mrb_state *mrb, mrb_value rat); +mrb_value mrb_rational_to_f(mrb_state *mrb, mrb_value rat); +#endif +#ifdef MRB_USE_COMPLEX +// provided by mruby-complex with MRB_USE_COMPLEX +mrb_value mrb_complex_to_f(mrb_state *mrb, mrb_value comp); +mrb_value mrb_complex_to_i(mrb_state *mrb, mrb_value comp); +#endif + MRB_API mrb_value mrb_ensure_int_type(mrb_state *mrb, mrb_value val) { @@ -492,6 +503,20 @@ mrb_ensure_int_type(mrb_state *mrb, mrb_value val) if (mrb_float_p(val)) { return mrb_float_to_integer(mrb, val); } + else { + switch (mrb_type(val)) { +#ifdef MRB_USE_RATIONAL + case MRB_TT_RATIONAL: + return mrb_rational_to_i(mrb, val); +#endif +#ifdef MRB_USE_COMPLEX + case MRB_TT_COMPLEX: + return mrb_complex_to_i(mrb, val); +#endif + default: + break; + } + } #endif mrb_raisef(mrb, E_TYPE_ERROR, "%Y cannot be converted to Integer", val); } @@ -499,9 +524,6 @@ mrb_ensure_int_type(mrb_state *mrb, mrb_value val) } #ifndef MRB_NO_FLOAT -mrb_value mrb_complex_to_f(mrb_state *mrb, mrb_value comp); // provided by mruby-complex with MRB_USE_COMPLEX -mrb_value mrb_rational_to_f(mrb_state *mrb, mrb_value rat); // provided by mruby-rational with MRB_USE_RATIONAL - MRB_API mrb_value mrb_ensure_float_type(mrb_state *mrb, mrb_value val) { |