merges r23892 from trunk into ruby_1_9_1.

yugui · yugui · commit 58a4828163a1 · 2010-05-23T13:38:02.000Z
--
	* 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
diff --git a/ChangeLog b/ChangeLog
@@ -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
@@ -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;
diff --git a/version.h b/version.h
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1307,7 +1307,7 @@ float_to_r(VALUE self)`
`1307`	`1307`	`VALUE f, n;`
`1308`	`1308`
`1309`	`1309`	`float_decode_internal(self, &f, &n);`
`1310`		`- return f_mul(f, f_expt(INT2FIX(FLT_RADIX), n));`
	`1310`	`+ return f_to_r(f_mul(f, f_expt(INT2FIX(FLT_RADIX), n)));`
`1311`	`1311`	`}`
`1312`	`1312`
`1313`	`1313`	`static VALUE rat_pat, an_e_pat, a_dot_pat, underscores_pat, an_underscore;`