X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Data%2FList.hs;h=a6bff9b9339ce4ea131c14799bb7138738c92d36;hb=be53fabc231ad10e9bc031da3753a24c3fd46f7f;hp=51c4fda76f4e2b1313f004fa59d4a46373a6a715;hpb=c3c216bcbd6ad1b2cb6314d601be93f9e42e5d9c;p=ghc-base.git

diff --git a/Data/List.hs b/Data/List.hs
index 51c4fda..a6bff9b 100644
--- a/Data/List.hs
+++ b/Data/List.hs
@@ -15,9 +15,7 @@
 
 module Data.List
    ( 
-    [] (..)
-
-   , elemIndex	       -- :: (Eq a) => a -> [a] -> Maybe Int
+     elemIndex	       -- :: (Eq a) => a -> [a] -> Maybe Int
    , elemIndices       -- :: (Eq a) => a -> [a] -> [Int]
 
    , find	       -- :: (a -> Bool) -> [a] -> Maybe a
@@ -529,8 +527,8 @@ merge cmp xs [] = xs
 merge cmp [] ys = ys
 merge cmp (x:xs) (y:ys)
  = case x `cmp` y of
-	LT -> x : merge cmp    xs (y:ys)
-	_  -> y : merge cmp (x:xs)   ys
+        GT -> y : merge cmp (x:xs)   ys
+        _  -> x : merge cmp    xs (y:ys)
 
 wrap :: a -> [a]
 wrap x = [x]
@@ -597,6 +595,7 @@ foldl'           :: (a -> b -> a) -> a -> [b] -> a
 foldl' f a []     = a
 foldl' f a (x:xs) = let a' = f a x in a' `seq` foldl' f a' xs
 
+#ifndef __HUGS__
 -- -----------------------------------------------------------------------------
 -- List sum and product
 
@@ -619,3 +618,4 @@ product	l	= prod l 1
     prod []     a = a
     prod (x:xs) a = prod xs (a*x)
 #endif
+#endif  /* __HUGS__ */