merge revision(s) 16641:

shyouhei · shyouhei · commit b25c0d7701b6 · 2008-06-15T14:26:34.000Z
* numeric.c (flo_divmod): Revert the behavior change; do not
	  suppress an exception when div is NaN or Inf. [ruby-dev:34857]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 15 23:26:24 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* numeric.c (flo_divmod): Revert the behavior change; do not
+	  suppress an exception when div is NaN or Inf. [ruby-dev:34857]
+
 Sun Jun 15 23:21:48 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* file.c (BUFCHECK): wrong condition. [ruby-core:16921]
diff --git a/numeric.c b/numeric.c
@@ -760,9 +760,6 @@ flo_divmod(x, y)
         val = round(div);
 	a = LONG2FIX(val);
     }
-    else if (isnan(div) || isinf(div)) {
-	a = rb_float_new(div);
-    }
     else {
 	a = rb_dbl2big(div);
     }
diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 217
+#define RUBY_PATCHLEVEL 218
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

Original file line number	Diff line number	Diff line change
`@@ -760,9 +760,6 @@ flo_divmod(x, y)`
`760`	`760`	`val = round(div);`
`761`	`761`	`a = LONG2FIX(val);`
`762`	`762`	`}`
`763`		`- else if (isnan(div) \|\| isinf(div)) {`
`764`		`- a = rb_float_new(div);`
`765`		`- }`
`766`	`763`	`else {`
`767`	`764`	`a = rb_dbl2big(div);`
`768`	`765`	`}`