summaryrefslogtreecommitdiff
path: root/numeric.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-01-20 04:59:39 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-01-20 04:59:39 +0000
commit62e648e148b3cb9f96dcce808c55c02b7ccb4486 (patch)
tree9708892ece92e860d81559ab55e6b1f9400d7ffc /numeric.c
parentaeb049c573be4dc24dd20650f40e4777e0f698cf (diff)
ruby 1.3 cycle
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/RUBY@372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'numeric.c')
-rw-r--r--numeric.c1066
1 files changed, 693 insertions, 373 deletions
diff --git a/numeric.c b/numeric.c
index b0d5f7f522c..e8ea6075a90 100644
--- a/numeric.c
+++ b/numeric.c
@@ -6,58 +6,95 @@
$Date$
created at: Fri Aug 13 18:33:09 JST 1993
- Copyright (C) 1993-1996 Yukihiro Matsumoto
+ Copyright (C) 1993-1998 Yukihiro Matsumoto
************************************************/
#include "ruby.h"
#include <math.h>
+#include <stdio.h>
static ID coerce;
static ID to_i;
-VALUE cNumeric;
-VALUE cFloat;
-VALUE cInteger;
-VALUE cFixnum;
+VALUE rb_cNumeric;
+VALUE rb_cFloat;
+VALUE rb_cInteger;
+VALUE rb_cFixnum;
-VALUE eZeroDiv;
+VALUE rb_eZeroDiv;
ID rb_frame_last_func();
-VALUE float_new();
-double big2dbl();
+VALUE rb_float_new();
+double rb_big2dbl();
void
-num_zerodiv()
+rb_num_zerodiv()
{
- Raise(eZeroDiv, "divided by 0");
+ rb_raise(rb_eZeroDiv, "divided by 0");
}
static VALUE
num_coerce(x, y)
VALUE x, y;
{
- return assoc_new(rb_Float(x),rb_Float(y));
+ if (CLASS_OF(x) == CLASS_OF(y))
+ return rb_assoc_new(x, y);
+ return rb_assoc_new(rb_Float(x), rb_Float(y));
}
-VALUE
-num_coerce_bin(x, y)
- VALUE x, y;
+static VALUE
+coerce_body(x)
+ VALUE *x;
+{
+ return rb_funcall(x[1], coerce, 1, x[0]);
+}
+
+static VALUE
+coerce_rescue(x)
+ VALUE *x;
+{
+ rb_raise(rb_eTypeError, "%s can't be coerced into %s",
+ rb_special_const_p(x[1])?
+ STR2CSTR(rb_inspect(x[1])):
+ rb_class2name(CLASS_OF(x[1])),
+ rb_class2name(CLASS_OF(x[0])));
+}
+
+static void
+do_coerce(x, y)
+ VALUE *x, *y;
{
VALUE ary;
+ VALUE a[2];
- ary = rb_funcall(y, coerce, 1, x);
+ a[0] = *x; a[1] = *y;
+ ary = rb_rescue(coerce_body, (VALUE)a, coerce_rescue, (VALUE)a);
if (TYPE(ary) != T_ARRAY || RARRAY(ary)->len != 2) {
- TypeError("coerce must return [x, y]");
+ rb_raise(rb_eTypeError, "coerce must return [x, y]");
}
- x = RARRAY(ary)->ptr[0];
- y = RARRAY(ary)->ptr[1];
+ *x = RARRAY(ary)->ptr[0];
+ *y = RARRAY(ary)->ptr[1];
+}
+VALUE
+rb_num_coerce_bin(x, y)
+ VALUE x, y;
+{
+ do_coerce(&x, &y);
return rb_funcall(x, rb_frame_last_func(), 1, y);
}
static VALUE
+num_clone(x)
+ VALUE x;
+{
+ /* Numerics are immutable values, which need not to copy */
+ return x;
+}
+
+static VALUE
num_uplus(num)
VALUE num;
{
@@ -68,17 +105,12 @@ static VALUE
num_uminus(num)
VALUE num;
{
- VALUE ary, x, y;
+ VALUE zero;
- ary = rb_funcall(num, coerce, 1, INT2FIX(0));
- if (TYPE(ary) != T_ARRAY || RARRAY(ary)->len != 2) {
- TypeError("coerce must return [x, y]");
- }
-
- x = RARRAY(ary)->ptr[0];
- y = RARRAY(ary)->ptr[1];
+ zero = INT2FIX(0);
+ do_coerce(&zero, &num);
- return rb_funcall(x, '-', 1, y);
+ return rb_funcall(zero, '-', 1, num);
}
static VALUE
@@ -92,49 +124,56 @@ num_divmod(x, y)
double d = floor(RFLOAT(div)->value);
if (RFLOAT(div)->value > d) {
- div = float_new(d);
+ div = rb_float_new(d);
}
}
mod = rb_funcall(x, '%', 1, y);
- return assoc_new(div, mod);
+ return rb_assoc_new(div, mod);
}
static VALUE
num_int_p(num)
VALUE num;
{
- return FALSE;
+ return Qfalse;
}
static VALUE
-num_chr(num)
+num_abs(num)
VALUE num;
{
- char c;
- INT i = NUM2INT(num);
+ if (RTEST(rb_funcall(num, '<', 1, INT2FIX(0)))) {
+ return rb_funcall(num, rb_intern("-@"), 0);
+ }
+ return num;
+}
- if (i < 0 || 0xff < i)
- Fail("%d out of char range", i);
- c = i;
- return str_new(&c, 1);
+static VALUE
+num_zero_p(num)
+ VALUE num;
+{
+ if (RTEST(rb_equal(num, INT2FIX(0)))) {
+ return Qtrue;
+ }
+ return Qfalse;
}
static VALUE
-num_abs(num)
+num_nonzero_p(num)
VALUE num;
{
- if (RTEST(rb_funcall(num, '<', 1, INT2FIX(0)))) {
- return rb_funcall(num, rb_intern("-@"), 0);
+ if (RTEST(rb_funcall(num, rb_intern("zero?"), 0, 0))) {
+ return Qfalse;
}
return num;
}
VALUE
-float_new(d)
+rb_float_new(d)
double d;
{
NEWOBJ(flt, struct RFloat);
- OBJSETUP(flt, cFloat, T_FLOAT);
+ OBJSETUP(flt, rb_cFloat, T_FLOAT);
flt->value = d;
return (VALUE)flt;
@@ -160,21 +199,21 @@ flo_to_s(flt)
}
}
- return str_new2(buf);
+ return rb_str_new2(buf);
}
static VALUE
flo_coerce(x, y)
VALUE x, y;
{
- return assoc_new(rb_Float(y), x);
+ return rb_assoc_new(rb_Float(y), x);
}
static VALUE
flo_uminus(flt)
VALUE flt;
{
- return float_new(-RFLOAT(flt)->value);
+ return rb_float_new(-RFLOAT(flt)->value);
}
static VALUE
@@ -183,15 +222,13 @@ flo_plus(x, y)
{
switch (TYPE(y)) {
case T_FIXNUM:
- return float_new(RFLOAT(x)->value + (double)FIX2INT(y));
+ return rb_float_new(RFLOAT(x)->value + (double)FIX2LONG(y));
case T_BIGNUM:
- return float_new(RFLOAT(x)->value + big2dbl(y));
+ return rb_float_new(RFLOAT(x)->value + rb_big2dbl(y));
case T_FLOAT:
- return float_new(RFLOAT(x)->value + RFLOAT(y)->value);
- case T_STRING:
- return str_plus(obj_as_string(x), y);
+ return rb_float_new(RFLOAT(x)->value + RFLOAT(y)->value);
default:
- return num_coerce_bin(x, y);
+ return rb_num_coerce_bin(x, y);
}
}
@@ -201,13 +238,13 @@ flo_minus(x, y)
{
switch (TYPE(y)) {
case T_FIXNUM:
- return float_new(RFLOAT(x)->value - (double)FIX2INT(y));
+ return rb_float_new(RFLOAT(x)->value - (double)FIX2LONG(y));
case T_BIGNUM:
- return float_new(RFLOAT(x)->value - big2dbl(y));
+ return rb_float_new(RFLOAT(x)->value - rb_big2dbl(y));
case T_FLOAT:
- return float_new(RFLOAT(x)->value - RFLOAT(y)->value);
+ return rb_float_new(RFLOAT(x)->value - RFLOAT(y)->value);
default:
- return num_coerce_bin(x, y);
+ return rb_num_coerce_bin(x, y);
}
}
@@ -217,15 +254,13 @@ flo_mul(x, y)
{
switch (TYPE(y)) {
case T_FIXNUM:
- return float_new(RFLOAT(x)->value * (double)FIX2INT(y));
+ return rb_float_new(RFLOAT(x)->value * (double)FIX2LONG(y));
case T_BIGNUM:
- return float_new(RFLOAT(x)->value * big2dbl(y));
+ return rb_float_new(RFLOAT(x)->value * rb_big2dbl(y));
case T_FLOAT:
- return float_new(RFLOAT(x)->value * RFLOAT(y)->value);
- case T_STRING:
- return str_times(y, INT2FIX((int)RFLOAT(x)->value));
+ return rb_float_new(RFLOAT(x)->value * RFLOAT(y)->value);
default:
- return num_coerce_bin(x, y);
+ return rb_num_coerce_bin(x, y);
}
}
@@ -233,73 +268,92 @@ static VALUE
flo_div(x, y)
VALUE x, y;
{
- INT f_y;
+ long f_y;
double d;
switch (TYPE(y)) {
case T_FIXNUM:
- f_y = FIX2INT(y);
- if (f_y == 0) num_zerodiv();
- return float_new(RFLOAT(x)->value / (double)f_y);
+ f_y = FIX2LONG(y);
+ if (f_y == 0) rb_num_zerodiv();
+ return rb_float_new(RFLOAT(x)->value / (double)f_y);
case T_BIGNUM:
- d = big2dbl(y);
- if (d == 0.0) num_zerodiv();
- return float_new(RFLOAT(x)->value / d);
+ d = rb_big2dbl(y);
+ if (d == 0.0) rb_num_zerodiv();
+ return rb_float_new(RFLOAT(x)->value / d);
case T_FLOAT:
- if (RFLOAT(y)->value == 0.0) num_zerodiv();
- return float_new(RFLOAT(x)->value / RFLOAT(y)->value);
+ if (RFLOAT(y)->value == 0.0) rb_num_zerodiv();
+ return rb_float_new(RFLOAT(x)->value / RFLOAT(y)->value);
default:
- return num_coerce_bin(x, y);
+ return rb_num_coerce_bin(x, y);
}
}
static VALUE
-flo_mod(x, y)
+flo_modulo(x, y, modulo)
VALUE x, y;
+ int modulo;
{
- double value;
+ double value, result;
switch (TYPE(y)) {
case T_FIXNUM:
- value = (double)FIX2INT(y);
+ value = (double)FIX2LONG(y);
break;
case T_BIGNUM:
- value = big2dbl(y);
+ value = rb_big2dbl(y);
break;
case T_FLOAT:
value = RFLOAT(y)->value;
break;
default:
- return num_coerce_bin(x, y);
+ return rb_num_coerce_bin(x, y);
}
+
#ifdef HAVE_FMOD
- value = fmod(RFLOAT(x)->value, value);
+ result = fmod(RFLOAT(x)->value, value);
#else
{
double value1 = RFLOAT(x)->value;
double value2;
modf(value1/value, &value2);
- value = value1 - value2 * value;
+ result = value1 - value2 * value;
}
#endif
+ if (modulo &&
+ (RFLOAT(x)->value < 0.0) != (result < 0.0) && result != 0.0) {
+ result += value;
+ }
+ return rb_float_new(result);
+}
- return float_new(value);
+static VALUE
+flo_mod(x, y)
+ VALUE x, y;
+{
+ return flo_modulo(x,y,1);
}
-VALUE
+static VALUE
+flo_remainder(x, y)
+ VALUE x, y;
+{
+ return flo_modulo(x,y,0);
+}
+
+static VALUE
flo_pow(x, y)
VALUE x, y;
{
switch (TYPE(y)) {
case T_FIXNUM:
- return float_new(pow(RFLOAT(x)->value, (double)FIX2INT(y)));
+ return rb_float_new(pow(RFLOAT(x)->value, (double)FIX2LONG(y)));
case T_BIGNUM:
- return float_new(pow(RFLOAT(x)->value, big2dbl(y)));
+ return rb_float_new(pow(RFLOAT(x)->value, rb_big2dbl(y)));
case T_FLOAT:
- return float_new(pow(RFLOAT(x)->value, RFLOAT(y)->value));
+ return rb_float_new(pow(RFLOAT(x)->value, RFLOAT(y)->value));
default:
- return num_coerce_bin(x, y);
+ return rb_num_coerce_bin(x, y);
}
}
@@ -307,7 +361,7 @@ static VALUE
num_eql(x, y)
VALUE x, y;
{
- if (TYPE(x) != TYPE(y)) return FALSE;
+ if (TYPE(x) != TYPE(y)) return Qfalse;
return rb_equal(x, y);
}
@@ -326,12 +380,12 @@ flo_eq(x, y)
{
switch (TYPE(y)) {
case T_FIXNUM:
- if (RFLOAT(x)->value == FIX2INT(y)) return TRUE;
- return FALSE;
+ if (RFLOAT(x)->value == FIX2LONG(y)) return Qtrue;
+ return Qfalse;
case T_BIGNUM:
- return (RFLOAT(x)->value == big2dbl(y))?TRUE:FALSE;
+ return (RFLOAT(x)->value == rb_big2dbl(y))?Qtrue:Qfalse;
case T_FLOAT:
- return (RFLOAT(x)->value == RFLOAT(y)->value)?TRUE:FALSE;
+ return (RFLOAT(x)->value == RFLOAT(y)->value)?Qtrue:Qfalse;
default:
return num_equal(x, y);
}
@@ -363,11 +417,11 @@ flo_cmp(x, y)
a = RFLOAT(x)->value;
switch (TYPE(y)) {
case T_FIXNUM:
- b = (double)FIX2INT(y);
+ b = (double)FIX2LONG(y);
break;
case T_BIGNUM:
- b = big2dbl(y);
+ b = rb_big2dbl(y);
break;
case T_FLOAT:
@@ -375,7 +429,7 @@ flo_cmp(x, y)
break;
default:
- return num_coerce_bin(x, y);
+ return rb_num_coerce_bin(x, y);
}
if (a == b) return INT2FIX(0);
if (a > b) return INT2FIX(1);
@@ -383,13 +437,117 @@ flo_cmp(x, y)
}
static VALUE
+flo_gt(x, y)
+ VALUE x, y;
+{
+ double a, b;
+
+ a = RFLOAT(x)->value;
+ switch (TYPE(y)) {
+ case T_FIXNUM:
+ b = (double)FIX2LONG(y);
+ break;
+
+ case T_BIGNUM:
+ b = rb_big2dbl(y);
+ break;
+
+ case T_FLOAT:
+ b = RFLOAT(y)->value;
+ break;
+
+ default:
+ return rb_num_coerce_bin(x, y);
+ }
+ return (a > b)?Qtrue:Qfalse;
+}
+
+static VALUE
+flo_ge(x, y)
+ VALUE x, y;
+{
+ double a, b;
+
+ a = RFLOAT(x)->value;
+ switch (TYPE(y)) {
+ case T_FIXNUM:
+ b = (double)FIX2LONG(y);
+ break;
+
+ case T_BIGNUM:
+ b = rb_big2dbl(y);
+ break;
+
+ case T_FLOAT:
+ b = RFLOAT(y)->value;
+ break;
+
+ default:
+ return rb_num_coerce_bin(x, y);
+ }
+ return (a >= b)?Qtrue:Qfalse;
+}
+
+static VALUE
+flo_lt(x, y)
+ VALUE x, y;
+{
+ double a, b;
+
+ a = RFLOAT(x)->value;
+ switch (TYPE(y)) {
+ case T_FIXNUM:
+ b = (double)FIX2LONG(y);
+ break;
+
+ case T_BIGNUM:
+ b = rb_big2dbl(y);
+ break;
+
+ case T_FLOAT:
+ b = RFLOAT(y)->value;
+ break;
+
+ default:
+ return rb_num_coerce_bin(x, y);
+ }
+ return (a < b)?Qtrue:Qfalse;
+}
+
+static VALUE
+flo_le(x, y)
+ VALUE x, y;
+{
+ double a, b;
+
+ a = RFLOAT(x)->value;
+ switch (TYPE(y)) {
+ case T_FIXNUM:
+ b = (double)FIX2LONG(y);
+ break;
+
+ case T_BIGNUM:
+ b = rb_big2dbl(y);
+ break;
+
+ case T_FLOAT:
+ b = RFLOAT(y)->value;
+ break;
+
+ default:
+ return rb_num_coerce_bin(x, y);
+ }
+ return (a <= b)?Qtrue:Qfalse;
+}
+
+static VALUE
flo_eql(x, y)
VALUE x, y;
{
if (TYPE(y) == T_FLOAT) {
- if (RFLOAT(x)->value == RFLOAT(y)->value) return TRUE;
+ if (RFLOAT(x)->value == RFLOAT(y)->value) return Qtrue;
}
- return FALSE;
+ return Qfalse;
}
static VALUE
@@ -397,10 +555,55 @@ flo_to_i(num)
VALUE num;
{
double f = RFLOAT(num)->value;
- INT val;
+ long val;
+
+ if (!FIXABLE(f)) {
+ return rb_dbl2big(f);
+ }
+ val = f;
+ return INT2FIX(val);
+}
+
+static VALUE
+flo_floor(num)
+ VALUE num;
+{
+ double f = floor(RFLOAT(num)->value);
+ long val;
+
+ if (!FIXABLE(f)) {
+ return rb_dbl2big(f);
+ }
+ val = f;
+ return INT2FIX(val);
+}
+
+static VALUE
+flo_ceil(num)
+ VALUE num;
+{
+ double f = ceil(RFLOAT(num)->value);
+ long val;
+
+ if (!FIXABLE(f)) {
+ return rb_dbl2big(f);
+ }
+ val = f;
+ return INT2FIX(val);
+}
+
+static VALUE
+flo_round(num)
+ VALUE num;
+{
+ double f = RFLOAT(num)->value;
+ long val;
+
+ if (f > 0.0) f = floor(f+0.5);
+ if (f < 0.0) f = ceil(f-0.5);
if (!FIXABLE(f)) {
- return dbl2big(f);
+ return rb_dbl2big(f);
}
val = f;
return INT2FIX(val);
@@ -418,7 +621,17 @@ flo_abs(flt)
VALUE flt;
{
double val = fabs(RFLOAT(flt)->value);
- return float_new(val);
+ return rb_float_new(val);
+}
+
+static VALUE
+flo_zero_p(num)
+ VALUE num;
+{
+ if (RFLOAT(num)->value == 0.0) {
+ return Qtrue;
+ }
+ return Qfalse;
}
static VALUE
@@ -432,64 +645,116 @@ static VALUE
fail_to_integer(val)
VALUE val;
{
- TypeError("failed to convert %s into Integer",
- rb_class2name(CLASS_OF(val)));
+ rb_raise(rb_eTypeError, "failed to convert %s into Integer",
+ rb_class2name(CLASS_OF(val)));
}
-int
-num2int(val)
+long
+rb_num2long(val)
VALUE val;
{
- if (NIL_P(val)) return 0;
+ if (NIL_P(val)) {
+ rb_raise(rb_eTypeError, "no implicit conversion from nil");
+ }
- switch (TYPE(val)) {
- case T_FIXNUM:
- return FIX2INT(val);
+ if (FIXNUM_P(val)) return FIX2LONG(val);
+ switch (TYPE(val)) {
case T_FLOAT:
- if (RFLOAT(val)->value <= (double) LONG_MAX
- && RFLOAT(val)->value >= (double) LONG_MIN) {
- return (int)(RFLOAT(val)->value);
+ if (RFLOAT(val)->value <= (double)LONG_MAX
+ && RFLOAT(val)->value >= (double)LONG_MIN) {
+ return (long)(RFLOAT(val)->value);
}
else {
- Fail("float %g out of rang of integer", RFLOAT(val)->value);
+ rb_raise(rb_eTypeError, "float %g out of rang of integer",
+ RFLOAT(val)->value);
}
case T_BIGNUM:
- return big2int(val);
+ return rb_big2long(val);
+
+ case T_STRING:
+ rb_raise(rb_eTypeError, "no implicit conversion from string");
+ return Qnil; /* not reached */
default:
val = rb_rescue(to_integer, val, fail_to_integer, val);
- return NUM2INT(val);
+ if (!rb_obj_is_kind_of(val, rb_cInteger)) {
+ rb_raise(rb_eTypeError, "`to_i' need to return integer");
+ }
+ return NUM2LONG(val);
}
}
-VALUE
-num2fix(val)
+unsigned long
+rb_num2ulong(val)
VALUE val;
{
- INT v;
+ if (TYPE(val) == T_BIGNUM) {
+ return rb_big2ulong(val);
+ }
+ return (unsigned long)rb_num2long(val);
+}
- if (NIL_P(val)) return INT2FIX(0);
- switch (TYPE(val)) {
- case T_FIXNUM:
- return val;
+#if SIZEOF_INT < SIZEOF_LONG
+int
+rb_num2int(val)
+ VALUE val;
+{
+ long num = rb_num2long(val);
- case T_FLOAT:
- case T_BIGNUM:
- default:
- v = num2int(val);
- if (!FIXABLE(v))
- Fail("integer %d out of range of Fixnum", v);
- return INT2FIX(v);
+ if (num < INT_MIN || INT_MAX < num) {
+ rb_raise(rb_eArgError, "integer %d too big to convert to `int'.", num);
}
+ return (int)num;
+}
+
+int
+rb_fix2int(val)
+ VALUE val;
+{
+ long num = FIXNUM_P(val)?FIX2LONG(val):rb_num2long(val);
+
+ if (num < INT_MIN || INT_MAX < num) {
+ rb_raise(rb_eArgError, "integer %d too big to convert to `int'.", num);
+ }
+ return (int)num;
+}
+#else
+int
+rb_num2int(val)
+ VALUE val;
+{
+ return rb_num2long(val);
+}
+
+int
+rb_fix2int(val)
+ VALUE val;
+{
+ return FIX2INT(val);
+}
+#endif
+
+VALUE
+rb_num2fix(val)
+ VALUE val;
+{
+ long v;
+
+ if (FIXNUM_P(val)) return val;
+
+ v = rb_num2long(val);
+ if (!FIXABLE(v))
+ rb_raise(rb_eTypeError, "integer %d out of range of fixnum", v);
+ return INT2FIX(v);
}
static VALUE
int_int_p(num)
VALUE num;
{
- return TRUE;
+ return Qtrue;
}
static VALUE
@@ -500,14 +765,27 @@ int_succ(num)
}
static VALUE
+int_chr(num)
+ VALUE num;
+{
+ char c;
+ long i = NUM2LONG(num);
+
+ if (i < 0 || 0xff < i)
+ rb_raise(rb_eTypeError, "%d out of char range", i);
+ c = i;
+ return rb_str_new(&c, 1);
+}
+
+static VALUE
fix_uminus(num)
VALUE num;
{
- return int2inum(-FIX2INT(num));
+ return rb_int2inum(-FIX2LONG(num));
}
VALUE
-fix2str(x, base)
+rb_fix2str(x, base)
VALUE x;
int base;
{
@@ -517,130 +795,140 @@ fix2str(x, base)
if (base == 10) fmt[2] = 'd';
else if (base == 16) fmt[2] = 'x';
else if (base == 8) fmt[2] = 'o';
- else Fatal("fixnum cannot treat base %d", base);
+ else rb_fatal("fixnum cannot treat base %d", base);
- sprintf(buf, fmt, FIX2INT(x));
- return str_new2(buf);
+ sprintf(buf, fmt, FIX2LONG(x));
+ return rb_str_new2(buf);
}
-VALUE
+static VALUE
fix_to_s(in)
VALUE in;
{
- return fix2str(in, 10);
+ return rb_fix2str(in, 10);
}
static VALUE
fix_plus(x, y)
VALUE x, y;
{
- switch (TYPE(y)) {
- case T_FIXNUM:
- {
- INT a, b, c;
- VALUE r;
-
- a = FIX2INT(x);
- b = FIX2INT(y);
- c = a + b;
- r = INT2FIX(c);
-
- if (FIX2INT(r) != c) {
- r = big_plus(int2big(a), int2big(b));
- }
- return r;
+ if (FIXNUM_P(y)) {
+ long a, b, c;
+ VALUE r;
+
+ a = FIX2LONG(x);
+ b = FIX2LONG(y);
+ c = a + b;
+ r = INT2FIX(c);
+
+ if (FIX2LONG(r) != c) {
+ r = rb_big_plus(rb_int2big(a), rb_int2big(b));
}
- case T_FLOAT:
- return float_new((double)FIX2INT(x) + RFLOAT(y)->value);
- default:
- return num_coerce_bin(x, y);
+ return r;
+ }
+ if (TYPE(y) == T_FLOAT) {
+ return rb_float_new((double)FIX2LONG(x) + RFLOAT(y)->value);
}
+ return rb_num_coerce_bin(x, y);
}
static VALUE
fix_minus(x, y)
VALUE x, y;
{
- switch (TYPE(y)) {
- case T_FIXNUM:
- {
- INT a, b, c;
- VALUE r;
-
- a = FIX2INT(x);
- b = FIX2INT(y);
- c = a - b;
- r = INT2FIX(c);
-
- if (FIX2INT(r) != c) {
- r = big_minus(int2big(a), int2big(b));
- }
- return r;
+ if (FIXNUM_P(y)) {
+ long a, b, c;
+ VALUE r;
+
+ a = FIX2LONG(x);
+ b = FIX2LONG(y);
+ c = a - b;
+ r = INT2FIX(c);
+
+ if (FIX2LONG(r) != c) {
+ r = rb_big_minus(rb_int2big(a), rb_int2big(b));
}
- case T_FLOAT:
- return float_new((double)FIX2INT(x) - RFLOAT(y)->value);
- default:
- return num_coerce_bin(x, y);
+ return r;
+ }
+ if (TYPE(y) == T_FLOAT) {
+ return rb_float_new((double)FIX2LONG(x) - RFLOAT(y)->value);
}
+ return rb_num_coerce_bin(x, y);
}
static VALUE
fix_mul(x, y)
VALUE x, y;
{
- switch (TYPE(y)) {
- case T_FIXNUM:
- {
- INT a, b, c;
- VALUE r;
+ if (FIXNUM_P(y)) {
+ long a, b, c;
+ VALUE r;
- a = FIX2INT(x);
- if (a == 0) return x;
+ a = FIX2LONG(x);
+ if (a == 0) return x;
- b = FIX2INT(y);
- c = a * b;
- r = INT2FIX(c);
+ b = FIX2LONG(y);
+ c = a * b;
+ r = INT2FIX(c);
- if (FIX2INT(r) != c || c/a != b) {
- r = big_mul(int2big(a), int2big(b));
- }
- return r;
+ if (FIX2LONG(r) != c || c/a != b) {
+ r = rb_big_mul(rb_int2big(a), rb_int2big(b));
}
- case T_FLOAT:
- return float_new((double)FIX2INT(x) * RFLOAT(y)->value);
- default:
- return num_coerce_bin(x, y);
+ return r;
+ }
+ if (TYPE(y) == T_FLOAT) {
+ return rb_float_new((double)FIX2LONG(x) * RFLOAT(y)->value);
}
+ return rb_num_coerce_bin(x, y);
}
static VALUE
fix_div(x, y)
VALUE x, y;
{
- INT i;
+ if (FIXNUM_P(y)) {
+ long i;
- if (TYPE(y) == T_FIXNUM) {
- i = FIX2INT(y);
- if (i == 0) num_zerodiv();
- i = FIX2INT(x)/i;
+ i = FIX2LONG(y);
+ if (i == 0) rb_num_zerodiv();
+ i = FIX2LONG(x)/i;
return INT2FIX(i);
}
- return num_coerce_bin(x, y);
+ return rb_num_coerce_bin(x, y);
}
static VALUE
-fix_mod(x, y)
+fix_modulo(x, y, modulo)
VALUE x, y;
{
- INT i;
+ long i;
- if (TYPE(y) == T_FIXNUM) {
- i = FIX2INT(y);
- if (i == 0) num_zerodiv();
- i = FIX2INT(x)%i;
+ if (FIXNUM_P(y)) {
+ i = FIX2LONG(y);
+ if (i == 0) rb_num_zerodiv();
+ i = FIX2LONG(x)%i;
+ if (modulo &&
+ (FIX2LONG(x) < 0) != (FIX2LONG(y) < 0) &&
+ i != 0) {
+ i += FIX2LONG(y);
+ }
return INT2FIX(i);
}
- return num_coerce_bin(x, y);
+ return rb_num_coerce_bin(x, y);
+}
+
+static VALUE
+fix_mod(x, y)
+ VALUE x, y;
+{
+ return fix_modulo(x, y, 1);
+}
+
+static VALUE
+fix_remainder(x, y)
+ VALUE x, y;
+{
+ return fix_modulo(x, y, 0);
}
static VALUE
@@ -648,20 +936,20 @@ fix_pow(x, y)
VALUE x, y;
{
if (FIXNUM_P(y)) {
- INT a, b;
+ long a, b;
- b = FIX2INT(y);
+ b = FIX2LONG(y);
if (b == 0) return INT2FIX(1);
- a = FIX2INT(x);
+ a = FIX2LONG(x);
if (b > 0) {
- return big_pow(int2big(a), y);
+ return rb_big_pow(rb_int2big(a), y);
}
- return float_new(pow((double)a, (double)b));
+ return rb_float_new(pow((double)a, (double)b));
}
else if (NIL_P(y)) {
return INT2FIX(1);
}
- return num_coerce_bin(x, y);
+ return rb_num_coerce_bin(x, y);
}
static VALUE
@@ -669,7 +957,7 @@ fix_equal(x, y)
VALUE x, y;
{
if (FIXNUM_P(y)) {
- return (FIX2INT(x) == FIX2INT(y))?TRUE:FALSE;
+ return (FIX2LONG(x) == FIX2LONG(y))?Qtrue:Qfalse;
}
else {
return num_equal(x, y);
@@ -681,14 +969,14 @@ fix_cmp(x, y)
VALUE x, y;
{
if (FIXNUM_P(y)) {
- INT a = FIX2INT(x), b = FIX2INT(y);
+ long a = FIX2LONG(x), b = FIX2LONG(y);
if (a == b) return INT2FIX(0);
if (a > b) return INT2FIX(1);
return INT2FIX(-1);
}
else {
- return num_coerce_bin(x, y);
+ return rb_num_coerce_bin(x, y);
}
}
@@ -697,13 +985,13 @@ fix_gt(x, y)
VALUE x, y;
{
if (FIXNUM_P(y)) {
- INT a = FIX2INT(x), b = FIX2INT(y);
+ long a = FIX2LONG(x), b = FIX2LONG(y);
- if (a > b) return TRUE;
- return FALSE;
+ if (a > b) return Qtrue;
+ return Qfalse;
}
else {
- return num_coerce_bin(x, y);
+ return rb_num_coerce_bin(x, y);
}
}
@@ -712,13 +1000,13 @@ fix_ge(x, y)
VALUE x, y;
{
if (FIXNUM_P(y)) {
- INT a = FIX2INT(x), b = FIX2INT(y);
+ long a = FIX2LONG(x), b = FIX2LONG(y);
- if (a >= b) return TRUE;
- return FALSE;
+ if (a >= b) return Qtrue;
+ return Qfalse;
}
else {
- return num_coerce_bin(x, y);
+ return rb_num_coerce_bin(x, y);
}
}
@@ -727,13 +1015,13 @@ fix_lt(x, y)
VALUE x, y;
{
if (FIXNUM_P(y)) {
- INT a = FIX2INT(x), b = FIX2INT(y);
+ long a = FIX2LONG(x), b = FIX2LONG(y);
- if (a < b) return TRUE;
- return FALSE;
+ if (a < b) return Qtrue;
+ return Qfalse;
}
else {
- return num_coerce_bin(x, y);
+ return rb_num_coerce_bin(x, y);
}
}
@@ -742,13 +1030,13 @@ fix_le(x, y)
VALUE x, y;
{
if (FIXNUM_P(y)) {
- INT a = FIX2INT(x), b = FIX2INT(y);
+ long a = FIX2LONG(x), b = FIX2LONG(y);
- if (a <= b) return TRUE;
- return FALSE;
+ if (a <= b) return Qtrue;
+ return Qfalse;
}
else {
- return num_coerce_bin(x, y);
+ return rb_num_coerce_bin(x, y);
}
}
@@ -756,10 +1044,10 @@ static VALUE
fix_rev(num)
VALUE num;
{
- unsigned long val = FIX2UINT(num);
+ unsigned long val = FIX2ULONG(num);
val = ~val;
- return INT2FIX(val);
+ return rb_int2inum(val);
}
static VALUE
@@ -769,10 +1057,10 @@ fix_and(x, y)
long val;
if (TYPE(y) == T_BIGNUM) {
- return big_and(y, x);
+ return rb_big_and(y, x);
}
- val = NUM2INT(x) & NUM2INT(y);
- return int2inum(val);
+ val = FIX2LONG(x) & NUM2LONG(y);
+ return rb_int2inum(val);
}
static VALUE
@@ -782,10 +1070,10 @@ fix_or(x, y)
long val;
if (TYPE(y) == T_BIGNUM) {
- return big_or(y, x);
+ return rb_big_or(y, x);
}
- val = NUM2INT(x) | NUM2INT(y);
- return INT2FIX(val);
+ val = FIX2LONG(x) | NUM2LONG(y);
+ return rb_int2inum(val);
}
static VALUE
@@ -795,26 +1083,27 @@ fix_xor(x, y)
long val;
if (TYPE(y) == T_BIGNUM) {
- return big_xor(y, x);
+ return rb_big_xor(y, x);
}
- val = NUM2INT(x) ^ NUM2INT(y);
- return INT2FIX(val);
+ val = FIX2LONG(x) ^ NUM2LONG(y);
+ return rb_int2inum(val);
}
static VALUE
fix_lshift(x, y)
VALUE x, y;
{
- long val, width;
+ long val;
+ int width;
- val = NUM2INT(x);
+ val = NUM2LONG(x);
width = NUM2INT(y);
if (width > (sizeof(VALUE)*CHAR_BIT-1)
- || (unsigned)val>>(sizeof(VALUE)*CHAR_BIT-1-width) > 0) {
- return big_lshift(int2big(val), y);
+ || ((unsigned long)val)>>(sizeof(VALUE)*CHAR_BIT-1-width) > 0) {
+ return rb_big_lshift(rb_int2big(val), y);
}
val = val << width;
- return int2inum(val);
+ return rb_int2inum(val);
}
static VALUE
@@ -823,9 +1112,9 @@ fix_rshift(x, y)
{
long i, val;
- i = NUM2INT(y);
- if (y < 32) {
- val = RSHIFT(FIX2INT(x), i);
+ i = NUM2LONG(y);
+ if (i < sizeof(long) * 8) {
+ val = RSHIFT(FIX2LONG(x), i);
return INT2FIX(val);
}
@@ -836,8 +1125,8 @@ static VALUE
fix_aref(fix, idx)
VALUE fix, idx;
{
- unsigned long val = FIX2INT(fix);
- int i = FIX2INT(idx);
+ unsigned long val = FIX2LONG(fix);
+ int i = FIX2LONG(idx);
if (i < 0 || sizeof(VALUE)*CHAR_BIT-1 < i)
return INT2FIX(0);
@@ -859,27 +1148,27 @@ fix_to_f(num)
{
double val;
- val = (double)FIX2INT(num);
+ val = (double)FIX2LONG(num);
- return float_new(val);
+ return rb_float_new(val);
}
static VALUE
fix_type(fix)
VALUE fix;
{
- return cFixnum;
+ return rb_cFixnum;
}
static VALUE
fix_abs(fix)
VALUE fix;
{
- INT i = FIX2INT(fix);
+ long i = FIX2LONG(fix);
if (i < 0) i = -i;
- return int2inum(i);
+ return rb_int2inum(i);
}
static VALUE
@@ -887,7 +1176,7 @@ fix_id2name(fix)
VALUE fix;
{
char *name = rb_id2name(FIX2UINT(fix));
- if (name) return str_new2(name);
+ if (name) return rb_str_new2(name);
return Qnil;
}
@@ -895,20 +1184,20 @@ static VALUE
fix_succ(fix)
VALUE fix;
{
- INT i = FIX2INT(fix) + 1;
+ long i = FIX2LONG(fix) + 1;
- return int2inum(i);
+ return rb_int2inum(i);
}
static VALUE
fix_size(fix)
VALUE fix;
{
- return INT2FIX(sizeof(INT));
+ return INT2FIX(sizeof(long));
}
-VALUE
-num_upto(from, to)
+static VALUE
+int_upto(from, to)
VALUE from, to;
{
VALUE i = from;
@@ -922,7 +1211,7 @@ num_upto(from, to)
}
static VALUE
-num_downto(from, to)
+int_downto(from, to)
VALUE from, to;
{
VALUE i = from;
@@ -936,14 +1225,14 @@ num_downto(from, to)
}
static VALUE
-num_step(from, to, step)
+int_step(from, to, step)
VALUE from, to, step;
{
VALUE i = from;
ID cmp;
- if (step == INT2FIX(0)) {
- ArgError("step cannot be 0");
+ if (NUM2INT(step) == 0) {
+ rb_raise(rb_eArgError, "step cannot be 0");
}
if (RTEST(rb_funcall(step, '>', 1, INT2FIX(0)))) {
@@ -961,7 +1250,7 @@ num_step(from, to, step)
}
static VALUE
-num_dotimes(num)
+int_dotimes(num)
VALUE num;
{
VALUE i = INT2FIX(0);
@@ -974,30 +1263,37 @@ num_dotimes(num)
return num;
}
-VALUE
+static VALUE
fix_upto(from, to)
VALUE from, to;
{
- INT i, end;
+ long i, end;
- if (!FIXNUM_P(to)) return num_upto(from, to);
- end = FIX2INT(to);
- for (i = FIX2INT(from); i <= end; i++) {
+ if (!FIXNUM_P(to)) return int_upto(from, to);
+ end = FIX2LONG(to);
+ for (i = FIX2LONG(from); i <= end; i++) {
rb_yield(INT2FIX(i));
}
return from;
}
+VALUE
+rb_fix_upto(from, to)
+ VALUE from, to;
+{
+ return fix_upto(from, to);
+}
+
static VALUE
fix_downto(from, to)
VALUE from, to;
{
- INT i, end;
+ long i, end;
- if (!FIXNUM_P(to)) return num_downto(from, to);
- end = FIX2INT(to);
- for (i=FIX2INT(from); i >= end; i--) {
+ if (!FIXNUM_P(to)) return int_downto(from, to);
+ end = FIX2LONG(to);
+ for (i=FIX2LONG(from); i >= end; i--) {
rb_yield(INT2FIX(i));
}
@@ -1008,24 +1304,24 @@ static VALUE
fix_step(from, to, step)
VALUE from, to, step;
{
- INT i, end, diff;
+ long i, end, diff;
if (!FIXNUM_P(to) || !FIXNUM_P(step))
- return num_step(from, to, step);
+ return int_step(from, to, step);
- end = FIX2INT(to);
- diff = FIX2INT(step);
+ end = FIX2LONG(to);
+ diff = FIX2LONG(step);
if (diff == 0) {
- ArgError("step cannot be 0");
+ rb_raise(rb_eArgError, "step cannot be 0");
}
else if (diff > 0) {
- for (i=FIX2INT(from); i <= end; i+=diff) {
+ for (i=FIX2LONG(from); i <= end; i+=diff) {
rb_yield(INT2FIX(i));
}
}
else {
- for (i=FIX2INT(from); i >= end; i+=diff) {
+ for (i=FIX2LONG(from); i >= end; i+=diff) {
rb_yield(INT2FIX(i));
}
}
@@ -1036,17 +1332,24 @@ static VALUE
fix_dotimes(num)
VALUE num;
{
- INT i, end;
+ long i, end;
- end = FIX2INT(num);
+ end = FIX2LONG(num);
for (i=0; i<end; i++) {
rb_yield(INT2FIX(i));
}
return num;
}
-extern VALUE mComparable;
-extern VALUE eException;
+static VALUE
+fix_zero_p(num)
+ VALUE num;
+{
+ if (FIX2LONG(num) == 0) {
+ return Qtrue;
+ }
+ return Qfalse;
+}
void
Init_Numeric()
@@ -1054,93 +1357,110 @@ Init_Numeric()
coerce = rb_intern("coerce");
to_i = rb_intern("to_i");
- eZeroDiv = rb_define_class("ZeroDivisionError", eException);
- cNumeric = rb_define_class("Numeric", cObject);
-
- rb_include_module(cNumeric, mComparable);
- rb_define_method(cNumeric, "coerce", num_coerce, 1);
-
- rb_define_method(cNumeric, "+@", num_uplus, 0);
- rb_define_method(cNumeric, "-@", num_uminus, 0);
- rb_define_method(cNumeric, "eql?", num_eql, 1);
- rb_define_method(cNumeric, "divmod", num_divmod, 1);
- rb_define_method(cNumeric, "abs", num_abs, 0);
-
- rb_define_method(cNumeric, "upto", num_upto, 1);
- rb_define_method(cNumeric, "downto", num_downto, 1);
- rb_define_method(cNumeric, "step", num_step, 2);
- rb_define_method(cNumeric, "times", num_dotimes, 0);
- rb_define_method(cNumeric, "integer?", num_int_p, 0);
- rb_define_method(cNumeric, "chr", num_chr, 0);
-
- cInteger = rb_define_class("Integer", cNumeric);
- rb_define_method(cInteger, "integer?", int_int_p, 0);
- rb_define_method(cInteger, "succ", int_succ, 0);
-
- cFixnum = rb_define_class("Fixnum", cInteger);
-
- rb_undef_method(CLASS_OF(cFixnum), "new");
-
- rb_define_method(cFixnum, "to_s", fix_to_s, 0);
- rb_define_method(cFixnum, "type", fix_type, 0);
-
- rb_define_method(cFixnum, "id2name", fix_id2name, 0);
-
- rb_define_method(cFixnum, "-@", fix_uminus, 0);
- rb_define_method(cFixnum, "+", fix_plus, 1);
- rb_define_method(cFixnum, "-", fix_minus, 1);
- rb_define_method(cFixnum, "*", fix_mul, 1);
- rb_define_method(cFixnum, "/", fix_div, 1);
- rb_define_method(cFixnum, "%", fix_mod, 1);
- rb_define_method(cFixnum, "**", fix_pow, 1);
-
- rb_define_method(cFixnum, "abs", fix_abs, 0);
-
- rb_define_method(cFixnum, "==", fix_equal, 1);
- rb_define_method(cFixnum, "<=>", fix_cmp, 1);
- rb_define_method(cFixnum, ">", fix_gt, 1);
- rb_define_method(cFixnum, ">=", fix_ge, 1);
- rb_define_method(cFixnum, "<", fix_lt, 1);
- rb_define_method(cFixnum, "<=", fix_le, 1);
-
- rb_define_method(cFixnum, "~", fix_rev, 0);
- rb_define_method(cFixnum, "&", fix_and, 1);
- rb_define_method(cFixnum, "|", fix_or, 1);
- rb_define_method(cFixnum, "^", fix_xor, 1);
- rb_define_method(cFixnum, "[]", fix_aref, 1);
-
- rb_define_method(cFixnum, "<<", fix_lshift, 1);
- rb_define_method(cFixnum, ">>", fix_rshift, 1);
-
- rb_define_method(cFixnum, "to_i", fix_to_i, 0);
- rb_define_method(cFixnum, "to_f", fix_to_f, 0);
-
- rb_define_method(cFixnum, "succ", fix_succ, 0);
- rb_define_method(cFixnum, "size", fix_size, 0);
-
- rb_define_method(cFixnum, "upto", fix_upto, 1);
- rb_define_method(cFixnum, "downto", fix_downto, 1);
- rb_define_method(cFixnum, "step", fix_step, 2);
- rb_define_method(cFixnum, "times", fix_dotimes, 0);
-
- cFloat = rb_define_class("Float", cNumeric);
-
- rb_undef_method(CLASS_OF(cFloat), "new");
-
- rb_define_method(cFloat, "to_s", flo_to_s, 0);
- rb_define_method(cFloat, "coerce", flo_coerce, 1);
- rb_define_method(cFloat, "-@", flo_uminus, 0);
- rb_define_method(cFloat, "+", flo_plus, 1);
- rb_define_method(cFloat, "-", flo_minus, 1);
- rb_define_method(cFloat, "*", flo_mul, 1);
- rb_define_method(cFloat, "/", flo_div, 1);
- rb_define_method(cFloat, "%", flo_mod, 1);
- rb_define_method(cFloat, "**", flo_pow, 1);
- rb_define_method(cFloat, "==", flo_eq, 1);
- rb_define_method(cFloat, "<=>", flo_cmp, 1);
- rb_define_method(cFloat, "eql?", flo_eql, 1);
- rb_define_method(cFloat, "hash", flo_hash, 0);
- rb_define_method(cFloat, "to_i", flo_to_i, 0);
- rb_define_method(cFloat, "to_f", flo_to_f, 0);
- rb_define_method(cFloat, "abs", flo_abs, 0);
+ rb_eZeroDiv = rb_define_class("ZeroDivisionError", rb_eStandardError);
+ rb_cNumeric = rb_define_class("Numeric", rb_cObject);
+
+ rb_include_module(rb_cNumeric, rb_mComparable);
+ rb_define_method(rb_cNumeric, "coerce", num_coerce, 1);
+ rb_define_method(rb_cNumeric, "clone", num_clone, 0);
+
+ rb_define_method(rb_cNumeric, "+@", num_uplus, 0);
+ rb_define_method(rb_cNumeric, "-@", num_uminus, 0);
+ rb_define_method(rb_cNumeric, "eql?", num_eql, 1);
+ rb_define_method(rb_cNumeric, "divmod", num_divmod, 1);
+ rb_define_method(rb_cNumeric, "abs", num_abs, 0);
+
+ rb_define_method(rb_cNumeric, "integer?", num_int_p, 0);
+ rb_define_method(rb_cNumeric, "zero?", num_zero_p, 0);
+ rb_define_method(rb_cNumeric, "nonzero?", num_nonzero_p, 0);
+
+ rb_cInteger = rb_define_class("Integer", rb_cNumeric);
+ rb_define_method(rb_cInteger, "integer?", int_int_p, 0);
+ rb_define_method(rb_cInteger, "upto", int_upto, 1);
+ rb_define_method(rb_cInteger, "downto", int_downto, 1);
+ rb_define_method(rb_cInteger, "step", int_step, 2);
+ rb_define_method(rb_cInteger, "times", int_dotimes, 0);
+ rb_define_method(rb_cInteger, "succ", int_succ, 0);
+ rb_define_method(rb_cInteger, "next", int_succ, 0);
+ rb_define_method(rb_cInteger, "chr", int_chr, 0);
+
+ rb_cFixnum = rb_define_class("Fixnum", rb_cInteger);
+
+ rb_undef_method(CLASS_OF(rb_cFixnum), "new");
+
+ rb_define_method(rb_cFixnum, "to_s", fix_to_s, 0);
+ rb_define_method(rb_cFixnum, "type", fix_type, 0);
+
+ rb_define_method(rb_cFixnum, "id2name", fix_id2name, 0);
+
+ rb_define_method(rb_cFixnum, "-@", fix_uminus, 0);
+ rb_define_method(rb_cFixnum, "+", fix_plus, 1);
+ rb_define_method(rb_cFixnum, "-", fix_minus, 1);
+ rb_define_method(rb_cFixnum, "*", fix_mul, 1);
+ rb_define_method(rb_cFixnum, "/", fix_div, 1);
+ rb_define_method(rb_cFixnum, "%", fix_mod, 1);
+ rb_define_method(rb_cFixnum, "remainder", fix_remainder, 1);
+ rb_define_method(rb_cFixnum, "**", fix_pow, 1);
+
+ rb_define_method(rb_cFixnum, "abs", fix_abs, 0);
+
+ rb_define_method(rb_cFixnum, "==", fix_equal, 1);
+ rb_define_method(rb_cFixnum, "<=>", fix_cmp, 1);
+ rb_define_method(rb_cFixnum, ">", fix_gt, 1);
+ rb_define_method(rb_cFixnum, ">=", fix_ge, 1);
+ rb_define_method(rb_cFixnum, "<", fix_lt, 1);
+ rb_define_method(rb_cFixnum, "<=", fix_le, 1);
+
+ rb_define_method(rb_cFixnum, "~", fix_rev, 0);
+ rb_define_method(rb_cFixnum, "&", fix_and, 1);
+ rb_define_method(rb_cFixnum, "|", fix_or, 1);
+ rb_define_method(rb_cFixnum, "^", fix_xor, 1);
+ rb_define_method(rb_cFixnum, "[]", fix_aref, 1);
+
+ rb_define_method(rb_cFixnum, "<<", fix_lshift, 1);
+ rb_define_method(rb_cFixnum, ">>", fix_rshift, 1);
+
+ rb_define_method(rb_cFixnum, "to_i", fix_to_i, 0);
+ rb_define_method(rb_cFixnum, "to_f", fix_to_f, 0);
+
+ rb_define_method(rb_cFixnum, "succ", fix_succ, 0);
+ rb_define_method(rb_cFixnum, "next", fix_succ, 0);
+ rb_define_method(rb_cFixnum, "size", fix_size, 0);
+
+ rb_define_method(rb_cFixnum, "upto", fix_upto, 1);
+ rb_define_method(rb_cFixnum, "downto", fix_downto, 1);
+ rb_define_method(rb_cFixnum, "step", fix_step, 2);
+ rb_define_method(rb_cFixnum, "times", fix_dotimes, 0);
+ rb_define_method(rb_cFixnum, "zero?", fix_zero_p, 0);
+
+ rb_cFloat = rb_define_class("Float", rb_cNumeric);
+
+ rb_undef_method(CLASS_OF(rb_cFloat), "new");
+
+ rb_define_method(rb_cFloat, "to_s", flo_to_s, 0);
+ rb_define_method(rb_cFloat, "coerce", flo_coerce, 1);
+ rb_define_method(rb_cFloat, "-@", flo_uminus, 0);
+ rb_define_method(rb_cFloat, "+", flo_plus, 1);
+ rb_define_method(rb_cFloat, "-", flo_minus, 1);
+ rb_define_method(rb_cFloat, "*", flo_mul, 1);
+ rb_define_method(rb_cFloat, "/", flo_div, 1);
+ rb_define_method(rb_cFloat, "%", flo_mod, 1);
+ rb_define_method(rb_cFloat, "remainder", flo_remainder, 1);
+ rb_define_method(rb_cFloat, "**", flo_pow, 1);
+ rb_define_method(rb_cFloat, "==", flo_eq, 1);
+ rb_define_method(rb_cFloat, "<=>", flo_cmp, 1);
+ rb_define_method(rb_cFloat, ">", flo_gt, 1);
+ rb_define_method(rb_cFloat, ">=", flo_ge, 1);
+ rb_define_method(rb_cFloat, "<", flo_lt, 1);
+ rb_define_method(rb_cFloat, "<=", flo_le, 1);
+ rb_define_method(rb_cFloat, "eql?", flo_eql, 1);
+ rb_define_method(rb_cFloat, "hash", flo_hash, 0);
+ rb_define_method(rb_cFloat, "to_i", flo_to_i, 0);
+ rb_define_method(rb_cFloat, "to_f", flo_to_f, 0);
+ rb_define_method(rb_cFloat, "abs", flo_abs, 0);
+ rb_define_method(rb_cFloat, "zero?", flo_zero_p, 0);
+
+ rb_define_method(rb_cFloat, "floor", flo_floor, 0);
+ rb_define_method(rb_cFloat, "ceil", flo_ceil, 0);
+ rb_define_method(rb_cFloat, "round", flo_round, 0);
}