From: simonpj@microsoft.com <unknown>
Date: Thu, 17 Aug 2006 13:20:03 +0000 (+0000)
Subject: Update lhs-boot files
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=ad192ab08564152e226535c179778a896598eac2;p=ghc-hetmet.git

Update lhs-boot files

A consequence of my recent meddling with hs-boot files is that GHC is
more picky about the correpondence between the hs-boot file and the hs file.
In particular, you must use the same type synonyms.

This patche fixes up GHC's own hs-boot files to match the restriction.
---

diff --git a/compiler/deSugar/Match.lhs-boot b/compiler/deSugar/Match.lhs-boot
index 5f99f5c..28f5136 100644
--- a/compiler/deSugar/Match.lhs-boot
+++ b/compiler/deSugar/Match.lhs-boot
@@ -1,14 +1,14 @@
 \begin{code}
 module Match where
 import Var	( Id )
-import TcType	( TcType )
+import TcType	( Type )
 import DsMonad	( DsM, EquationInfo, MatchResult )
 import CoreSyn	( CoreExpr )
 import HsSyn	( LPat, HsMatchContext, MatchGroup )
 import Name	( Name )
 
 match 	:: [Id]
-        -> TcType
+        -> Type
 	-> [EquationInfo]
 	-> DsM MatchResult
 
@@ -29,7 +29,7 @@ matchSinglePat
 	:: CoreExpr
 	-> HsMatchContext Name
 	-> LPat Id
-        -> TcType
+        -> Type
 	-> MatchResult
 	-> DsM MatchResult
 \end{code}
diff --git a/compiler/typecheck/TcMatches.lhs-boot b/compiler/typecheck/TcMatches.lhs-boot
index 18a79fa..0afe7d2 100644
--- a/compiler/typecheck/TcMatches.lhs-boot
+++ b/compiler/typecheck/TcMatches.lhs-boot
@@ -2,16 +2,15 @@
 module TcMatches where
 import HsSyn	( GRHSs, MatchGroup, ExprCoFn )
 import Name	( Name )
-import Var	( Id )
 import TcType	( BoxyRhoType )
-import TcRnTypes( TcM )
+import TcRnTypes( TcM, TcId )
 
 tcGRHSsPat    :: GRHSs Name
 	      -> BoxyRhoType
-	      -> TcM (GRHSs Id)
+	      -> TcM (GRHSs TcId)
 
 tcMatchesFun :: Name
 	     -> MatchGroup Name
 	     -> BoxyRhoType
-	     -> TcM (ExprCoFn, MatchGroup Id)
+	     -> TcM (ExprCoFn, MatchGroup TcId)
 \end{code}
diff --git a/compiler/typecheck/TcUnify.lhs-boot b/compiler/typecheck/TcUnify.lhs-boot
index 8a1847e..b39573e 100644
--- a/compiler/typecheck/TcUnify.lhs-boot
+++ b/compiler/typecheck/TcUnify.lhs-boot
@@ -1,11 +1,11 @@
 \begin{code}
 module TcUnify where
-import TcType	( TcTauType, BoxyType )
+import TcType	( TcTauType, BoxySigmaType )
 import TcRnTypes( TcM )
 
 -- This boot file exists only to tie the knot between
 --		TcUnify and TcSimplify
 
 unifyType :: TcTauType -> TcTauType -> TcM ()
-zapToMonotype :: BoxyType -> TcM TcTauType
+zapToMonotype :: BoxySigmaType -> TcM TcTauType
 \end{code}