X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcType.lhs;h=aa0b0c988062ec9ba862f0cf61f17269ba8d97ef;hb=366e8db02ab7a5bb5316699bff397d06e47891b2;hp=c10c2eb91408b11ff542f018df2e22ac6c6e147e;hpb=2fff69381d951c08a42e512722c3633d9ba556d0;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcType.lhs b/compiler/typecheck/TcType.lhs
index c10c2eb..aa0b0c9 100644
--- a/compiler/typecheck/TcType.lhs
+++ b/compiler/typecheck/TcType.lhs
@@ -1,4 +1,5 @@
-
+%
+% (c) The University of Glasgow 2006
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
 \section[TcType]{Types used in the typechecker}
@@ -68,7 +69,7 @@ module TcType (
   isClassPred, isTyVarClassPred, isEqPred, 
   mkDictTy, tcSplitPredTy_maybe, 
   isPredTy, isDictTy, tcSplitDFunTy, tcSplitDFunHead, predTyUnique, 
-  mkClassPred, isInheritablePred, isLinearPred, isIPPred, mkPredName, 
+  mkClassPred, isInheritablePred, isIPPred, mkPredName, 
   dataConsStupidTheta, isRefineableTy,
 
   ---------------------------------
@@ -129,71 +130,33 @@ module TcType (
 #include "HsVersions.h"
 
 -- friends:
-import TypeRep		( Type(..), funTyCon, Kind )  -- friend
-
-import Type		(	-- Re-exports
-			  tyVarsOfType, tyVarsOfTypes, tyVarsOfPred,
-			  tyVarsOfTheta, Kind, PredType(..), KindVar,
-			  ThetaType, isUnliftedTypeKind, unliftedTypeKind, 
-			  argTypeKind,
-			  liftedTypeKind, openTypeKind, mkArrowKind,
-		  	  tySuperKind, isLiftedTypeKind,
-			  mkArrowKinds, mkForAllTy, mkForAllTys,
-			  defaultKind, isSubArgTypeKind, isSubOpenTypeKind,
-			  mkFunTy, mkFunTys, zipFunTys, 
-			  mkTyConApp, mkAppTy,
-			  mkAppTys, applyTy, applyTys,
-			  mkTyVarTy, mkTyVarTys, mkTyConTy, mkPredTy,
-			  mkPredTys, isUnLiftedType, 
-			  isUnboxedTupleType, isPrimitiveType,
-			  splitTyConApp_maybe,
-			  tidyTopType, tidyType, tidyPred, tidyTypes,
-			  tidyFreeTyVars, tidyOpenType, tidyOpenTypes,
-			  tidyTyVarBndr, tidyOpenTyVar,
-			  tidyOpenTyVars, tidyKind,
-			  isSubKind, tcView,
-
-			  tcEqType, tcEqTypes, tcCmpType, tcCmpTypes, 
-			  tcEqPred, tcCmpPred, tcEqTypeX, eqKind,
-
-			  TvSubst(..),
-			  TvSubstEnv, emptyTvSubst, mkTvSubst, zipTyEnv,
-			  mkOpenTvSubst, zipOpenTvSubst, zipTopTvSubst, mkTopTvSubst,
-			  getTvSubstEnv, setTvSubstEnv, getTvInScope, extendTvInScope,
-			  extendTvSubst, extendTvSubstList, isInScope, notElemTvSubst,
-		  	  substTy, substTys, substTyWith, substTheta, 
-			  substTyVar, substTyVarBndr, substPred, lookupTyVar,
-
-			  typeKind, repType, coreView, repSplitAppTy_maybe,
-			  pprKind, pprParendKind,
-			  pprType, pprParendType, pprTyThingCategory,
-			  pprPred, pprTheta, pprThetaArrow, pprClassPred
-			)
-import TyCon		( TyCon, isUnLiftedTyCon, isSynTyCon, isOpenTyCon,
-			  synTyConDefn, tyConUnique )	 
-import DataCon		( DataCon, dataConStupidTheta, dataConResTys )
-import Class		( Class )
-import Var		( TyVar, Id, isCoVar, isTcTyVar, mkTcTyVar, tyVarName, tyVarKind, tcTyVarDetails )
-import ForeignCall	( Safety, DNType(..) )
-import Unify		( tcMatchTys )
+import TypeRep
+import DataCon
+import Class
+import Var
+import ForeignCall
+import Unify
 import VarSet
+import Type
+import TyCon
 
 -- others:
-import DynFlags		( DynFlags, DynFlag( Opt_GlasgowExts ), dopt )
-import Name		( Name, NamedThing(..), mkInternalName, getSrcLoc, mkSystemName )
+import DynFlags
+import Name
 import NameSet
-import VarEnv		( TidyEnv )
-import OccName		( OccName, mkDictOcc, mkOccName, tvName )
-import PrelNames	-- Lots (e.g. in isFFIArgumentTy)
-import TysWiredIn	( unitTyCon, charTyCon, listTyCon )
-import BasicTypes	( IPName(..), Arity, ipNameName )
-import SrcLoc		( SrcLoc, SrcSpan )
-import Util		( equalLength )
-import Maybes		( maybeToBool, expectJust, mapCatMaybes )
-import ListSetOps	( hasNoDups )
-import List		( nubBy )
+import VarEnv
+import OccName
+import PrelNames
+import TysWiredIn
+import BasicTypes
+import SrcLoc
+import Util
+import Maybes
+import ListSetOps
 import Outputable
-import DATA_IOREF
+
+import Data.List
+import Data.IORef
 \end{code}
 
 
@@ -698,10 +661,14 @@ tcMultiSplitSigmaTy sigma
 
 -----------------------
 tcTyConAppTyCon :: Type -> TyCon
-tcTyConAppTyCon ty = fst (tcSplitTyConApp ty)
+tcTyConAppTyCon ty = case tcSplitTyConApp_maybe ty of
+			Just (tc, _) -> tc
+			Nothing	     -> pprPanic "tcTyConAppTyCon" (pprType ty)
 
 tcTyConAppArgs :: Type -> [Type]
-tcTyConAppArgs ty = snd (tcSplitTyConApp ty)
+tcTyConAppArgs ty = case tcSplitTyConApp_maybe ty of
+			Just (_, args) -> args
+			Nothing	       -> pprPanic "tcTyConAppArgs" (pprType ty)
 
 tcSplitTyConApp :: Type -> (TyCon, [Type])
 tcSplitTyConApp ty = case tcSplitTyConApp_maybe ty of
@@ -712,17 +679,9 @@ tcSplitTyConApp_maybe :: Type -> Maybe (TyCon, [Type])
 tcSplitTyConApp_maybe ty | Just ty' <- tcView ty = tcSplitTyConApp_maybe ty'
 tcSplitTyConApp_maybe (TyConApp tc tys) = Just (tc, tys)
 tcSplitTyConApp_maybe (FunTy arg res)   = Just (funTyCon, [arg,res])
-tcSplitTyConApp_maybe (AppTy arg res)   = Just (funTyCon, [arg,res])
 	-- Newtypes are opaque, so they may be split
 	-- However, predicates are not treated
 	-- as tycon applications by the type checker
-
--- XXX - 2006-09-24: This case is hard-coded in (rendering predicates opaque as well)
---       to make the newly reworked newtype-deriving work on the trivial case:
---              newtype T = T () deriving (Eq, Ord)
---       Please remove this if the newtype-deriving scheme no longer produces a PredTy.
-tcSplitTyConApp_maybe (PredTy (ClassP _ [ty']))   = tcSplitTyConApp_maybe ty'
-
 tcSplitTyConApp_maybe other	      	= Nothing
 
 -----------------------
@@ -868,10 +827,6 @@ getClassPredTys :: PredType -> (Class, [Type])
 getClassPredTys (ClassP clas tys) = (clas, tys)
 getClassPredTys other = panic "getClassPredTys"
 
-isEqPred :: PredType -> Bool
-isEqPred (EqPred {}) = True
-isEqPred _	     = False
-
 mkDictTy :: Class -> [Type] -> Type
 mkDictTy clas tys = mkPredTy (ClassP clas tys)
 
@@ -899,10 +854,6 @@ isInheritablePred :: PredType -> Bool
 -- which can be free in g's rhs, and shared by both calls to g
 isInheritablePred (ClassP _ _) = True
 isInheritablePred other	     = False
-
-isLinearPred :: TcPredType -> Bool
-isLinearPred (IParam (Linear n) _) = True
-isLinearPred other		   = False
 \end{code}
 
 --------------------- Equality predicates ---------------------------------