X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcDefaults.lhs;h=ad5e9b86a6fa37ebaf929247f2e803b2057019de;hb=4a305e63d409e00417ee68912b564ab7887d653b;hp=6bd8b4a3a32faf63d11959ae4ff04c06ed0f8b3f;hpb=041c35e5d9f3aefab6908b4c776a3fd8242720ab;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcDefaults.lhs b/compiler/typecheck/TcDefaults.lhs
index 6bd8b4a..ad5e9b8 100644
--- a/compiler/typecheck/TcDefaults.lhs
+++ b/compiler/typecheck/TcDefaults.lhs
@@ -5,6 +5,13 @@
 \section[TcDefaults]{Typechecking \tr{default} declarations}
 
 \begin{code}
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 module TcDefaults ( tcDefaults ) where
 
 #include "HsVersions.h"
@@ -22,6 +29,7 @@ import DynFlags
 import SrcLoc
 import Maybe
 import Outputable
+import FastString
 \end{code}
 
 \begin{code}
@@ -31,7 +39,7 @@ tcDefaults :: [LDefaultDecl Name]
 				    -- in Disambig.
 
 tcDefaults [] 
-  = getDefaultTys		-- No default declaration, so get the
+  = getDeclaredDefaultTys	-- No default declaration, so get the
 				-- default types from the envt; 
 				-- i.e. use the curent ones
 				-- (the caller will put them back there)
@@ -43,7 +51,7 @@ tcDefaults []
 	-- defaultDefaultTys
 
 tcDefaults [L locn (DefaultDecl [])]
-  = returnM (Just [])		-- Default declaration specifying no types
+  = return (Just [])		-- Default declaration specifying no types
 
 tcDefaults [L locn (DefaultDecl mono_tys)]
   = setSrcSpan locn 			$
@@ -54,7 +62,7 @@ tcDefaults [L locn (DefaultDecl mono_tys)]
 	; let deflt_clss | ovl_str   = [num_class, is_str_class]
 			 | otherwise = [num_class]
 
-	; tau_tys <- mappM (tc_default_ty deflt_clss) mono_tys
+	; tau_tys <- mapM (tc_default_ty deflt_clss) mono_tys
     
 	; return (Just tau_tys) }