From b841f31caae57f90c92b7543cf64d38a4881cce1 Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 30 Apr 2016 12:55:59 +0000 Subject: Gather Fixnum method definitions. * numeric.c (Init_Numeric): Gather Fixnum method definitions. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- numeric.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'numeric.c') diff --git a/numeric.c b/numeric.c index 3923b4139b..15621ce96c 100644 --- a/numeric.c +++ b/numeric.c @@ -4950,19 +4950,12 @@ Init_Numeric(void) rb_define_method(rb_cInteger, "round", int_round, -1); rb_define_method(rb_cInteger, "<=>", int_cmp, 1); - rb_cFixnum = rb_define_class("Fixnum", rb_cInteger); - rb_define_method(rb_cInteger, "-@", rb_int_uminus, 0); - rb_define_method(rb_cFixnum, "+", fix_plus, 1); rb_define_method(rb_cInteger, "+", rb_int_plus, 1); - rb_define_method(rb_cFixnum, "-", fix_minus, 1); rb_define_method(rb_cInteger, "-", rb_int_minus, 1); - rb_define_method(rb_cFixnum, "*", fix_mul, 1); rb_define_method(rb_cInteger, "*", rb_int_mul, 1); - rb_define_method(rb_cFixnum, "/", fix_div, 1); rb_define_method(rb_cInteger, "/", rb_int_div, 1); rb_define_method(rb_cInteger, "div", rb_int_idiv, 1); - rb_define_method(rb_cFixnum, "%", fix_mod, 1); rb_define_method(rb_cInteger, "%", rb_int_modulo, 1); rb_define_method(rb_cInteger, "modulo", rb_int_modulo, 1); rb_define_method(rb_cInteger, "remainder", int_remainder, 1); @@ -4979,13 +4972,6 @@ Init_Numeric(void) rb_define_method(rb_cInteger, "<", int_lt, 1); rb_define_method(rb_cInteger, "<=", int_le, 1); - rb_define_method(rb_cFixnum, "==", fix_equal, 1); - rb_define_method(rb_cFixnum, "===", fix_equal, 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_cInteger, "~", int_comp, 0); rb_define_method(rb_cInteger, "&", int_and, 1); rb_define_method(rb_cInteger, "|", int_or, 1); @@ -4997,6 +4983,22 @@ Init_Numeric(void) rb_define_method(rb_cInteger, "size", int_size, 0); rb_define_method(rb_cInteger, "bit_length", rb_int_bit_length, 0); + + rb_cFixnum = rb_define_class("Fixnum", rb_cInteger); + + 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, "==", fix_equal, 1); + rb_define_method(rb_cFixnum, "===", fix_equal, 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, "succ", fix_succ, 0); rb_cFloat = rb_define_class("Float", rb_cNumeric); -- cgit v1.2.3