[前][次][番号順一覧][スレッド一覧]

ruby-changes:42771

From: akr <ko1@a...>
Date: Sat, 30 Apr 2016 18:45:30 +0900 (JST)
Subject: [ruby-changes:42771] akr:r54845 (trunk): Define Integer#> instead of Bignum#>.

akr	2016-04-30 19:42:06 +0900 (Sat, 30 Apr 2016)

  New Revision: 54845

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

  Log:
    Define Integer#> instead of Bignum#>.
    
    * numeric.c (int_gt): Define Integer#>.
    
    * bignum.c (rb_big_gt): Don't define Bignum#>.
      Renamed from big_gt.
    
    * internal.h (rb_big_gt): Declared.

  Modified files:
    trunk/ChangeLog
    trunk/bignum.c
    trunk/internal.h
    trunk/numeric.c
Index: bignum.c
===================================================================
--- bignum.c	(revision 54844)
+++ bignum.c	(revision 54845)
@@ -5432,16 +5432,8 @@ big_op(VALUE x, VALUE y, enum big_op_t o https://github.com/ruby/ruby/blob/trunk/bignum.c#L5432
     return Qundef;
 }
 
-/*
- * call-seq:
- *   big > real  ->  true or false
- *
- * Returns <code>true</code> if the value of <code>big</code> is
- * greater than that of <code>real</code>.
- */
-
-static VALUE
-big_gt(VALUE x, VALUE y)
+VALUE
+rb_big_gt(VALUE x, VALUE y)
 {
     return big_op(x, y, big_op_gt);
 }
@@ -6857,7 +6849,6 @@ Init_Bignum(void) https://github.com/ruby/ruby/blob/trunk/bignum.c#L6849
     rb_define_method(rb_cBignum, "%", rb_big_modulo, 1);
 
     rb_define_method(rb_cBignum, "==", rb_big_eq, 1);
-    rb_define_method(rb_cBignum, ">", big_gt, 1);
     rb_define_method(rb_cBignum, "===", rb_big_eq, 1);
 
 #ifdef USE_GMP
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 54844)
+++ ChangeLog	(revision 54845)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Apr 30 19:41:15 2016  Tanaka Akira  <akr@f...>
+
+	* numeric.c (int_gt): Define Integer#>.
+
+	* bignum.c (rb_big_gt): Don't define Bignum#>.
+	  Renamed from big_gt.
+
+	* internal.h (rb_big_gt): Declared.
+
 Sat Apr 30 19:24:40 2016  Tanaka Akira  <akr@f...>
 
 	* numeric.c (int_ge): Define Integer#>=.
Index: internal.h
===================================================================
--- internal.h	(revision 54844)
+++ internal.h	(revision 54845)
@@ -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_gt(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: numeric.c
===================================================================
--- numeric.c	(revision 54844)
+++ numeric.c	(revision 54845)
@@ -3826,11 +3826,12 @@ int_cmp(VALUE x, VALUE y) https://github.com/ruby/ruby/blob/trunk/numeric.c#L3826
 }
 
 /*
+ * 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 that of +real+.
+ * Returns +true+ if the value of +int+ is greater than that of +real+.
  */
 
 static VALUE
@@ -3851,6 +3852,18 @@ fix_gt(VALUE x, VALUE y) https://github.com/ruby/ruby/blob/trunk/numeric.c#L3852
     }
 }
 
+static VALUE
+int_gt(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(x)) {
+	return fix_gt(x, y);
+    }
+    else if (RB_TYPE_P(x, T_BIGNUM)) {
+	return rb_big_gt(x, y);
+    }
+    return Qnil;
+}
+
 /*
  * Document-method: Integer#>=
  * Document-method: Fixnum#>=
@@ -4924,6 +4937,7 @@ Init_Numeric(void) https://github.com/ruby/ruby/blob/trunk/numeric.c#L4937
     rb_define_method(rb_cInteger, "abs", int_abs, 0);
     rb_define_method(rb_cInteger, "magnitude", int_abs, 0);
 
+    rb_define_method(rb_cInteger, ">", int_gt, 1);
     rb_define_method(rb_cInteger, ">=", int_ge, 1);
     rb_define_method(rb_cInteger, "<", int_lt, 1);
     rb_define_method(rb_cInteger, "<=", int_le, 1);

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

[前][次][番号順一覧][スレッド一覧]