diff options
| author | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-22 12:27:54 +0000 |
|---|---|---|
| committer | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-22 12:27:54 +0000 |
| commit | 8f40b265811a23eef5b8c9e0b677b7d15cd6ea45 (patch) | |
| tree | 87500a4a23ee3748c74aff1f750eacef665b9cca /rational.c | |
| parent | 2d302dfd40ee9a4b3183415b19dbc22cf9106ba3 (diff) | |
* complex.c (nucomp_div): now behaves as quo.
* complex.c (nucomp_s_generic_p): has been removed.
* complex.c (nucomp_to_s): adopts new form.
* complex.c (nucomp_inspect): ditto.
* complex.c (string_to_c_internal): ditto and supports polar form.
* complex.c (rb_complex_polar): new.
* rational.c (nurat_to_s): did not canonicalize.
* rational.c (nurat_inspect): adopts new form.
* rational.c (string_to_r_internal): ditto.
* include/ruby/intern.h: added a declaration.
* lib/complex.rb: added an obsolate class method.
* lib/cmath.rb: use scalar? instead of generic?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'rational.c')
| -rw-r--r-- | rational.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/rational.c b/rational.c index 19bb037be1..1a0f4cbabc 100644 --- a/rational.c +++ b/rational.c @@ -1117,9 +1117,6 @@ static VALUE nurat_to_s(VALUE self) { get_dat1(self); - - if (f_one_p(dat->den)) - return f_to_s(dat->num); return rb_funcall(rb_mKernel, id_format, 3, rb_str_new2("%d/%d"), dat->num, dat->den); } @@ -1129,7 +1126,7 @@ nurat_inspect(VALUE self) { get_dat1(self); return rb_funcall(rb_mKernel, id_format, 3, - rb_str_new2("Rational(%d, %d)"), dat->num, dat->den); + rb_str_new2("(%d/%d)"), dat->num, dat->den); } static VALUE @@ -1234,7 +1231,7 @@ static VALUE rat_pat, an_e_pat, a_dot_pat, underscores_pat, an_underscore; #define DIGITS "(?:\\d(?:_\\d|\\d)*)" #define NUMERATOR "(?:" DIGITS "?\\.)?" DIGITS "(?:[eE][-+]?" DIGITS ")?" -#define DENOMINATOR "[-+]?" DIGITS +#define DENOMINATOR DIGITS #define PATTERN "\\A([-+])?(" NUMERATOR ")(?:\\/(" DENOMINATOR "))?" static void |