X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Fprelude%2FTysPrim.lhs;h=7a316835eaa2df6a0fb5e974ee0020d7dfad0fc7;hb=b00b5bc04ff36a551552470060064f0b7d84ca30;hp=4cb3ef7de401b364895fa728cb9755234f9accfc;hpb=3e0b6b2542d8464bfba365b97a6e4b95c3885f10;p=ghc-hetmet.git diff --git a/compiler/prelude/TysPrim.lhs b/compiler/prelude/TysPrim.lhs index 4cb3ef7..7a31683 100644 --- a/compiler/prelude/TysPrim.lhs +++ b/compiler/prelude/TysPrim.lhs @@ -50,7 +50,7 @@ import OccName ( mkOccNameFS, tcName, mkTyVarOcc ) import TyCon ( TyCon, mkPrimTyCon, mkLiftedPrimTyCon, PrimRep(..) ) import Type ( mkTyConApp, mkTyConTy, mkTyVarTys, mkTyVarTy, - unliftedTypeKind, unboxedTypeKind, + unliftedTypeKind, liftedTypeKind, openTypeKind, Kind, mkArrowKinds, TyThing(..) @@ -103,7 +103,6 @@ mkPrimTc :: FastString -> Unique -> TyCon -> Name mkPrimTc fs uniq tycon = mkWiredInName gHC_PRIM (mkOccNameFS tcName fs) uniq - Nothing -- No parent object (ATyCon tycon) -- Relevant TyCon UserSyntax -- None are built-in syntax @@ -187,17 +186,13 @@ pcPrimTyCon name arity rep = mkPrimTyCon name kind arity rep where kind = mkArrowKinds (replicate arity liftedTypeKind) result_kind - result_kind = case rep of - PtrRep -> unliftedTypeKind - _other -> unboxedTypeKind + result_kind = unliftedTypeKind pcPrimTyCon0 :: Name -> PrimRep -> TyCon pcPrimTyCon0 name rep = mkPrimTyCon name result_kind 0 rep where - result_kind = case rep of - PtrRep -> unliftedTypeKind - _other -> unboxedTypeKind + result_kind = unliftedTypeKind charPrimTy = mkTyConTy charPrimTyCon charPrimTyCon = pcPrimTyCon0 charPrimTyConName WordRep