X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fprelude%2FTysWiredIn.lhs;h=278e333ce4d54f34973b26b8fd7ba80ecbbf9e84;hb=2eb04ca0f8d0ec72b417cddc60672c696b4a3daa;hp=436b121adcf2862129cd4d86814f92d3710462d4;hpb=b00b5bc04ff36a551552470060064f0b7d84ca30;p=ghc-hetmet.git

diff --git a/compiler/prelude/TysWiredIn.lhs b/compiler/prelude/TysWiredIn.lhs
index 436b121..278e333 100644
--- a/compiler/prelude/TysWiredIn.lhs
+++ b/compiler/prelude/TysWiredIn.lhs
@@ -38,9 +38,10 @@ module TysWiredIn (
 	unitTyCon, unitDataCon, unitDataConId, pairTyCon, 
 	unboxedSingletonTyCon, unboxedSingletonDataCon,
 	unboxedPairTyCon, unboxedPairDataCon,
+       
+        boxedTupleArr, unboxedTupleArr,
 
 	unitTy,
-	voidTy,
 
         -- parallel arrays
 	mkPArrTy,
@@ -68,7 +69,7 @@ import DataCon		( DataCon, mkDataCon, dataConWorkId, dataConSourceArity )
 import Var		( TyVar, tyVarKind )
 import TyCon		( TyCon, AlgTyConRhs(DataTyCon), tyConDataCons,
 			  mkTupleTyCon, mkAlgTyCon, tyConName,
-			  AlgTyConParent(NoParentTyCon) )
+			  TyConParent(NoParentTyCon) )
 
 import BasicTypes	( Arity, RecFlag(..), Boxity(..), isBoxed,
 			  StrictnessMark(..) )
@@ -308,22 +309,6 @@ unboxedPairDataCon = tupleCon   Unboxed 2
 %************************************************************************
 
 \begin{code}
--- The Void type is represented as a data type with no constructors
--- It's a built in type (i.e. there's no way to define it in Haskell;
---	the nearest would be
---
---		data Void =		-- No constructors!
---
--- ) It's lifted; there is only one value of this
--- type, namely "void", whose semantics is just bottom.
---
--- Haskell 98 drops the definition of a Void type, so we just 'simulate'
--- voidTy using ().
-voidTy = unitTy
-\end{code}
-
-
-\begin{code}
 charTy = mkTyConTy charTyCon
 
 charTyCon   = pcNonRecDataTyCon charTyConName [] [charDataCon]
@@ -495,7 +480,7 @@ done by enumeration\srcloc{lib/prelude/InTup?.hs}.
 mkTupleTy :: Boxity -> Int -> [Type] -> Type
 mkTupleTy boxity arity tys = mkTyConApp (tupleTyCon boxity arity) tys
 
-unitTy    = mkTupleTy Boxed 0 []
+unitTy = mkTupleTy Boxed 0 []
 \end{code}
 
 %************************************************************************