1 files changed, 120 insertions, 11 deletions

diff --git a/mrbgems/mruby-numeric-ext/src/numeric_ext.c b/mrbgems/mruby-numeric-ext/src/numeric_ext.c
index 22c1668fa..2f2a6c755 100644
--- a/mrbgems/mruby-numeric-ext/src/numeric_ext.c
+++ b/mrbgems/mruby-numeric-ext/src/numeric_ext.c
@@ -1,27 +1,136 @@
-#include <limits.h>
-#include "mruby.h"
+#include <mruby.h>
+#include <mruby/numeric.h>
+#include <mruby/presym.h>
 
+/*
+ *  call-seq:
+ *     int.allbits?(mask)  ->  true or false
+ *
+ *  Returns +true+ if all bits of <code>+int+ & +mask+</code> are 1.
+ */
 static mrb_value
-mrb_int_chr(mrb_state *mrb, mrb_value x)
+int_allbits(mrb_state *mrb, mrb_value self)
 {
-  mrb_int chr;
-  char c;
+  mrb_int n, m;
 
-  chr = mrb_fixnum(x);
-  if (chr >= (1 << CHAR_BIT)) {
-    mrb_raisef(mrb, E_RANGE_ERROR, "%S out of char range", x);
+  mrb_get_args(mrb, "i", &m);
+  n = mrb_integer(self);
+  return mrb_bool_value((n & m) == m);
+}
+
+/*
+ *  call-seq:
+ *     int.anybits?(mask)  ->  true or false
+ *
+ *  Returns +true+ if any bits of <code>+int+ & +mask+</code> are 1.
+ */
+static mrb_value
+int_anybits(mrb_state *mrb, mrb_value self)
+{
+  mrb_int n, m;
+
+  mrb_get_args(mrb, "i", &m);
+  n = mrb_integer(self);
+  return mrb_bool_value((n & m) != 0);
+}
+
+/*
+ *  call-seq:
+ *     int.nobits?(mask)  ->  true or false
+ *
+ *  Returns +true+ if no bits of <code>+int+ & +mask+</code> are 1.
+ */
+static mrb_value
+int_nobits(mrb_state *mrb, mrb_value self)
+{
+  mrb_int n, m;
+
+  mrb_get_args(mrb, "i", &m);
+  n = mrb_integer(self);
+  return mrb_bool_value((n & m) == 0);
+}
+
+static void
+zerodiv(mrb_state *mrb)
+{
+  mrb_raise(mrb, E_ZERODIV_ERROR, "divided by 0");
+}
+
+/*
+ *  call-seq:
+ *     num.remainder(numeric)  ->  real
+ *
+ *  <code>x.remainder(y)</code> means <code>x-y*(x/y).truncate</code>.
+ *
+ *  See Numeric#divmod.
+ */
+static mrb_value
+int_remainder(mrb_state *mrb, mrb_value x)
+{
+  mrb_value y = mrb_get_arg1(mrb);
+  mrb_int a, b;
+
+  a = mrb_integer(x);
+  if (mrb_integer_p(y)) {
+    b = mrb_integer(y);
+    if (b == 0) zerodiv(mrb);
+    if (a == MRB_INT_MIN && b == -1) return mrb_fixnum_value(0);
+    return mrb_int_value(mrb, a % b);
   }
-  c = (char)chr;
+#ifdef MRB_NO_FLOAT
+  mrb_raise(mrb, E_TYPE_ERROR, "non integer remainder");
+#else
+  mrb_float n = (mrb_float)a;
+  mrb_float m = mrb_as_float(mrb, y);
 
-  return mrb_str_new(mrb, &c, 1);
+  if (isinf(m)) return mrb_float_value(mrb, n);
+  return mrb_float_value(mrb, n-m*trunc(n/m));
+#endif
 }
 
+#ifndef MRB_NO_FLOAT
+static mrb_value
+flo_remainder(mrb_state *mrb, mrb_value self)
+{
+  mrb_float a, b;
+
+  a = mrb_float(self);
+  mrb_get_args(mrb, "f", &b);
+  if (b == 0) zerodiv(mrb);
+  if (isinf(b)) return mrb_float_value(mrb, a);
+  return mrb_float_value(mrb, a-b*trunc(a/b));
+}
+#endif
+
 void
 mrb_mruby_numeric_ext_gem_init(mrb_state* mrb)
 {
   struct RClass *i = mrb_class_get(mrb, "Integer");
 
-  mrb_define_method(mrb, i, "chr", mrb_int_chr, MRB_ARGS_NONE());
+  mrb_define_method(mrb, i, "allbits?", int_allbits, MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, i, "anybits?", int_anybits, MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, i, "nobits?", int_nobits, MRB_ARGS_REQ(1));
+
+  mrb_define_alias(mrb, i, "modulo", "%");
+  mrb_define_method(mrb, i, "remainder", int_remainder, MRB_ARGS_REQ(1));
+
+#ifndef MRB_NO_FLOAT
+  struct RClass *f = mrb_class_get(mrb, "Float");
+
+  mrb_define_alias(mrb, f, "modulo", "%");
+  mrb_define_method(mrb, f, "remainder", flo_remainder, MRB_ARGS_REQ(1));
+
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(RADIX),        mrb_fixnum_value(MRB_FLT_RADIX));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(MANT_DIG),     mrb_fixnum_value(MRB_FLT_MANT_DIG));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(EPSILON),      mrb_float_value(mrb, MRB_FLT_EPSILON));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(DIG),          mrb_fixnum_value(MRB_FLT_DIG));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(MIN_EXP),      mrb_fixnum_value(MRB_FLT_MIN_EXP));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(MIN),          mrb_float_value(mrb, MRB_FLT_MIN));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(MIN_10_EXP),   mrb_fixnum_value(MRB_FLT_MIN_10_EXP));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(MAX_EXP),      mrb_fixnum_value(MRB_FLT_MAX_EXP));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(MAX),          mrb_float_value(mrb, MRB_FLT_MAX));
+  mrb_define_const_id(mrb, mrb->float_class, MRB_SYM(MAX_10_EXP),   mrb_fixnum_value(MRB_FLT_MAX_10_EXP));
+#endif /* MRB_NO_FLOAT */
 }
 
 void