Merge branch 'no-pred-ty'

Conflicts:
	compiler/iface/BuildTyCl.lhs
	compiler/iface/MkIface.lhs
	compiler/iface/TcIface.lhs
	compiler/typecheck/TcTyClsDecls.lhs
	compiler/types/Class.lhs
	compiler/utils/Util.lhs

1 files changed, 10 insertions, 1 deletions

diff --git a/compiler/utils/Util.lhs b/compiler/utils/Util.lhs
index ef36e8a9e3..5ce405bef1 100644
--- a/compiler/utils/Util.lhs
+++ b/compiler/utils/Util.lhs
@@ -32,6 +32,7 @@ module Util (
 
         -- * Tuples
         fstOf3, sndOf3, thirdOf3,
+        firstM, first3M,
         uncurry3,
 
         -- * List operations controlled by another list
@@ -105,7 +106,7 @@ import Data.List        hiding (group)
 import FastTypes
 #endif
 
-import Control.Monad    ( unless )
+import Control.Monad    ( unless, liftM )
 import System.IO.Error as IO ( isDoesNotExistError )
 import System.Directory ( doesDirectoryExist, createDirectory,
                           getModificationTime )
@@ -214,6 +215,14 @@ uncurry3 :: (a -> b -> c -> d) -> (a, b, c) -> d
 uncurry3 f (a, b, c) = f a b c
 \end{code}
 
+\begin{code}
+firstM :: Monad m => (a -> m c) -> (a, b) -> m (c, b)
+firstM f (x, y) = liftM (\x' -> (x', y)) (f x)
+
+first3M :: Monad m => (a -> m d) -> (a, b, c) -> m (d, b, c)
+first3M f (x, y, z) = liftM (\x' -> (x', y, z)) (f x)
+\end{code}
+
 %************************************************************************
 %*                                                                      *
 \subsection[Utils-lists]{General list processing}