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

mruby-numeric-ext/numeric.c: Integer#pow fix for 2nd argument type

Browse Source 
`int.pow()` takes 2nd argument only if 1st argument is an integer.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2023-03-29 23:21:35 +09:00
parent f1568af0d2
commit 35cedfb400
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-numeric-ext/src/numeric_ext.c
+16 -9
View File
@@ -59,20 +59,28 @@ mrb_value mrb_int_pow(mrb_state *mrb, mrb_value x, mrb_value y);
static mrb_value
int_powm(mrb_state *mrb, mrb_value x)
{
mrb_value m;
mrb_int e, exp, mod, result = 1;
mrb_value m, e;
mrb_int exp, mod, result = 1;
if (mrb_get_argc(mrb) == 1) {
return mrb_int_pow(mrb, x, mrb_get_arg1(mrb));
}
mrb_get_args(mrb, "io", &e, &m);
if (e < 0) mrb_raise(mrb, E_ARGUMENT_ERROR, "int.pow(n,m): n must be positive");
mrb_get_args(mrb, "oo", &e, &m);
if (!mrb_integer_p(e)
#ifdef MRB_USE_BIGINT
&& !mrb_bigint_p(e)
#endif
) {
mrb_raise(mrb, E_TYPE_ERROR, "int.pow(n,m): 2nd argument not allowed unless 1st argument is an integer");
}
exp = mrb_as_int(mrb, e);
if (exp < 0) mrb_raise(mrb, E_ARGUMENT_ERROR, "int.pow(n,m): n must be positive");
#ifdef MRB_USE_BIGINT
if (mrb_bigint_p(x)) {
return mrb_bint_powm(mrb, x, e, m);
return mrb_bint_powm(mrb, x, exp, m);
}
if (mrb_bigint_p(m)) {
return mrb_bint_powm(mrb, mrb_bint_new_int(mrb, mrb_integer(x)), e, m);
return mrb_bint_powm(mrb, mrb_bint_new_int(mrb, mrb_integer(x)), exp, m);
}
#endif
if (!mrb_integer_p(m)) mrb_raise(mrb, E_TYPE_ERROR, "int.pow(n,m): m must be integer");
@@ -81,7 +89,6 @@ int_powm(mrb_state *mrb, mrb_value x)
if (mod == 0) mrb_int_zerodiv(mrb);
if (mod == 1) return mrb_fixnum_value(0);
mrb_int base = mrb_integer(x);
exp = e;
for (;;) {
mrb_int tmp;
if (exp & 1) {
@@ -89,7 +96,7 @@ int_powm(mrb_state *mrb, mrb_value x)
result %= mod; base %= mod;
if (mrb_int_mul_overflow(result, base, &tmp)) {
#ifdef MRB_USE_BIGINT
return mrb_bint_powm(mrb, mrb_bint_new_int(mrb, mrb_integer(x)), e, m);
return mrb_bint_powm(mrb, mrb_bint_new_int(mrb, mrb_integer(x)), mrb_integer(e), m);
#else
mrb_int_overflow(mrb, "pow");
#endif
@@ -103,7 +110,7 @@ int_powm(mrb_state *mrb, mrb_value x)
base %= mod;
if (mrb_int_mul_overflow(base, base, &tmp)) {
#ifdef MRB_USE_BIGINT
return mrb_bint_powm(mrb, mrb_bint_new_int(mrb, mrb_integer(x)), e, m);
return mrb_bint_powm(mrb, mrb_bint_new_int(mrb, mrb_integer(x)), mrb_integer(e), m);
#else
mrb_int_overflow(mrb, "pow");
#endif