X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypes%2FType.lhs;h=8f23a35853a489c0a2fc7bb37e1c1d6beab2eed3;hb=474b582b68ea9289f3da4355da816164138604b0;hp=37f915be1dfca92944994916e3bc02fe5a1d3fae;hpb=ff8e1d01524b48e028b09e2b04b2e5303cb6d95f;p=ghc-hetmet.git

diff --git a/compiler/types/Type.lhs b/compiler/types/Type.lhs
index 37f915b..8f23a35 100644
--- a/compiler/types/Type.lhs
+++ b/compiler/types/Type.lhs
@@ -57,7 +57,7 @@ module Type (
 	predTypeRep, mkPredTy, mkPredTys, pprSourceTyCon, mkFamilyTyConApp,
 
 	-- Newtypes
-	splitRecNewType_maybe, newTyConInstRhs,
+	newTyConInstRhs,
 
 	-- Lifting and boxity
 	isUnLiftedType, isUnboxedTupleType, isAlgType, isPrimitiveType,
@@ -122,6 +122,7 @@ import Util
 import Outputable
 import UniqSet
 
+import Data.List
 import Data.Maybe	( isJust )
 \end{code}
 
@@ -406,8 +407,6 @@ splitNewTyConApp_maybe (TyConApp tc tys) = Just (tc, tys)
 splitNewTyConApp_maybe (FunTy arg res)   = Just (funTyCon, [arg,res])
 splitNewTyConApp_maybe other	      = Nothing
 
--- get instantiated newtype rhs, the arguments had better saturate 
--- the constructor
 newTyConInstRhs :: TyCon -> [Type] -> Type
 newTyConInstRhs tycon tys =
     let (tvs, ty) = newTyConRhs tycon in substTyWith tvs tys ty
@@ -449,12 +448,15 @@ repType :: Type -> Type
 repType ty | Just ty' <- coreView ty = repType ty'
 repType (ForAllTy _ ty)  = repType ty
 repType (TyConApp tc tys)
-  | isClosedNewTyCon tc  = -- Recursive newtypes are opaque to coreView
-			   -- but we must expand them here.  Sure to
-			   -- be saturated because repType is only applied
-			   -- to types of kind *
-			   ASSERT( {- isRecursiveTyCon tc && -} tys `lengthIs` tyConArity tc )
-			   repType (new_type_rep tc tys)
+  | isNewTyCon tc
+  , (tvs, rep_ty) <- newTyConRep tc
+  = -- Recursive newtypes are opaque to coreView
+    -- but we must expand them here.  Sure to
+    -- be saturated because repType is only applied
+    -- to types of kind *
+    ASSERT( tys `lengthIs` tyConArity tc )
+    repType (substTyWith tvs tys rep_ty)
+
 repType ty = ty
 
 -- repType' aims to be a more thorough version of repType
@@ -467,12 +469,6 @@ repType' ty -- | pprTrace "repType'" (ppr ty $$ ppr (go1 ty)) False = undefined
         go ty = ty
 
 
--- new_type_rep doesn't ask any questions: 
--- it just expands newtype, whether recursive or not
-new_type_rep new_tycon tys = ASSERT( tys `lengthIs` tyConArity new_tycon )
-			     case newTyConRep new_tycon of
-				 (tvs, rep_ty) -> substTyWith tvs tys rep_ty
-
 -- ToDo: this could be moved to the code generator, using splitTyConApp instead
 -- of inspecting the type directly.
 typePrimRep :: Type -> PrimRep
@@ -487,7 +483,6 @@ typePrimRep ty = case repType ty of
 	-- The reason is that f must have kind *->*, not *->*#, because
 	-- (we claim) there is no way to constrain f's kind any other
 	-- way.
-
 \end{code}
 
 
@@ -631,31 +626,6 @@ pprSourceTyCon tycon
 
 %************************************************************************
 %*									*
-		NewTypes
-%*									*
-%************************************************************************
-
-\begin{code}
-splitRecNewType_maybe :: Type -> Maybe Type
--- Sometimes we want to look through a recursive newtype, and that's what happens here
--- It only strips *one layer* off, so the caller will usually call itself recursively
--- Only applied to types of kind *, hence the newtype is always saturated
-splitRecNewType_maybe ty | Just ty' <- coreView ty = splitRecNewType_maybe ty'
-splitRecNewType_maybe (TyConApp tc tys)
-  | isClosedNewTyCon tc
-  = ASSERT( tys `lengthIs` tyConArity tc )	-- splitRecNewType_maybe only be applied 
-						-- 	to *types* (of kind *)
-    ASSERT( isRecursiveTyCon tc ) 		-- Guaranteed by coreView
-    case newTyConRhs tc of
-	(tvs, rep_ty) -> ASSERT( length tvs == length tys )
-			 Just (substTyWith tvs tys rep_ty)
-	
-splitRecNewType_maybe other = Nothing
-\end{code}
-
-
-%************************************************************************
-%*									*
 \subsection{Kinds and free variables}
 %*									*
 %************************************************************************