akr	2016-04-30 19:26:17 +0900 (Sat, 30 Apr 2016)

  New Revision: 54844

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54844

  Log:
    Define Integer#>= instead of Bignum#>=.
    
    * numeric.c (int_ge): Define Integer#>=.
    
    * bignum.c (rb_big_ge): Don't define Bignum#>=.
      Renamed from big_ge.
    
    * internal.h (rb_big_ge): Declared.

  Modified files:
    trunk/ChangeLog
    trunk/bignum.c
    trunk/internal.h
    trunk/numeric.c
Index: bignum.c
===================================================================
--- bignum.c	(revision 54843)
+++ bignum.c	(revision 54844)
@@ -5446,16 +5446,8 @@ big_gt(VALUE x, VALUE y) https://github.com/ruby/ruby/blob/trunk/bignum.c#L5446
     return big_op(x, y, big_op_gt);
 }
 
-/*
- * call-seq:
- *   big >= real  ->  true or false
- *
- * Returns <code>true</code> if the value of <code>big</code> is
- * greater than or equal to that of <code>real</code>.
- */
-
-static VALUE
-big_ge(VALUE x, VALUE y)
+VALUE
+rb_big_ge(VALUE x, VALUE y)
 {
     return big_op(x, y, big_op_ge);
 }
@@ -6866,7 +6858,6 @@ Init_Bignum(void) https://github.com/ruby/ruby/blob/trunk/bignum.c#L6858
 
     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, "===", rb_big_eq, 1);
 
 #ifdef USE_GMP
Index: numeric.c
===================================================================
--- numeric.c	(revision 54843)
+++ numeric.c	(revision 54844)
@@ -3852,11 +3852,12 @@ fix_gt(VALUE x, VALUE y) https://github.com/ruby/ruby/blob/trunk/numeric.c#L3852
 }
 
 /*
+ * 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 greater than or equal to that of
+ * Returns +true+ if the value of +int+ is greater than or equal to that of
  * +real+.
  */
 
@@ -3879,6 +3880,18 @@ fix_ge(VALUE x, VALUE y) https://github.com/ruby/ruby/blob/trunk/numeric.c#L3880
     }
 }
 
+static VALUE
+int_ge(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(x)) {
+	return fix_ge(x, y);
+    }
+    else if (RB_TYPE_P(x, T_BIGNUM)) {
+	return rb_big_ge(x, y);
+    }
+    return Qnil;
+}
+
 /*
  * Document-method: Integer#<
  * Document-method: Fixnum#<
@@ -4911,6 +4924,7 @@ Init_Numeric(void) https://github.com/ruby/ruby/blob/trunk/numeric.c#L4924
     rb_define_method(rb_cInteger, "abs", int_abs, 0);
     rb_define_method(rb_cInteger, "magnitude", int_abs, 0);
 
+    rb_define_method(rb_cInteger, ">=", int_ge, 1);
     rb_define_method(rb_cInteger, "<", int_lt, 1);
     rb_define_method(rb_cInteger, "<=", int_le, 1);
 
Index: internal.h
===================================================================
--- internal.h	(revision 54843)
+++ internal.h	(revision 54844)
@@ -787,6 +787,7 @@ VALUE rb_big_abs(VALUE x); https://github.com/ruby/ruby/blob/trunk/internal.h#L787
 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_ge(VALUE x, VALUE y);
 VALUE rb_big_lt(VALUE x, VALUE y);
 VALUE rb_big_le(VALUE x, VALUE y);
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 54843)
+++ ChangeLog	(revision 54844)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Apr 30 19:24:40 2016  Tanaka Akira  <akr@f...>
+
+	* numeric.c (int_ge): Define Integer#>=.
+
+	* bignum.c (rb_big_ge): Don't define Bignum#>=.
+	  Renamed from big_ge.
+
+	* internal.h (rb_big_ge): Declared.
+
 Sat Apr 30 19:20:40 2016  SHIBATA Hiroshi  <hsbt@r...>
 
 	* doc/standard_library.rdoc: Remove obsoleted classes and modules.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/