X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FhsSyn%2FHsTypes.lhs;h=0ea040cbaf8b023db07e3aa8ee56d5b2db9e8c5f;hb=943fd134e2c2f2d59c36cdc88799301c4a18575c;hp=bd5178112fcf0818e6e04409b53251cb7bb9001d;hpb=01e0566e61e4222600c7ba0a2d35d6102fd1afb5;p=ghc-hetmet.git diff --git a/ghc/compiler/hsSyn/HsTypes.lhs b/ghc/compiler/hsSyn/HsTypes.lhs index bd51781..0ea040c 100644 --- a/ghc/compiler/hsSyn/HsTypes.lhs +++ b/ghc/compiler/hsSyn/HsTypes.lhs @@ -5,11 +5,12 @@ \begin{code} module HsTypes ( - HsType(..), HsUsageAnn(..), HsTyVarBndr(..), + HsType(..), HsTyVarBndr(..), , HsContext, HsPred(..) , HsTupCon(..), hsTupParens, mkHsTupCon, + , hsUsOnce, hsUsMany - , mkHsForAllTy, mkHsUsForAllTy, mkHsDictTy, mkHsIParamTy + , mkHsForAllTy, mkHsDictTy, mkHsIParamTy , hsTyVarName, hsTyVarNames, replaceTyVarName -- Printing @@ -27,17 +28,20 @@ module HsTypes ( import Class ( FunDep ) import Type ( Type, Kind, PredType(..), ClassContext, - splitSigmaTy, unUsgTy, boxedTypeKind + splitSigmaTy, boxedTypeKind ) import TypeRep ( Type(..), TyNote(..) ) -- toHsType sees the representation -import TyCon ( isTupleTyCon, tupleTyConBoxity, tyConArity ) -import RdrName ( RdrName ) +import TyCon ( isTupleTyCon, tupleTyConBoxity, tyConArity, getSynTyConDefn ) +import RdrName ( RdrName, mkUnqual ) import Name ( Name, getName ) -import OccName ( NameSpace ) +import OccName ( NameSpace, tvName ) import Var ( TyVar, tyVarKind ) +import Subst ( mkTyVarSubst, substTy ) import PprType ( {- instance Outputable Kind -}, pprParendKind ) -import BasicTypes ( Boxity(..), tupleParens ) -import PrelNames ( mkTupConRdrName, listTyConKey, hasKey ) +import BasicTypes ( Boxity(..), Arity, tupleParens ) +import PrelNames ( mkTupConRdrName, listTyConKey, usOnceTyConKey, usManyTyConKey, hasKey, + usOnceTyConName, usManyTyConName + ) import FiniteMap import Outputable @@ -73,30 +77,33 @@ data HsType name | HsNumTy Integer -- these next two are only used in interfaces | HsPredTy (HsPred name) + + | HsUsageTy (HsType name) -- Usage annotation + (HsType name) -- Annotated type - | HsUsgTy (HsUsageAnn name) - (HsType name) - | HsUsgForAllTy name - (HsType name) +----------------------- +hsUsOnce, hsUsMany :: HsType RdrName +hsUsOnce = HsTyVar (mkUnqual tvName SLIT(".")) -- deep magic +hsUsMany = HsTyVar (mkUnqual tvName SLIT("!")) -- deep magic -data HsUsageAnn name - = HsUsOnce - | HsUsMany - | HsUsVar name - +hsUsOnce_Name, hsUsMany_Name :: HsType Name +hsUsOnce_Name = HsTyVar usOnceTyConName +hsUsMany_Name = HsTyVar usManyTyConName ----------------------- -data HsTupCon name = HsTupCon name Boxity +data HsTupCon name = HsTupCon name Boxity Arity instance Eq name => Eq (HsTupCon name) where - (HsTupCon _ b1) == (HsTupCon _ b2) = b1==b2 + (HsTupCon _ b1 a1) == (HsTupCon _ b2 a2) = b1==b2 && a1==a2 mkHsTupCon :: NameSpace -> Boxity -> [a] -> HsTupCon RdrName -mkHsTupCon space boxity args = HsTupCon (mkTupConRdrName space boxity (length args)) boxity +mkHsTupCon space boxity args = HsTupCon (mkTupConRdrName space boxity arity) boxity arity + where + arity = length args hsTupParens :: HsTupCon name -> SDoc -> SDoc -hsTupParens (HsTupCon _ b) p = tupleParens b p +hsTupParens (HsTupCon _ b _) p = tupleParens b p ----------------------- -- Combine adjacent for-alls. @@ -116,9 +123,6 @@ mkHsForAllTy mtvs1 [] (HsForAllTy mtvs2 ctxt ty) = mkHsForAllTy (mtvs1 `plus (Just tvs1) `plus` (Just tvs2) = Just (tvs1 ++ tvs2) mkHsForAllTy tvs ctxt ty = HsForAllTy tvs ctxt ty -mkHsUsForAllTy uvs ty = foldr (\ uv ty -> HsUsgForAllTy uv ty) - ty uvs - mkHsDictTy cls tys = HsPredTy (HsPClass cls tys) mkHsIParamTy v ty = HsPredTy (HsPIParam v ty) @@ -173,6 +177,8 @@ pprHsForAll tvs cxt = getPprStyle $ \ sty -> if userStyle sty then ptext SLIT("forall") <+> interppSP tvs <> dot <+> + -- **! ToDo: want to hide uvars from user, but not enough info + -- in a HsTyVarBndr name (see PprType). KSW 2000-10. (if null cxt then empty else @@ -191,9 +197,9 @@ ppr_context cxt = parens (interpp'SP cxt) \end{code} \begin{code} -pREC_TOP = (0 :: Int) -pREC_FUN = (1 :: Int) -pREC_CON = (2 :: Int) +pREC_TOP = (0 :: Int) -- type in ParseIface.y +pREC_FUN = (1 :: Int) -- btype in ParseIface.y +pREC_CON = (2 :: Int) -- atype in ParseIface.y maybeParen :: Bool -> SDoc -> SDoc maybeParen True p = parens p @@ -235,26 +241,12 @@ ppr_mono_ty ctxt_prec (HsPredTy pred) = maybeParen (ctxt_prec >= pREC_FUN) $ braces (ppr pred) -ppr_mono_ty ctxt_prec ty@(HsUsgForAllTy _ _) - = - sep [ ptext SLIT("__fuall") <+> brackets pp_uvars <+> ptext SLIT("=>"), - ppr_mono_ty pREC_TOP sigma - ] - where - (uvars,sigma) = split [] ty - pp_uvars = interppSP uvars - - split uvs (HsUsgForAllTy uv ty') = split (uv:uvs) ty' - split uvs ty' = (reverse uvs,ty') +ppr_mono_ty ctxt_prec (HsUsageTy u ty) + = maybeParen (ctxt_prec >= pREC_CON) + (sep [ptext SLIT("__u") <+> ppr_mono_ty pREC_CON u, + ppr_mono_ty pREC_CON ty]) + -- pREC_FUN would be logical for u, but it yields a reduce/reduce conflict with AppTy -ppr_mono_ty ctxt_prec (HsUsgTy u ty) - = maybeParen (ctxt_prec >= pREC_CON) $ - ptext SLIT("__u") <+> pp_ua <+> ppr_mono_ty pREC_CON ty - where - pp_ua = case u of - HsUsOnce -> ptext SLIT("-") - HsUsMany -> ptext SLIT("!") - HsUsVar uv -> ppr uv -- Generics ppr_mono_ty ctxt_prec (HsNumTy n) = integer n ppr_mono_ty ctxt_prec (HsOpTy ty1 op ty2) = ppr ty1 <+> ppr op <+> ppr ty2 @@ -278,36 +270,60 @@ toHsTyVar tv = IfaceTyVar (getName tv) (tyVarKind tv) toHsTyVars tvs = map toHsTyVar tvs toHsType :: Type -> HsType Name -toHsType ty = toHsType' (unUsgTy ty) - -- For now we just discard the usage - -toHsType' :: Type -> HsType Name --- Called after the usage is stripped off -- This function knows the representation of types -toHsType' (TyVarTy tv) = HsTyVar (getName tv) -toHsType' (FunTy arg res) = HsFunTy (toHsType arg) (toHsType res) -toHsType' (AppTy fun arg) = HsAppTy (toHsType fun) (toHsType arg) - -toHsType' (NoteTy (SynNote ty) _) = toHsType ty -- Use synonyms if possible!! -toHsType' (NoteTy _ ty) = toHsType ty - -toHsType' (PredTy p) = HsPredTy (toHsPred p) - -toHsType' ty@(TyConApp tc tys) -- Must be saturated because toHsType's arg is of kind * - | not saturated = generic_case - | isTupleTyCon tc = HsTupleTy (HsTupCon (getName tc) (tupleTyConBoxity tc)) tys' - | tc `hasKey` listTyConKey = HsListTy (head tys') - | otherwise = generic_case +toHsType (TyVarTy tv) = HsTyVar (getName tv) +toHsType (FunTy arg res) = HsFunTy (toHsType arg) (toHsType res) +toHsType (AppTy fun arg) = HsAppTy (toHsType fun) (toHsType arg) + +toHsType (NoteTy (SynNote syn_ty) real_ty) + | syn_matches = toHsType syn_ty -- Use synonyms if possible!! + | otherwise = +#ifdef DEBUG + pprTrace "WARNING: synonym info lost in .hi file for " (ppr syn_ty) $ +#endif + toHsType real_ty -- but drop it if not. + where + syn_matches = ty_from_syn == real_ty + + TyConApp syn_tycon tyargs = syn_ty + (tyvars,ty) = getSynTyConDefn syn_tycon + ty_from_syn = substTy (mkTyVarSubst tyvars tyargs) ty + + -- We only use the type synonym in the file if this doesn't cause + -- us to lose important information. This matters for usage + -- annotations. It's an issue if some of the args to the synonym + -- have arrows in them, or if the synonym's RHS has an arrow; for + -- example, with nofib/real/ebnf2ps/ in Parsers.using. + + -- **! It would be nice if when this test fails we could still + -- write the synonym in as a Note, so we don't lose the info for + -- error messages, but it's too much work for right now. + -- KSW 2000-07. + +toHsType (NoteTy _ ty) = toHsType ty + +toHsType (PredTy p) = HsPredTy (toHsPred p) + +toHsType ty@(TyConApp tc tys) -- Must be saturated because toHsType's arg is of kind * + | not saturated = generic_case + | isTupleTyCon tc = HsTupleTy (HsTupCon (getName tc) (tupleTyConBoxity tc) (tyConArity tc)) tys' + | tc `hasKey` listTyConKey = HsListTy (head tys') + | tc `hasKey` usOnceTyConKey = hsUsOnce_Name -- must print !, . unqualified + | tc `hasKey` usManyTyConKey = hsUsMany_Name -- must print !, . unqualified + | otherwise = generic_case where generic_case = foldl HsAppTy (HsTyVar (getName tc)) tys' tys' = map toHsType tys saturated = length tys == tyConArity tc -toHsType' ty@(ForAllTy _ _) = case splitSigmaTy ty of +toHsType ty@(ForAllTy _ _) = case splitSigmaTy ty of (tvs, preds, tau) -> HsForAllTy (Just (map toHsTyVar tvs)) (map toHsPred preds) (toHsType tau) +toHsType (UsageTy u ty) = HsUsageTy (toHsType u) (toHsType ty) + -- **! consider dropping usMany annotations ToDo KSW 2000-10 + toHsPred (Class cls tys) = HsPClass (getName cls) (map toHsType tys) toHsPred (IParam n ty) = HsPIParam (getName n) (toHsType ty) @@ -410,12 +426,12 @@ eq_hsType env (HsFunTy a1 b1) (HsFunTy a2 b2) eq_hsType env (HsPredTy p1) (HsPredTy p2) = eq_hsPred env p1 p2 +eq_hsType env (HsUsageTy u1 ty1) (HsUsageTy u2 ty2) + = eq_hsType env u1 u2 && eq_hsType env ty1 ty2 + eq_hsType env (HsOpTy lty1 op1 rty1) (HsOpTy lty2 op2 rty2) = eq_hsVar env op1 op2 && eq_hsType env lty1 lty2 && eq_hsType env rty1 rty2 -eq_hsType env (HsUsgTy u1 ty1) (HsUsgTy u2 ty2) - = eqUsg u1 u2 && eq_hsType env ty1 ty2 - eq_hsType env ty1 ty2 = False @@ -430,12 +446,6 @@ eq_hsPred env (HsPIParam n1 ty1) (HsPIParam n2 ty2) eq_hsPred env _ _ = False ------------------- -eqUsg HsUsOnce HsUsOnce = True -eqUsg HsUsMany HsUsMany = True -eqUsg (HsUsVar u1) (HsUsVar u2) = u1 == u2 -eqUsg _ _ = False - -------------------- eqListBy :: (a->a->Bool) -> [a] -> [a] -> Bool eqListBy eq [] [] = True eqListBy eq (x:xs) (y:ys) = eq x y && eqListBy eq xs ys