mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Define Integer#< instead of Bignum#<.
* numeric.c (int_lt): Define Integer#<. * bignum.c (rb_big_lt): Don't define Bignum#<. Renamed from big_lt. * internal.h (rb_big_lt): Declared. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d00bca92a9
commit
6b16db9c80
4 changed files with 28 additions and 13 deletions
|
@ -1,3 +1,12 @@
|
|||
Sat Apr 30 19:09:23 2016 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* numeric.c (int_lt): Define Integer#<.
|
||||
|
||||
* bignum.c (rb_big_lt): Don't define Bignum#<.
|
||||
Renamed from big_lt.
|
||||
|
||||
* internal.h (rb_big_lt): Declared.
|
||||
|
||||
Sat Apr 30 18:44:05 2016 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* numeric.c (int_le): Define Integer#<=.
|
||||
|
|
13
bignum.c
13
bignum.c
|
@ -5460,16 +5460,8 @@ big_ge(VALUE x, VALUE y)
|
|||
return big_op(x, y, big_op_ge);
|
||||
}
|
||||
|
||||
/*
|
||||
* call-seq:
|
||||
* big < real -> true or false
|
||||
*
|
||||
* Returns <code>true</code> if the value of <code>big</code> is
|
||||
* less than that of <code>real</code>.
|
||||
*/
|
||||
|
||||
static VALUE
|
||||
big_lt(VALUE x, VALUE y)
|
||||
VALUE
|
||||
rb_big_lt(VALUE x, VALUE y)
|
||||
{
|
||||
return big_op(x, y, big_op_lt);
|
||||
}
|
||||
|
@ -6875,7 +6867,6 @@ Init_Bignum(void)
|
|||
rb_define_method(rb_cBignum, "==", rb_big_eq, 1);
|
||||
rb_define_method(rb_cBignum, ">", big_gt, 1);
|
||||
rb_define_method(rb_cBignum, ">=", big_ge, 1);
|
||||
rb_define_method(rb_cBignum, "<", big_lt, 1);
|
||||
rb_define_method(rb_cBignum, "===", rb_big_eq, 1);
|
||||
|
||||
#ifdef USE_GMP
|
||||
|
|
|
@ -787,6 +787,7 @@ VALUE rb_big_abs(VALUE x);
|
|||
VALUE rb_big_size_m(VALUE big);
|
||||
VALUE rb_big_bit_length(VALUE big);
|
||||
VALUE rb_big_remainder(VALUE x, VALUE y);
|
||||
VALUE rb_big_lt(VALUE x, VALUE y);
|
||||
VALUE rb_big_le(VALUE x, VALUE y);
|
||||
|
||||
/* class.c */
|
||||
|
|
18
numeric.c
18
numeric.c
|
@ -3880,11 +3880,12 @@ fix_ge(VALUE x, VALUE y)
|
|||
}
|
||||
|
||||
/*
|
||||
* Document-method: Integer#<
|
||||
* Document-method: Fixnum#<
|
||||
* call-seq:
|
||||
* fix < real -> true or false
|
||||
* int < real -> true or false
|
||||
*
|
||||
* Returns +true+ if the value of +fix+ is less than that of +real+.
|
||||
* Returns +true+ if the value of +int+ is less than that of +real+.
|
||||
*/
|
||||
|
||||
static VALUE
|
||||
|
@ -3905,6 +3906,18 @@ fix_lt(VALUE x, VALUE y)
|
|||
}
|
||||
}
|
||||
|
||||
static VALUE
|
||||
int_lt(VALUE x, VALUE y)
|
||||
{
|
||||
if (FIXNUM_P(x)) {
|
||||
return fix_lt(x, y);
|
||||
}
|
||||
else if (RB_TYPE_P(x, T_BIGNUM)) {
|
||||
return rb_big_lt(x, y);
|
||||
}
|
||||
return Qnil;
|
||||
}
|
||||
|
||||
/*
|
||||
* Document-method: Integer#<=
|
||||
* Document-method: Fixnum#<=
|
||||
|
@ -4898,6 +4911,7 @@ Init_Numeric(void)
|
|||
rb_define_method(rb_cInteger, "abs", int_abs, 0);
|
||||
rb_define_method(rb_cInteger, "magnitude", int_abs, 0);
|
||||
|
||||
rb_define_method(rb_cInteger, "<", int_lt, 1);
|
||||
rb_define_method(rb_cInteger, "<=", int_le, 1);
|
||||
|
||||
rb_define_method(rb_cFixnum, "==", fix_equal, 1);
|
||||
|
|
Loading…
Add table
Reference in a new issue