X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FdeSugar%2FDsMonad.lhs;h=1238b1a2b54466e016fac1bd71246ee06c150c3c;hb=5723262f616ac02ddf637f6ff480a599c737ea0d;hp=11be59c54da4d5ef94cb637c1231fbfb9512e6e6;hpb=c5dbdf06b92472ef64b66a01f107ba30b65c3708;p=ghc-hetmet.git

diff --git a/compiler/deSugar/DsMonad.lhs b/compiler/deSugar/DsMonad.lhs
index 11be59c..1238b1a 100644
--- a/compiler/deSugar/DsMonad.lhs
+++ b/compiler/deSugar/DsMonad.lhs
@@ -9,7 +9,7 @@
 module DsMonad (
 	DsM, mapM, mapAndUnzipM,
 	initDs, initDsTc, fixDs,
-	foldlM, foldrM, ifOptM,
+	foldlM, foldrM, ifDOptM, unsetOptM,
 	Applicative(..),(<$>),
 
 	newLocalName,
@@ -72,7 +72,6 @@ import Data.IORef
 \begin{code}
 data DsMatchContext
   = DsMatchContext (HsMatchContext Name) SrcSpan
-  | NoMatchContext
   deriving ()
 
 data EquationInfo
@@ -221,8 +220,8 @@ it easier to read debugging output.
 
 \begin{code}
 -- Make a new Id with the same print name, but different type, and new unique
-newUniqueId :: Name -> Type -> DsM Id
-newUniqueId id = mkSysLocalM (occNameFS (nameOccName id))
+newUniqueId :: Id -> Type -> DsM Id
+newUniqueId id = mkSysLocalM (occNameFS (nameOccName (idName id)))
 
 duplicateLocalDs :: Id -> DsM Id
 duplicateLocalDs old_local 
@@ -327,8 +326,7 @@ dsLoadModule :: SDoc -> Module -> DsM ()
 dsLoadModule doc mod
   = do { env <- getGblEnv
        ; setEnvs (ds_if_env env)
-                 (loadSysInterface doc mod)
-       ; return ()
+                 (loadSysInterface doc mod >> return ())
        }
 \end{code}