Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/90054502ed485143893ffbbfff738aff20aa6e8c

>---------------------------------------------------------------

commit 90054502ed485143893ffbbfff738aff20aa6e8c
Author: Ian Lynagh <[email protected]>
Date:   Fri Jun 22 19:40:50 2012 +0100

    Remove a GHC 6.4 workaround

>---------------------------------------------------------------

 compiler/utils/Util.lhs |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/compiler/utils/Util.lhs b/compiler/utils/Util.lhs
index e22cde8..1268c52 100644
--- a/compiler/utils/Util.lhs
+++ b/compiler/utils/Util.lhs
@@ -310,12 +310,7 @@ zipWith4Equal msg _ _  _  _  _  =  panic ("zipWith4Equal: 
unequal lists:"++msg)
 -- | 'zipLazy' is a kind of 'zip' that is lazy in the second list (observe the 
~)
 zipLazy :: [a] -> [b] -> [(a,b)]
 zipLazy []     _       = []
--- We want to write this, but with GHC 6.4 we get a warning, so it
--- doesn't validate:
--- zipLazy (x:xs) ~(y:ys) = (x,y) : zipLazy xs ys
--- so we write this instead:
-zipLazy (x:xs) zs = let y : ys = zs
-                    in (x,y) : zipLazy xs ys
+zipLazy (x:xs) ~(y:ys) = (x,y) : zipLazy xs ys
 \end{code}
 
 



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to