admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

numeric.c: enhance float division to support Complex.

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2022-03-18 14:23:17 +09:00
parent e45081d310
commit 4f869f3367
2 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-complex/src/complex.c
-20
View File
@@ -348,24 +348,6 @@ complex_div(mrb_state *mrb, mrb_value x)
return mrb_complex_div(mrb, x, y);
}
static mrb_value
complex_float_div(mrb_state *mrb, mrb_value x)
{
mrb_float a = mrb_float(x);
mrb_value y = mrb_get_arg1(mrb);
switch(mrb_type(y)) {
case MRB_TT_COMPLEX:
return complex_div(mrb, complex_new(mrb, a, 0));
case MRB_TT_FLOAT:
a = mrb_div_float(a, mrb_float(y));
return mrb_float_value(mrb, a);
default:
a = mrb_div_float(a, mrb_as_float(mrb, y));
return mrb_float_value(mrb, a);
}
}
void mrb_mruby_complex_gem_init(mrb_state *mrb)
{
struct RClass *comp;
@@ -392,8 +374,6 @@ void mrb_mruby_complex_gem_init(mrb_state *mrb)
mrb_define_method(mrb, comp, "/", complex_div, MRB_ARGS_REQ(1));
mrb_define_method(mrb, comp, "quo", complex_div, MRB_ARGS_REQ(1));
mrb_define_method(mrb, comp, "==", complex_eq, MRB_ARGS_REQ(1));
mrb_define_method(mrb, mrb->float_class, "/", complex_float_div, MRB_ARGS_REQ(1)); /* override */
mrb_define_method(mrb, mrb->float_class, "quo", complex_float_div, MRB_ARGS_REQ(1)); /* override */
}
void
src/numeric.c
+9 -3
View File
@@ -286,11 +286,17 @@ flo_div(mrb_state *mrb, mrb_value x)
mrb_value y = mrb_get_arg1(mrb);
mrb_float a = mrb_float(x);
if (mrb_float_p(y)) {
switch(mrb_type(y)) {
#ifdef MRB_USE_COMPLEX
case MRB_TT_COMPLEX:
return mrb_complex_div(mrb, mrb_complex_new(mrb, a, 0), y);
#endif
case MRB_TT_FLOAT:
a = mrb_div_float(a, mrb_float(y));
}
else {
return mrb_float_value(mrb, a);
default:
a = mrb_div_float(a, mrb_as_float(mrb, y));
return mrb_float_value(mrb, a);
}
return mrb_float_value(mrb, a);
}