archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r20546 from trunk into ruby-1_9_1.

Browse source 
* complex.c: inpsect should not depend on to_s.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20557 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-12-05 13:34:55 +00:00
parent 28053a8867
commit a0b0c4e51e
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
complex.c
View file

@ -910,7 +910,7 @@ f_tpositive_p(VALUE x)
}
static VALUE
nucomp_to_s(VALUE self)
nucomp_format(VALUE self, VALUE (*func)(VALUE))
{
VALUE s, impos;
@ -918,10 +918,10 @@ nucomp_to_s(VALUE self)
impos = f_tpositive_p(dat->imag);
s = f_to_s(dat->real);
s = (*func)(dat->real);
rb_str_cat2(s, !impos ? "-" : "+");
rb_str_concat(s, f_to_s(f_abs(dat->imag)));
rb_str_concat(s, (*func)(f_abs(dat->imag)));
if (!rb_isdigit(RSTRING_PTR(s)[RSTRING_LEN(s) - 1]))
rb_str_cat2(s, "*");
rb_str_cat2(s, "i");
@ -929,13 +929,19 @@ nucomp_to_s(VALUE self)
return s;
}
static VALUE
nucomp_to_s(VALUE self)
{
return nucomp_format(self, f_to_s);
}
static VALUE
nucomp_inspect(VALUE self)
{
VALUE s;
s = rb_str_new2("(");
rb_str_concat(s, nucomp_to_s(self));
rb_str_concat(s, nucomp_format(self, f_inspect));
rb_str_cat2(s, ")");
return s;