diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-23 13:38:02 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-23 13:38:02 +0000 |
| commit | 58a4828163a15e496410b0803866f1b80c7545a4 (patch) | |
| tree | 004c1d50b1c0da1eb0b7a046e56b05822bfd4b43 | |
| parent | ba595fe918f57f851b117926db9be1087c881de1 (diff) | |
| download | ruby-58a4828163a15e496410b0803866f1b80c7545a4.tar.gz | |
merges r23892 from trunk into ruby_1_9_1.
--
* rational.c (float_to_r): always returns rational.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@27982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | rational.c | 2 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Mon Jun 29 20:29:11 2009 Tadayoshi Funaba <tadf@dotrb.org> + + * rational.c (float_to_r): always returns rational. + Sun Jul 19 20:41:24 2009 Tadayoshi Funaba <tadf@dotrb.org> * complex.c (make_patterns): do not use \d. diff --git a/rational.c b/rational.c index 92d884d8d5..0c37fb8330 100644 --- a/rational.c +++ b/rational.c @@ -1307,7 +1307,7 @@ float_to_r(VALUE self) VALUE f, n; float_decode_internal(self, &f, &n); - return f_mul(f, f_expt(INT2FIX(FLT_RADIX), n)); + return f_to_r(f_mul(f, f_expt(INT2FIX(FLT_RADIX), n))); } static VALUE rat_pat, an_e_pat, a_dot_pat, underscores_pat, an_underscore; @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 426 +#define RUBY_PATCHLEVEL 427 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |