shyouhei	2007-11-13 03:41:31 +0900 (Tue, 13 Nov 2007)

  New Revision: 13902

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/numeric.c
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/numeric.c
    trunk/version.h

  Log:
    * numeric.c (flo_divmod): round to the nearest integer.  [ ruby-Bugs-14540 ]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/numeric.c?r1=13902&r2=13901
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=13902&r2=13901
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=13902&r2=13901
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13902&r2=13901
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/numeric.c?r1=13902&r2=13901
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=13902&r2=13901

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13901)
+++ ChangeLog	(revision 13902)
@@ -1,3 +1,8 @@
+Tue Nov 13 02:57:04 2007  URABE Shyouhei  <shyouhei@i...>
+
+	* numeric.c (flo_divmod): round to the nearest integer.
+	  [ ruby-Bugs-14540 ]
+
 Tue Nov 13 00:36:16 2007  Shugo Maeda  <shugo@r...>
 
 	* test/ruby/test_settracefunc.rb: fixed tests for set_trace_func.
Index: numeric.c
===================================================================
--- numeric.c	(revision 13901)
+++ numeric.c	(revision 13902)
@@ -715,7 +715,7 @@
     }
     flodivmod(RFLOAT(x)->value, fy, &div, &mod);
     if (FIXABLE(div)) {
-	val = div;
+	val = round(div);
 	a = LONG2FIX(val);
     }
     else {
Index: version.h
===================================================================
--- version.h	(revision 13901)
+++ version.h	(revision 13902)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-11-12"
+#define RUBY_RELEASE_DATE "2007-11-13"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071112
+#define RUBY_RELEASE_CODE 20071113
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 13
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/numeric.c
===================================================================
--- ruby_1_8/numeric.c	(revision 13901)
+++ ruby_1_8/numeric.c	(revision 13902)
@@ -736,7 +736,7 @@
     }
     flodivmod(RFLOAT(x)->value, fy, &div, &mod);
     if (FIXABLE(div)) {
-        val = div;
+        val = round(div);
         a = LONG2FIX(val);
     }
     else {
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 13901)
+++ ruby_1_8/ChangeLog	(revision 13902)
@@ -1,3 +1,8 @@
+Tue Nov 13 02:57:04 2007  URABE Shyouhei  <shyouhei@i...>
+
+	* numeric.c (flo_divmod): round to the nearest integer.
+	  [ ruby-Bugs-14540 ]
+
 Mon Nov 12 16:52:29 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (create_makefile): rdoc about srcprefix.  a patch from
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 13901)
+++ ruby_1_8/version.h	(revision 13902)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-11-12"
+#define RUBY_RELEASE_DATE "2007-11-13"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20071112
+#define RUBY_RELEASE_CODE 20071113
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 13
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml