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

* complex.c (string_to_c_internal): a refactoring.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2011-05-09 11:31:26 +00:00
parent 140e1f0b15
commit 6c81a8e44e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Mon May 9 20:29:44 2011 Tadayoshi Funaba <tadf@dotrb.org>
* complex.c (string_to_c_internal): a refactoring.
Mon May 9 18:33:05 2011 NARUSE, Yui <naruse@ruby-lang.org> Mon May 9 18:33:05 2011 NARUSE, Yui <naruse@ruby-lang.org>
* string.c: Improve documentation for String#start_with? and * string.c: Improve documentation for String#start_with? and

5
complex.c
View File

@ -1498,7 +1498,6 @@ string_to_c_internal(VALUE self)
m = f_match(comp_pat2, s); m = f_match(comp_pat2, s);
if (NIL_P(m)) if (NIL_P(m))
return rb_assoc_new(Qnil, self); return rb_assoc_new(Qnil, self);
/* string is of form "x+yi" */
sr = f_aref(m, INT2FIX(1)); sr = f_aref(m, INT2FIX(1));
if (NIL_P(f_aref(m, INT2FIX(2)))) if (NIL_P(f_aref(m, INT2FIX(2))))
si = Qnil; si = Qnil;
@ -1519,7 +1518,7 @@ string_to_c_internal(VALUE self)
if (!NIL_P(sr)) { if (!NIL_P(sr)) {
if (strchr(RSTRING_PTR(sr), '/')) if (strchr(RSTRING_PTR(sr), '/'))
r = f_to_r(sr); r = f_to_r(sr);
else if (strchr(RSTRING_PTR(sr), '.') || strchr(RSTRING_PTR(sr), 'e') || strchr(RSTRING_PTR(sr), 'E')) else if (strpbrk(RSTRING_PTR(sr), ".eE"))
r = f_to_f(sr); r = f_to_f(sr);
else else
r = f_to_i(sr); r = f_to_i(sr);
@ -1527,7 +1526,7 @@ string_to_c_internal(VALUE self)
if (!NIL_P(si)) { if (!NIL_P(si)) {
if (strchr(RSTRING_PTR(si), '/')) if (strchr(RSTRING_PTR(si), '/'))
i = f_to_r(si); i = f_to_r(si);
else if (strchr(RSTRING_PTR(si), '.') || strchr(RSTRING_PTR(si), 'e') || strchr(RSTRING_PTR(si), 'E')) else if (strpbrk(RSTRING_PTR(si), ".eE"))
i = f_to_f(si); i = f_to_f(si);
else else
i = f_to_i(si); i = f_to_i(si);

5
test/ruby/test_complex.rb
View File

@ -704,10 +704,6 @@ class Complex_Test < Test::Unit::TestCase
assert_equal(Complex(-0.33), '-0.33'.to_c) assert_equal(Complex(-0.33), '-0.33'.to_c)
assert_equal(Complex(-0.33), '-0.3_3'.to_c) assert_equal(Complex(-0.33), '-0.3_3'.to_c)
assert_equal(Complex(2, 2e4), '2+2e4i'.to_c)
assert_equal(Complex(2e3, 2), '2e3+2i'.to_c)
assert_equal(Complex(2e3, 2e4), '2e3+2e4i'.to_c)
assert_equal(Complex.polar(10,10), '10@10'.to_c) assert_equal(Complex.polar(10,10), '10@10'.to_c)
assert_equal(Complex.polar(-10,-10), '-10@-10'.to_c) assert_equal(Complex.polar(-10,-10), '-10@-10'.to_c)
assert_equal(Complex.polar(10.5,10.5), '10.5@10.5'.to_c) assert_equal(Complex.polar(10.5,10.5), '10.5@10.5'.to_c)
@ -1104,6 +1100,7 @@ class Complex_Test < Test::Unit::TestCase
end end
assert_equal('-1.0-0.0i', Complex(-1.0, -0.0).to_s) assert_equal('-1.0-0.0i', Complex(-1.0, -0.0).to_s)
assert_in_delta(Math::PI, Complex(-0.0).arg, 0.001) assert_in_delta(Math::PI, Complex(-0.0).arg, 0.001)
assert_equal(Complex(2e3, 2e4), '2e3+2e4i'.to_c)
end end
def test_known_bug def test_known_bug