diff options
| -rw-r--r-- | mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c | 17 | ||||
| -rw-r--r-- | mrbgems/mruby-complex/src/complex.c | 8 | ||||
| -rw-r--r-- | mrbgems/mruby-rational/src/rational.c | 6 | ||||
| -rw-r--r-- | src/class.c | 11 | ||||
| -rw-r--r-- | src/object.c | 28 |
5 files changed, 47 insertions, 23 deletions
diff --git a/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c b/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c index c3e37e0a6..7732914d7 100644 --- a/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c +++ b/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c @@ -368,16 +368,29 @@ mrb_final_mrbgems(mrb_state *mrb) #endif #ifdef MRB_USE_COMPLEX +mrb_value mrb_complex_to_i(mrb_state *mrb, mrb_value comp) +{ + /* dummy method */ + return mrb_nil_value(); +} mrb_value mrb_complex_to_f(mrb_state *mrb, mrb_value comp) { - mrb_raise(mrb, E_NOTIMP_ERROR, "unavailable for core only"); + /* dummy method */ + return mrb_nil_value(); } #endif #ifdef MRB_USE_RATIONAL mrb_value +mrb_rational_to_i(mrb_state *mrb, mrb_value rat) +{ + /* dummy method */ + return mrb_nil_value(); +} +mrb_value mrb_rational_to_f(mrb_state *mrb, mrb_value rat) { - mrb_raise(mrb, E_NOTIMP_ERROR, "unavailable for core only"); + /* dummy method */ + return mrb_nil_value(); } #endif diff --git a/mrbgems/mruby-complex/src/complex.c b/mrbgems/mruby-complex/src/complex.c index 6a2f5248e..6a02b1e93 100644 --- a/mrbgems/mruby-complex/src/complex.c +++ b/mrbgems/mruby-complex/src/complex.c @@ -117,13 +117,13 @@ mrb_complex_to_f(mrb_state *mrb, mrb_value self) return mrb_float_value(mrb, p->real); } -static mrb_value -complex_to_i(mrb_state *mrb, mrb_value self) +mrb_value +mrb_complex_to_i(mrb_state *mrb, mrb_value self) { struct mrb_complex *p = complex_ptr(mrb, self); if (p->imaginary != 0) { - mrb_raisef(mrb, E_RANGE_ERROR, "can't convert %v into Float", self); + mrb_raisef(mrb, E_RANGE_ERROR, "can't convert %v into Integer", self); } return mrb_int_value(mrb, (mrb_int)p->real); } @@ -416,7 +416,7 @@ void mrb_mruby_complex_gem_init(mrb_state *mrb) mrb_define_method(mrb, comp, "real", complex_real, MRB_ARGS_NONE()); mrb_define_method(mrb, comp, "imaginary", complex_imaginary, MRB_ARGS_NONE()); mrb_define_method(mrb, comp, "to_f", mrb_complex_to_f, MRB_ARGS_NONE()); - mrb_define_method(mrb, comp, "to_i", complex_to_i, MRB_ARGS_NONE()); + mrb_define_method(mrb, comp, "to_i", mrb_complex_to_i, MRB_ARGS_NONE()); mrb_define_method(mrb, comp, "to_c", complex_to_c, MRB_ARGS_NONE()); mrb_define_method(mrb, comp, "+", complex_add, MRB_ARGS_REQ(1)); mrb_define_method(mrb, comp, "-", complex_sub, MRB_ARGS_REQ(1)); diff --git a/mrbgems/mruby-rational/src/rational.c b/mrbgems/mruby-rational/src/rational.c index b12f45bde..e66046543 100644 --- a/mrbgems/mruby-rational/src/rational.c +++ b/mrbgems/mruby-rational/src/rational.c @@ -299,8 +299,8 @@ mrb_rational_to_f(mrb_state *mrb, mrb_value self) } #endif -static mrb_value -rational_to_i(mrb_state *mrb, mrb_value self) +mrb_value +mrb_rational_to_i(mrb_state *mrb, mrb_value self) { struct mrb_rational *p = rational_ptr(mrb, self); if (p->denominator == 0) { @@ -714,7 +714,7 @@ void mrb_mruby_rational_gem_init(mrb_state *mrb) #ifndef MRB_NO_FLOAT mrb_define_method(mrb, rat, "to_f", mrb_rational_to_f, MRB_ARGS_NONE()); #endif - mrb_define_method(mrb, rat, "to_i", rational_to_i, MRB_ARGS_NONE()); + mrb_define_method(mrb, rat, "to_i", mrb_rational_to_i, MRB_ARGS_NONE()); mrb_define_method(mrb, rat, "to_r", rational_to_r, MRB_ARGS_NONE()); mrb_define_method(mrb, rat, "negative?", rational_negative_p, MRB_ARGS_NONE()); mrb_define_method(mrb, rat, "==", rational_eq, MRB_ARGS_REQ(1)); 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) { |