Module header tidyup, phase 1

[ghc-hetmet.git] / compiler / typecheck / TcArrows.lhs

diff --git a/compiler/typecheck/TcArrows.lhs b/compiler/typecheck/TcArrows.lhs
index b4afcaf..57cb48c 100644 (file)
--- a/compiler/typecheck/TcArrows.lhs
+++ b/compiler/typecheck/TcArrows.lhs
@@ -1,7 +1,8 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
-\section{Typecheck arrow notation}
+Typecheck arrow notation
 
 \begin{code}
 module TcArrows ( tcProc ) where
@@ -11,32 +12,28 @@ module TcArrows ( tcProc ) where
 import {-# SOURCE #-}  TcExpr( tcMonoExpr, tcInferRho )
 
 import HsSyn
-import TcHsSyn (  mkHsDictLet )
-
-import TcMatches ( matchCtxt, tcStmts, tcMDoStmt, tcGuardStmt,
-                  TcMatchCtxt(..), tcMatchesCase )
-
-import TcType  ( TcType, TcTauType, BoxyRhoType, mkFunTys, mkTyConApp,
-                 mkTyVarTy, mkAppTys, tcSplitTyConApp_maybe, tcEqType, 
-                 SkolemInfo(..) )
-import TcMType ( newFlexiTyVarTy, tcInstSkolTyVars, zonkTcType )
-import TcBinds ( tcLocalBinds )
-import TcSimplify ( tcSimplifyCheck )
-import TcGadt  ( Refinement, emptyRefinement, refineResType )
-import TcPat   ( tcLamPat, tcLamPats )
-import TcUnify ( checkSigTyVarsWrt, boxySplitAppTy )
+import TcHsSyn
+
+import TcMatches
+
+import TcType
+import TcMType
+import TcBinds
+import TcSimplify
+import TcGadt
+import TcPat
+import TcUnify
 import TcRnMonad
-import Inst    ( tcSyntaxName )
-import Name    ( Name )
-import TysWiredIn ( boolTy, pairTyCon )
+import Inst
+import Name
+import TysWiredIn
 import VarSet 
-import TysPrim ( alphaTyVar )
-import Type    ( Kind, mkArrowKinds, liftedTypeKind, openTypeKind, tyVarsOfTypes )
+import TysPrim
+import Type
 
-import SrcLoc  ( Located(..), noLoc, unLoc )
+import SrcLoc
 import Outputable
-import Util    ( lengthAtLeast )
-
+import Util
 \end{code}
 
 %************************************************************************
@@ -101,7 +98,7 @@ tcGuardedCmd :: CmdEnv -> LHsExpr Name -> CmdStack
 tcGuardedCmd env expr stk (reft, res_ty)
   = do { let (co, res_ty') = refineResType reft res_ty
        ; body <- tcCmd env expr (stk, res_ty')
-       ; return (mkLHsCoerce co body) }
+       ; return (mkLHsWrap co body) }
 
 tcCmd :: CmdEnv -> LHsExpr Name -> (CmdStack, TcTauType) -> TcM (LHsExpr TcId)
        -- The main recursive function
@@ -264,7 +261,7 @@ tc_cmd env cmd@(HsArrForm expr fixity cmd_args) (cmd_stk, res_ty)
                -- the s1..sm and check each cmd
        ; cmds' <- mapM (tc_cmd w_tv) cmds_w_tys
 
-       ; returnM (HsArrForm (noLoc $ HsCoerce (CoTyLams [w_tv]) 
+       ; returnM (HsArrForm (noLoc $ HsWrap (WpTyLam w_tv) 
                                               (unLoc $ mkHsDictLet inst_binds expr')) 
                             fixity cmds')
        }