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: avoid mrb_funcall; call functions directly.

Browse Source 
When you try to call functions defined in mrbgems, you need to add the
names of functions to `mrbc.c`, since `mrbc` does not link any mrbgem
regardless of the configuration.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2022-03-12 10:09:30 +09:00
parent b0d6413f2d
commit 7659b3b271
2 changed files with 69 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c
+41 -10
View File
@@ -374,30 +374,61 @@ mrb_final_mrbgems(mrb_state *mrb)
}
#endif
/*
functions defined in mrbgems referenced from the core should be listed here
to avoid link errors, since mrbc does not link any mrbgem ignoring configuration.
*/
#ifdef MRB_USE_COMPLEX
mrb_value mrb_complex_to_i(mrb_state *mrb, mrb_value comp)
mrb_value mrb_complex_new(mrb_state *mrb, mrb_float x, mrb_float y)
{
/* dummy method */
return mrb_nil_value();
}
mrb_value mrb_complex_to_f(mrb_state *mrb, mrb_value comp)
mrb_value mrb_complex_add(mrb_state *mrb, mrb_value x, mrb_value y)
{
return mrb_nil_value();
}
mrb_value mrb_complex_sub(mrb_state *mrb, mrb_value x, mrb_value y)
{
return mrb_nil_value();
}
mrb_value mrb_complex_mul(mrb_state *mrb, mrb_value x, mrb_value y)
{
return mrb_nil_value();
}
mrb_value mrb_complex_to_i(mrb_state *mrb, mrb_value x)
{
return mrb_nil_value();
}
mrb_value mrb_complex_to_f(mrb_state *mrb, mrb_value x)
{
/* dummy method */
return mrb_nil_value();
}
#endif
#ifdef MRB_USE_RATIONAL
mrb_value
mrb_rational_to_i(mrb_state *mrb, mrb_value rat)
mrb_value mrb_rational_new(mrb_state *mrb, mrb_int x, mrb_int y)
{
/* dummy method */
return mrb_nil_value();
}
mrb_value
mrb_rational_to_f(mrb_state *mrb, mrb_value rat)
mrb_value mrb_rational_add(mrb_state *mrb, mrb_value x, mrb_value y)
{
return mrb_nil_value();
}
mrb_value mrb_rational_sub(mrb_state *mrb, mrb_value x, mrb_value y)
{
return mrb_nil_value();
}
mrb_value mrb_rational_mul(mrb_state *mrb, mrb_value x, mrb_value y)
{
return mrb_nil_value();
}
mrb_value mrb_rational_to_i(mrb_state *mrb, mrb_value x)
{
return mrb_nil_value();
}
mrb_value mrb_rational_to_f(mrb_state *mrb, mrb_value x)
{
/* dummy method */
return mrb_nil_value();
}
#endif
src/numeric.c
+28 -11
View File
@@ -20,6 +20,16 @@
#endif
#endif
mrb_value mrb_complex_new(mrb_state *mrb, mrb_float x, mrb_float y);
mrb_value mrb_complex_add(mrb_state *mrb, mrb_value x, mrb_value y);
mrb_value mrb_complex_sub(mrb_state *mrb, mrb_value x, mrb_value y);
mrb_value mrb_complex_mul(mrb_state *mrb, mrb_value x, mrb_value y);
mrb_value mrb_rational_new(mrb_state *mrb, mrb_int x, mrb_int y);
mrb_value mrb_rational_add(mrb_state *mrb, mrb_value x, mrb_value y);
mrb_value mrb_rational_sub(mrb_state *mrb, mrb_value x, mrb_value y);
mrb_value mrb_rational_mul(mrb_state *mrb, mrb_value x, mrb_value y);
static void
int_overflow(mrb_state *mrb, const char *reason)
{
@@ -328,7 +338,7 @@ flo_add(mrb_state *mrb, mrb_value x)
return mrb_float_value(mrb, a + mrb_float(y));
#if defined(MRB_USE_COMPLEX)
case MRB_TT_COMPLEX:
return mrb_funcall_id(mrb, y, MRB_OPSYM(add), 1, x);
return mrb_complex_add(mrb, y, x);
#endif
default:
return mrb_float_value(mrb, a + mrb_as_float(mrb, y));
@@ -355,8 +365,7 @@ flo_sub(mrb_state *mrb, mrb_value x)
return mrb_float_value(mrb, a - mrb_float(y));
#if defined(MRB_USE_COMPLEX)
case MRB_TT_COMPLEX:
x = mrb_funcall_id(mrb, y, MRB_OPSYM(sub), 1, x);
return mrb_funcall_id(mrb, x, MRB_OPSYM(minus), 0);
return mrb_complex_sub(mrb, mrb_complex_new(mrb, a, 0), y);
#endif
default:
return mrb_float_value(mrb, a - mrb_as_float(mrb, y));
@@ -383,7 +392,7 @@ flo_mul(mrb_state *mrb, mrb_value x)
return mrb_float_value(mrb, a * mrb_float(y));
#if defined(MRB_USE_COMPLEX)
case MRB_TT_COMPLEX:
return mrb_funcall_id(mrb, y, MRB_OPSYM(mul), 1, x);
return mrb_complex_mul(mrb, y, x);
#endif
default:
return mrb_float_value(mrb, a * mrb_as_float(mrb, y));
@@ -1008,10 +1017,13 @@ mrb_int_mul(mrb_state *mrb, mrb_value x, mrb_value y)
return mrb_int_value(mrb, c);
}
switch (mrb_type(y)) {
#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
#if defined(MRB_USE_RATIONAL)
case MRB_TT_RATIONAL:
return mrb_rational_mul(mrb, y, x);
#endif
#if defined(MRB_USE_COMPLEX)
case MRB_TT_COMPLEX:
return mrb_funcall_id(mrb, y, MRB_OPSYM(mul), 1, x);
return mrb_complex_mul(mrb, y, x);
#endif
default:
#ifdef MRB_NO_FLOAT
@@ -1425,10 +1437,13 @@ mrb_int_add(mrb_state *mrb, mrb_value x, mrb_value y)
return mrb_int_value(mrb, c);
}
switch (mrb_type(y)) {
#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
#if defined(MRB_USE_RATIONAL)
case MRB_TT_RATIONAL:
return mrb_rational_add(mrb, y, x);
#endif
#if defined(MRB_USE_COMPLEX)
case MRB_TT_COMPLEX:
return mrb_funcall_id(mrb, y, MRB_OPSYM(add), 1, x);
return mrb_complex_add(mrb, y, x);
#endif
default:
#ifdef MRB_NO_FLOAT
@@ -1472,11 +1487,13 @@ mrb_int_sub(mrb_state *mrb, mrb_value x, mrb_value y)
return mrb_int_value(mrb, c);
}
switch (mrb_type(y)) {
#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
#if defined(MRB_USE_RATIONAL)
case MRB_TT_RATIONAL:
return mrb_rational_sub(mrb, mrb_rational_new(mrb, a, 1), y);
#endif
#if defined(MRB_USE_COMPLEX)
case MRB_TT_COMPLEX:
x = mrb_funcall_id(mrb, y, MRB_OPSYM(sub), 1, x);
return mrb_funcall_id(mrb, x, MRB_OPSYM(minus), 0);
return mrb_complex_sub(mrb, mrb_complex_new(mrb, (mrb_float)a, 0), y);
#endif
default:
#ifdef MRB_NO_FLOAT