numops.c: separate API functions not used from mruby.

* mrb_num_plus()
* mrb_num_minus()
* mrb_num_mul()
This commit is contained in:
Yukihiro "Matz" Matsumoto
2022-03-12 08:47:48 +09:00
parent 5636e6ab54
commit a20064bcb7
2 changed files with 95 additions and 72 deletions
-72
View File
@@ -1022,30 +1022,6 @@ mrb_int_mul(mrb_state *mrb, mrb_value x, mrb_value y)
}
}
MRB_API mrb_value
mrb_num_mul(mrb_state *mrb, mrb_value x, mrb_value y)
{
if (mrb_integer_p(x)) {
return mrb_int_mul(mrb, x, y);
}
#ifndef MRB_NO_FLOAT
if (mrb_float_p(x)) {
return mrb_float_value(mrb, mrb_float(x) * mrb_as_float(mrb, y));
}
#endif
#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
switch (mrb_type(x)) {
case MRB_TT_RATIONAL:
case MRB_TT_COMPLEX:
return mrb_funcall_id(mrb, x, MRB_OPSYM(mul), 1, y);
default:
break;
}
#endif
mrb_raise(mrb, E_TYPE_ERROR, "no number multiply");
return mrb_nil_value(); /* not reached */
}
/* 15.2.8.3.3 */
/*
* call-seq:
@@ -1463,30 +1439,6 @@ mrb_int_add(mrb_state *mrb, mrb_value x, mrb_value y)
}
}
MRB_API mrb_value
mrb_num_plus(mrb_state *mrb, mrb_value x, mrb_value y)
{
if (mrb_integer_p(x)) {
return mrb_int_add(mrb, x, y);
}
#ifndef MRB_NO_FLOAT
if (mrb_float_p(x)) {
return mrb_float_value(mrb, mrb_float(x) + mrb_as_float(mrb, y));
}
#endif
#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
switch (mrb_type(x)) {
case MRB_TT_RATIONAL:
case MRB_TT_COMPLEX:
return mrb_funcall_id(mrb, x, MRB_OPSYM(add), 1, y);
default:
break;
}
#endif
mrb_raise(mrb, E_TYPE_ERROR, "no number addition");
return mrb_nil_value(); /* not reached */
}
/* 15.2.8.3.1 */
/*
* call-seq:
@@ -1535,30 +1487,6 @@ mrb_int_sub(mrb_state *mrb, mrb_value x, mrb_value y)
}
}
MRB_API mrb_value
mrb_num_minus(mrb_state *mrb, mrb_value x, mrb_value y)
{
if (mrb_integer_p(x)) {
return mrb_int_sub(mrb, x, y);
}
#ifndef MRB_NO_FLOAT
if (mrb_float_p(x)) {
return mrb_float_value(mrb, mrb_float(x) - mrb_as_float(mrb, y));
}
#endif
#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
switch (mrb_type(x)) {
case MRB_TT_RATIONAL:
case MRB_TT_COMPLEX:
return mrb_funcall_id(mrb, x, MRB_OPSYM(sub), 1, y);
default:
break;
}
#endif
mrb_raise(mrb, E_TYPE_ERROR, "no number subtraction");
return mrb_nil_value(); /* not reached */
}
/* 15.2.8.3.2 */
/* 15.2.8.3.16 */
/*
+95
View File
@@ -0,0 +1,95 @@
/*
** numeric.c - Numeric, Integer, Float class
**
** See Copyright Notice in mruby.h
*/
#include <mruby.h>
#include <mruby/numeric.h>
#include <mruby/presym.h>
mrb_value mrb_int_add(mrb_state *mrb, mrb_value x, mrb_value y);
mrb_value mrb_int_sub(mrb_state *mrb, mrb_value x, mrb_value y);
mrb_value mrb_int_mul(mrb_state *mrb, mrb_value x, mrb_value y);
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);
MRB_API mrb_value
mrb_num_plus(mrb_state *mrb, mrb_value x, mrb_value y)
{
if (mrb_integer_p(x)) {
return mrb_int_add(mrb, x, y);
}
#ifndef MRB_NO_FLOAT
if (mrb_float_p(x)) {
return mrb_float_value(mrb, mrb_float(x) + mrb_as_float(mrb, y));
}
#endif
#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
switch (mrb_type(x)) {
case MRB_TT_RATIONAL:
case MRB_TT_COMPLEX:
return mrb_funcall_id(mrb, x, MRB_OPSYM(add), 1, y);
default:
break;
}
#endif
mrb_raise(mrb, E_TYPE_ERROR, "no number addition");
return mrb_nil_value(); /* not reached */
}
MRB_API mrb_value
mrb_num_minus(mrb_state *mrb, mrb_value x, mrb_value y)
{
if (mrb_integer_p(x)) {
return mrb_int_sub(mrb, x, y);
}
#ifndef MRB_NO_FLOAT
if (mrb_float_p(x)) {
return mrb_float_value(mrb, mrb_float(x) - mrb_as_float(mrb, y));
}
#endif
#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
switch (mrb_type(x)) {
case MRB_TT_RATIONAL:
case MRB_TT_COMPLEX:
return mrb_funcall_id(mrb, x, MRB_OPSYM(sub), 1, y);
default:
break;
}
#endif
mrb_raise(mrb, E_TYPE_ERROR, "no number subtraction");
return mrb_nil_value(); /* not reached */
}
MRB_API mrb_value
mrb_num_mul(mrb_state *mrb, mrb_value x, mrb_value y)
{
if (mrb_integer_p(x)) {
return mrb_int_mul(mrb, x, y);
}
#ifndef MRB_NO_FLOAT
if (mrb_float_p(x)) {
return mrb_float_value(mrb, mrb_float(x) * mrb_as_float(mrb, y));
}
#endif
#if defined(MRB_USE_RATIONAL) || defined(MRB_USE_COMPLEX)
switch (mrb_type(x)) {
case MRB_TT_RATIONAL:
case MRB_TT_COMPLEX:
return mrb_funcall_id(mrb, x, MRB_OPSYM(mul), 1, y);
default:
break;
}
#endif
mrb_raise(mrb, E_TYPE_ERROR, "no number multiply");
return mrb_nil_value(); /* not reached */
}