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-bigint: remove special handling of Float in bitwise operations

Browse Source 
CRuby raises TypeError with float numbers as operands; ref #6314
This commit is contained in:
Yukihiro "Matz" Matsumoto
2024-07-24 12:49:26 +09:00
parent 81a9eef591
commit c16aba9280
1 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-bigint/core/bigint.c
+11 -27
View File
@@ -1507,15 +1507,6 @@ mrb_bint_and(mrb_state *mrb, mrb_value x, mrb_value y)
struct RBigint *b1 = RBIGINT(x);
struct RBigint *b3 = bint_new(mrb);
#ifndef MRB_NO_FLOAT
if (mrb_float_p(y)) {
mpz_t z;
mpz_init_set_int(mrb, &z, (mrb_int)mrb_float(y));
mpz_and(mrb, &b3->mp, &b1->mp, &z);
mpz_clear(mrb, &z);
return bint_norm(mrb, b3);
}
#endif
y = mrb_as_bint(mrb, y);
struct RBigint *b2 = RBIGINT(y);
mpz_and(mrb, &b3->mp, &b1->mp, &b2->mp);
@@ -1528,36 +1519,29 @@ mrb_bint_or(mrb_state *mrb, mrb_value x, mrb_value y)
struct RBigint *b1 = RBIGINT(x);
struct RBigint *b3 = bint_new(mrb);
#ifndef MRB_NO_FLOAT
if (mrb_float_p(y)) {
mpz_t z;
mpz_init_set_int(mrb, &z, (mrb_int)mrb_float(y));
mpz_or(mrb, &b3->mp, &b1->mp, &z);
mpz_clear(mrb, &z);
return bint_norm(mrb, b3);
}
#endif
y = mrb_as_bint(mrb, y);
struct RBigint *b2 = RBIGINT(y);
mpz_or(mrb, &b3->mp, &b1->mp, &b2->mp);
return bint_norm(mrb, b3);
}
mrb_value
mrb_bint_neg(mrb_state *mrb, mrb_value x)
{
struct RBigint *b1 = RBIGINT(x);
struct RBigint *b2 = bint_new(mrb);
mpz_neg(mrb, &b2->mp, &b1->mp);
/* no normalization */
return mrb_obj_value(b2);
}
mrb_value
mrb_bint_xor(mrb_state *mrb, mrb_value x, mrb_value y)
{
struct RBigint *b3 = bint_new(mrb);
struct RBigint *b1 = RBIGINT(x);
#ifndef MRB_NO_FLOAT
if (mrb_float_p(y)) {
mpz_t z;
mpz_init_set_int(mrb, &z, (mrb_int)mrb_float(y));
mpz_xor(mrb, &b3->mp, &b1->mp, &z);
mpz_clear(mrb, &z);
return bint_norm(mrb, b3);
}
#endif
y = mrb_as_bint(mrb, y);
struct RBigint *b2 = RBIGINT(y);
mpz_xor(mrb, &b3->mp, &b1->mp, &b2->mp);