X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FdeSugar%2FDsUtils.lhs;h=0552c2bd088ee3beb336f7618ceaacc99480b0f2;hp=4f44eb2db71f636b5a12f9603c4792c0252e3cc5;hb=49c98d143c382a1341e1046f5ca00819a25691ba;hpb=a1433cc95b8165bab8c65090642577dd51720f1f

diff --git a/compiler/deSugar/DsUtils.lhs b/compiler/deSugar/DsUtils.lhs
index 4f44eb2..0552c2b 100644
--- a/compiler/deSugar/DsUtils.lhs
+++ b/compiler/deSugar/DsUtils.lhs
@@ -1,7 +1,9 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
-\section[DsUtils]{Utilities for desugaring}
+
+Utilities for desugaring
 
 This module exports some utility functions of no great interest.
 
@@ -40,45 +42,36 @@ import {-# SOURCE #-}	Match ( matchSimply )
 import {-# SOURCE #-}	DsExpr( dsExpr )
 
 import HsSyn
-import TcHsSyn		( hsLPatType, hsPatType )
+import TcHsSyn
 import CoreSyn
-import Constants	( mAX_TUPLE_SIZE )
+import Constants
 import DsMonad
 
-import CoreUtils	( exprType, mkIfThenElse, mkCoerce, bindNonRec )
-import MkId		( iRREFUT_PAT_ERROR_ID, mkReboxingAlt, unwrapNewTypeBody )
-import Id		( idType, Id, mkWildId, mkTemplateLocals, mkSysLocal )
-import Var		( Var )
-import Name		( Name )
-import Literal		( Literal(..), mkStringLit, inIntRange, tARGET_MAX_INT )
-import TyCon		( isNewTyCon, tyConDataCons, tyConArity )
-import DataCon		( DataCon, dataConSourceArity, dataConTyCon, dataConTag, dataConRepArgTys )
-import Type		( mkFunTy, isUnLiftedType, Type, splitTyConApp, mkTyVarTy,
-                          splitNewTyConApp )
-import Coercion         ( Coercion, mkUnsafeCoercion )
-import TcType		( tcEqType )
-import TysPrim		( intPrimTy )
-import TysWiredIn	( nilDataCon, consDataCon, 
-                          tupleCon, mkTupleTy,
-			  unitDataConId, unitTy,
-                          charTy, charDataCon, 
-                          intTy, intDataCon, 
-			  isPArrFakeCon )
-import BasicTypes	( Boxity(..) )
-import UniqSet		( mkUniqSet, minusUniqSet, isEmptyUniqSet )
-import UniqSupply	( splitUniqSupply, uniqFromSupply, uniqsFromSupply )
-import PrelNames	( unpackCStringName, unpackCStringUtf8Name, 
-			  plusIntegerName, timesIntegerName, smallIntegerDataConName, 
-			  lengthPName, indexPName )
+import CoreUtils
+import MkId
+import Id
+import Var
+import Name
+import Literal
+import TyCon
+import DataCon
+import Type
+import Coercion
+import TysPrim
+import TysWiredIn
+import BasicTypes
+import UniqSet
+import UniqSupply
+import PrelNames
 import Outputable
-import SrcLoc		( Located(..), unLoc )
-import Util             ( isSingleton, zipEqual, sortWith )
-import ListSetOps	( assocDefault )
+import SrcLoc
+import Util
+import ListSetOps
 import FastString
-import Data.Char	( ord )
+import Data.Char
 
 #ifdef DEBUG
-import Util		( notNull )	-- Used in an assertion
+import Util
 #endif
 \end{code}
 
@@ -312,7 +305,7 @@ mkCoAlgCaseMatchResult var ty match_alts
     arg_id1 	= head arg_ids1
     var_ty      = idType var
     (tc, ty_args) = splitNewTyConApp var_ty
-    newtype_rhs = unwrapNewTypeBody tycon ty_args (Var var)
+    newtype_rhs = unwrapNewTypeBody tc ty_args (Var var)
 		
 	-- Stuff for data types
     data_cons      = tyConDataCons tycon