merge revision(s) 35013:

	* numeric.c: fix flodivmod for cornercases [Bug #6044]
	  add ruby_float_mod

	* insns.def (opt_mod): use ruby_float_mod

	* internal.h: declare ruby_float_mod

	* test/ruby/test_float.rb: tests for above

	* test/ruby/envutil.rb: create helper assert_is_minus_zero


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

7 files changed, 51 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index f9b5defad7..63ff30bcd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Fri Mar 30 14:12:53 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* numeric.c: fix flodivmod for cornercases [Bug #6044]
+	  add ruby_float_mod
+
+	* insns.def (opt_mod): use ruby_float_mod
+
+	* internal.h: declare ruby_float_mod
+
+	* test/ruby/test_float.rb: tests for above
+
+	* test/ruby/envutil.rb: create helper assert_is_minus_zero
+
 Wed Mar 28 08:44:24 2012  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/psych/lib/psych.rb: updating version to match gem
diff --git a/insns.def b/insns.def
index 4cd8a08dd3..8f25fdcd07 100644
--- a/insns.def
+++ b/insns.def
@@ -1611,23 +1611,7 @@ opt_mod
 	else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
 		 HEAP_CLASS_OF(obj) == rb_cFloat &&
 		 BASIC_OP_UNREDEFINED_P(BOP_MOD)) {
-	    double x = RFLOAT_VALUE(recv);
-	    double y = RFLOAT_VALUE(obj);
-	    double div, mod;
-
-	    {
-		double z;
-
-		modf(x / y, &z);
-		mod = x - z * y;
-	    }
-
-	    div = (x - mod) / y;
-	    if (y * mod < 0) {
-		mod += y;
-		div -= 1.0;
-	    }
-	    val = DBL2NUM(mod);
+	    val = DBL2NUM(ruby_float_mod(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj)));
 	}
 	else {
 	    goto INSN_LABEL(normal_dispatch);
diff --git a/internal.h b/internal.h
index 681e010668..5d0cff0034 100644
--- a/internal.h
+++ b/internal.h
@@ -130,6 +130,7 @@ void Init_newline(void);
 /* numeric.c */
 int rb_num_to_uint(VALUE val, unsigned int *ret);
 int ruby_float_step(VALUE from, VALUE to, VALUE step, int excl);
+double ruby_float_mod(double x, double y);
 
 /* object.c */
 VALUE rb_obj_equal(VALUE obj1, VALUE obj2);
diff --git a/numeric.c b/numeric.c
index c05aaee8fd..497b93b85d 100644
--- a/numeric.c
+++ b/numeric.c
@@ -817,7 +817,9 @@ flodivmod(double x, double y, double *divp, double *modp)
 #ifdef HAVE_FMOD
     mod = fmod(x, y);
 #else
-    {
+    if((x == 0.0) || (isinf(y) && !isinf(x)))
+        mod = x;
+    else {
 	double z;
 
 	modf(x/y, &z);
@@ -836,6 +838,17 @@ flodivmod(double x, double y, double *divp, double *modp)
     if (divp) *divp = div;
 }
 
+/*
+ * Returns the modulo of division of x by y.
+ * An error will be raised if y == 0.
+ */
+
+double ruby_float_mod(double x, double y) {
+    double mod;
+    flodivmod(x, y, 0, &mod);
+    return mod;
+}
+
 
 /*
  *  call-seq:
@@ -851,7 +864,7 @@ flodivmod(double x, double y, double *divp, double *modp)
 static VALUE
 flo_mod(VALUE x, VALUE y)
 {
-    double fy, mod;
+    double fy;
 
     switch (TYPE(y)) {
       case T_FIXNUM:
@@ -866,8 +879,7 @@ flo_mod(VALUE x, VALUE y)
       default:
 	return rb_num_coerce_bin(x, y, '%');
     }
-    flodivmod(RFLOAT_VALUE(x), fy, 0, &mod);
-    return DBL2NUM(mod);
+    return DBL2NUM(ruby_float_mod(RFLOAT_VALUE(x), fy));
 }
 
 static VALUE
@@ -2648,12 +2660,7 @@ fix_mod(VALUE x, VALUE y)
 	x = rb_int2big(FIX2LONG(x));
 	return rb_big_modulo(x, y);
       case T_FLOAT:
-	{
-	    double mod;
-
-	    flodivmod((double)FIX2LONG(x), RFLOAT_VALUE(y), 0, &mod);
-	    return DBL2NUM(mod);
-	}
+	return DBL2NUM(ruby_float_mod((double)FIX2LONG(x), RFLOAT_VALUE(y)));
       default:
 	return rb_num_coerce_bin(x, y, '%');
     }
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index ef5f65c747..73f0101ac1 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -184,6 +184,10 @@ module Test
         assert(msg === stderr, "warning message #{stderr.inspect} is expected to match #{msg.inspect}")
       end
 
+
+      def assert_is_minus_zero(f)
+        assert(1.0/f == -Float::INFINITY, "#{f} is not -0.0")
+      end
     end
   end
 end
diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb
index c244447bd7..440fd39bbe 100644
--- a/test/ruby/test_float.rb
+++ b/test/ruby/test_float.rb
@@ -195,6 +195,18 @@ class TestFloat < Test::Unit::TestCase
     assert_raise(TypeError) { 2.0.send(:%, nil) }
   end
 
+  def test_modulo3
+    bug6048 = '[ruby-core:42726]'
+    assert_equal(4.2, 4.2.send(:%, Float::INFINITY))
+    assert_equal(4.2, 4.2 % Float::INFINITY)
+    assert_is_minus_zero(-0.0 % 4.2)
+    assert_is_minus_zero(-0.0.send :%, 4.2)
+    assert_raise(ZeroDivisionError) { 4.2.send(:%, 0.0) }
+    assert_raise(ZeroDivisionError) { 4.2 % 0.0 }
+    assert_raise(ZeroDivisionError) { 42.send(:%, 0) }
+    assert_raise(ZeroDivisionError) { 42 % 0 }
+  end
+
   def test_divmod2
     assert_equal([1.0, 0.0], 2.0.divmod(2))
     assert_equal([1.0, 0.0], 2.0.divmod((2**32).coerce(2).first))
diff --git a/version.h b/version.h
index ae37e97371..de2b91efd3 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 168
+#define RUBY_PATCHLEVEL 169
 
-#define RUBY_RELEASE_DATE "2012-03-29"
+#define RUBY_RELEASE_DATE "2012-03-30"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 29
+#define RUBY_RELEASE_DAY 30
 
 #include "ruby/version.h"