1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* complex.c: undef-ed shome methods. [ruby-core:24110]

Browse Source 
* complex.c (Numeric#arg): NaN for NaN.  [ruby-core:24116]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23946 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2009-07-03 10:50:17 +00:00
parent 6120338287
commit b61ab11f49
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Jul 3 19:48:40 2009 Tadayoshi Funaba <tadf@dotrb.org>
* complex.c: undef-ed shome methods. [ruby-core:24110]
* complex.c (Numeric#arg): NaN for NaN. [ruby-core:24116]
Fri Jul 3 18:35:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jul 3 18:35:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_core.h (struct rb_iseq_struct): fixed types. * vm_core.h (struct rb_iseq_struct): fixed types.

29
complex.c
View File

@ -1690,9 +1690,9 @@ numeric_abs2(VALUE self)
/* /*
* call-seq: * call-seq:
* num.arg -> float * num.arg -> 0 or float
* num.angle -> float * num.angle -> 0 or float
* num.phase -> float * num.phase -> 0 or float
* *
* Returns 0 if the value is positive, pi otherwise. * Returns 0 if the value is positive, pi otherwise.
*/ */
@ -1741,6 +1741,22 @@ numeric_conj(VALUE self)
return self; return self;
} }
/*
* call-seq:
* flo.arg -> 0 or float
* flo.angle -> 0 or float
* flo.phase -> 0 or float
*
* Returns 0 if the value is positive, pi otherwise.
*/
static VALUE
float_arg(VALUE self)
{
if (isnan(RFLOAT_VALUE(self)))
return self;
return rb_call_super(0, 0);
}
/* /*
* A complex number can be represented as a paired real number with * A complex number can be represented as a paired real number with
* imaginary unit; a+bi. Where a is real part, b is imaginary part * imaginary unit; a+bi. Where a is real part, b is imaginary part
@ -1824,16 +1840,19 @@ Init_Complex(void)
rb_define_global_function("Complex", nucomp_f_complex, -1); rb_define_global_function("Complex", nucomp_f_complex, -1);
rb_undef_method(rb_cComplex, "%");
rb_undef_method(rb_cComplex, "<"); rb_undef_method(rb_cComplex, "<");
rb_undef_method(rb_cComplex, "<="); rb_undef_method(rb_cComplex, "<=");
rb_undef_method(rb_cComplex, "<=>"); rb_undef_method(rb_cComplex, "<=>");
rb_undef_method(rb_cComplex, ">"); rb_undef_method(rb_cComplex, ">");
rb_undef_method(rb_cComplex, ">="); rb_undef_method(rb_cComplex, ">=");
rb_undef_method(rb_cComplex, "between?"); rb_undef_method(rb_cComplex, "between?");
rb_undef_method(rb_cComplex, "div");
rb_undef_method(rb_cComplex, "divmod"); rb_undef_method(rb_cComplex, "divmod");
rb_undef_method(rb_cComplex, "floor"); rb_undef_method(rb_cComplex, "floor");
rb_undef_method(rb_cComplex, "ceil"); rb_undef_method(rb_cComplex, "ceil");
rb_undef_method(rb_cComplex, "modulo"); rb_undef_method(rb_cComplex, "modulo");
rb_undef_method(rb_cComplex, "remainder");
rb_undef_method(rb_cComplex, "round"); rb_undef_method(rb_cComplex, "round");
rb_undef_method(rb_cComplex, "step"); rb_undef_method(rb_cComplex, "step");
rb_undef_method(rb_cComplex, "truncate"); rb_undef_method(rb_cComplex, "truncate");
@ -1921,6 +1940,10 @@ Init_Complex(void)
rb_define_method(rb_cNumeric, "conjugate", numeric_conj, 0); rb_define_method(rb_cNumeric, "conjugate", numeric_conj, 0);
rb_define_method(rb_cNumeric, "conj", numeric_conj, 0); rb_define_method(rb_cNumeric, "conj", numeric_conj, 0);
rb_define_method(rb_cFloat, "arg", float_arg, 0);
rb_define_method(rb_cFloat, "angle", float_arg, 0);
rb_define_method(rb_cFloat, "phase", float_arg, 0);
rb_define_const(rb_cComplex, "I", rb_define_const(rb_cComplex, "I",
f_complex_new_bang2(rb_cComplex, ZERO, ONE)); f_complex_new_bang2(rb_cComplex, ZERO, ONE));
} }

6
test/ruby/test_complex.rb
View File

@ -519,7 +519,7 @@ class Complex_Test < Test::Unit::TestCase
assert_instance_of(Fixnum, Complex(1,2) - Complex(1,2)) assert_instance_of(Fixnum, Complex(1,2) - Complex(1,2))
assert_instance_of(Fixnum, Complex(1,2) * 0) assert_instance_of(Fixnum, Complex(1,2) * 0)
assert_instance_of(Fixnum, Complex(1,2) / Complex(1,2)) assert_instance_of(Fixnum, Complex(1,2) / Complex(1,2))
assert_instance_of(Fixnum, Complex(1,2).div(Complex(1,2))) # assert_instance_of(Fixnum, Complex(1,2).div(Complex(1,2)))
assert_instance_of(Fixnum, Complex(1,2).quo(Complex(1,2))) assert_instance_of(Fixnum, Complex(1,2).quo(Complex(1,2)))
# assert_instance_of(Fixnum, Complex(1,2) ** 0) # mathn's bug # assert_instance_of(Fixnum, Complex(1,2) ** 0) # mathn's bug
end end
@ -779,17 +779,19 @@ class Complex_Test < Test::Unit::TestCase
def test_respond def test_respond
c = Complex(1,1) c = Complex(1,1)
assert_equal(false, c.respond_to?(:%))
assert_equal(false, c.respond_to?(:<)) assert_equal(false, c.respond_to?(:<))
assert_equal(false, c.respond_to?(:<=)) assert_equal(false, c.respond_to?(:<=))
assert_equal(false, c.respond_to?(:<=>)) assert_equal(false, c.respond_to?(:<=>))
assert_equal(false, c.respond_to?(:>)) assert_equal(false, c.respond_to?(:>))
assert_equal(false, c.respond_to?(:>=)) assert_equal(false, c.respond_to?(:>=))
assert_equal(false, c.respond_to?(:between?)) assert_equal(false, c.respond_to?(:between?))
# assert_equal(false, c.respond_to?(:div)) # ? assert_equal(false, c.respond_to?(:div))
assert_equal(false, c.respond_to?(:divmod)) assert_equal(false, c.respond_to?(:divmod))
assert_equal(false, c.respond_to?(:floor)) assert_equal(false, c.respond_to?(:floor))
assert_equal(false, c.respond_to?(:ceil)) assert_equal(false, c.respond_to?(:ceil))
assert_equal(false, c.respond_to?(:modulo)) assert_equal(false, c.respond_to?(:modulo))
assert_equal(false, c.respond_to?(:remainder))
assert_equal(false, c.respond_to?(:round)) assert_equal(false, c.respond_to?(:round))
assert_equal(false, c.respond_to?(:step)) assert_equal(false, c.respond_to?(:step))
assert_equal(false, c.respond_to?(:tunrcate)) assert_equal(false, c.respond_to?(:tunrcate))