diff --git a/benchmark/nilclass.yml b/benchmark/nilclass.yml index da66e71068..66234c4cdf 100644 --- a/benchmark/nilclass.yml +++ b/benchmark/nilclass.yml @@ -1,10 +1,16 @@ prelude: | def a = nil benchmark: + rationalize: + nil.rationalize + to_c: | + nil.to_c to_i: | nil.to_i to_f: | nil.to_f + to_r: | + nil.to_r splat: | a(*nil) loop_count: 100000 diff --git a/complex.c b/complex.c index 05c991f35b..d6daee307c 100644 --- a/complex.c +++ b/complex.c @@ -1925,21 +1925,6 @@ nucomp_to_c(VALUE self) return self; } -/* - * call-seq: - * to_c -> (0+0i) - * - * Returns zero as a Complex: - * - * nil.to_c # => (0+0i) - * - */ -static VALUE -nilclass_to_c(VALUE self) -{ - return rb_complex_new1(INT2FIX(0)); -} - /* * call-seq: * to_c -> complex @@ -2693,7 +2678,6 @@ Init_Complex(void) rb_define_method(rb_cComplex, "to_r", nucomp_to_r, 0); rb_define_method(rb_cComplex, "rationalize", nucomp_rationalize, -1); rb_define_method(rb_cComplex, "to_c", nucomp_to_c, 0); - rb_define_method(rb_cNilClass, "to_c", nilclass_to_c, 0); rb_define_method(rb_cNumeric, "to_c", numeric_to_c, 0); rb_define_method(rb_cString, "to_c", string_to_c, 0); diff --git a/nilclass.rb b/nilclass.rb index 5a2e19680d..acd5666c71 100644 --- a/nilclass.rb +++ b/nilclass.rb @@ -1,4 +1,30 @@ class NilClass + # + # call-seq: + # rationalize(eps = nil) -> (0/1) + # + # Returns zero as a Rational: + # + # nil.rationalize # => (0/1) + # + # Argument +eps+ is ignored. + # + def rationalize(eps = nil) + 0r + end + + # + # call-seq: + # to_c -> (0+0i) + # + # Returns zero as a Complex: + # + # nil.to_c # => (0+0i) + # + def to_c + 0i + end + # # call-seq: # nil.to_i -> 0 @@ -22,4 +48,16 @@ class NilClass def to_f return 0.0 end + + # + # call-seq: + # to_r -> (0/1) + # + # Returns zero as a Rational: + # + # nil.to_r # => (0/1) + # + def to_r + 0r + end end diff --git a/rational.c b/rational.c index f1547856b4..89e74c328d 100644 --- a/rational.c +++ b/rational.c @@ -2107,39 +2107,6 @@ rb_float_denominator(VALUE self) return nurat_denominator(r); } -/* - * call-seq: - * to_r -> (0/1) - * - * Returns zero as a Rational: - * - * nil.to_r # => (0/1) - * - */ -static VALUE -nilclass_to_r(VALUE self) -{ - return rb_rational_new1(INT2FIX(0)); -} - -/* - * call-seq: - * rationalize(eps = nil) -> (0/1) - * - * Returns zero as a Rational: - * - * nil.rationalize # => (0/1) - * - * Argument +eps+ is ignored. - * - */ -static VALUE -nilclass_rationalize(int argc, VALUE *argv, VALUE self) -{ - rb_check_arity(argc, 0, 1); - return nilclass_to_r(self); -} - /* * call-seq: * int.to_r -> rational @@ -2823,8 +2790,6 @@ Init_Rational(void) rb_define_method(rb_cFloat, "numerator", rb_float_numerator, 0); rb_define_method(rb_cFloat, "denominator", rb_float_denominator, 0); - rb_define_method(rb_cNilClass, "to_r", nilclass_to_r, 0); - rb_define_method(rb_cNilClass, "rationalize", nilclass_rationalize, -1); rb_define_method(rb_cInteger, "to_r", integer_to_r, 0); rb_define_method(rb_cInteger, "rationalize", integer_rationalize, -1); rb_define_method(rb_cFloat, "to_r", float_to_r, 0);