Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/b…

…ase into encoding
ghc · May 13, 2011 · 3033499 · 3033499
2 parents ad261e2 + b751723
commit 3033499
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/GHC/Base.lhs b/GHC/Base.lhs
@@ -765,9 +765,6 @@ gtInt, geInt, eqInt, neInt, ltInt, leInt :: Int -> Int -> Bool
 "plusFloat x 0.0"   forall x#. plusFloat#  x#   0.0# = x#
 "plusFloat 0.0 x"   forall x#. plusFloat#  0.0# x#   = x#
 "minusFloat x 0.0"  forall x#. minusFloat# x#   0.0# = x#
-"minusFloat x x"    forall x#. minusFloat# x#   x#   = 0.0#
-"timesFloat x 0.0"  forall x#. timesFloat# x#   0.0# = 0.0#
-"timesFloat0.0 x"   forall x#. timesFloat# 0.0# x#   = 0.0#
 "timesFloat x 1.0"  forall x#. timesFloat# x#   1.0# = x#
 "timesFloat 1.0 x"  forall x#. timesFloat# 1.0# x#   = x#
 "divideFloat x 1.0" forall x#. divideFloat# x#  1.0# = x#
@@ -795,6 +792,12 @@ This gives wrong answer (0) for NaN * 0 (should be NaN):
     "timesDouble x 0.0"  forall x#. (*##) x#    0.0## = 0.0##
 
 These are tested by num014.
+
+Similarly for Float (#5178):
+
+"minusFloat x x"    forall x#. minusFloat# x#   x#   = 0.0#
+"timesFloat0.0 x"   forall x#. timesFloat# 0.0# x#   = 0.0#
+"timesFloat x 0.0"  forall x#. timesFloat# x#   0.0# = 0.0#
 -}
 
 -- Wrappers for the shift operations.  The uncheckedShift# family are