X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FhsSyn%2FHsBinds.lhs;h=2d72e038b803574300a78998d5d6f8ae7cb83aed;hb=3f0c8ab6fb074f0d93e64cde0ab474dfc340c66e;hp=a9a114d4a30cb05509c27f0621c520eb824b7e6b;hpb=18976e614fd90a8d81ced2c3e9cd8e38d72a1f40;p=ghc-hetmet.git diff --git a/ghc/compiler/hsSyn/HsBinds.lhs b/ghc/compiler/hsSyn/HsBinds.lhs index a9a114d..2d72e03 100644 --- a/ghc/compiler/hsSyn/HsBinds.lhs +++ b/ghc/compiler/hsSyn/HsBinds.lhs @@ -16,13 +16,12 @@ import {-# SOURCE #-} HsMatches ( pprMatches, Match, pprGRHSs, GRHSs ) -- friends: import HsTypes ( HsType ) import CoreSyn ( CoreExpr ) -import PprCore () -- Instances for Outputable --others: -import Id ( Id ) +import Name ( Name, isUnboundName ) +import NameSet ( NameSet, elemNameSet, nameSetToList ) import BasicTypes ( RecFlag(..), Fixity ) import Outputable -import Bag import SrcLoc ( SrcLoc ) import Var ( TyVar ) \end{code} @@ -59,6 +58,10 @@ nullBinds :: HsBinds id pat -> Bool nullBinds EmptyBinds = True nullBinds (ThenBinds b1 b2) = nullBinds b1 && nullBinds b2 nullBinds (MonoBind b _ _) = nullMonoBinds b + +mkMonoBind :: MonoBinds id pat -> [Sig id] -> RecFlag -> HsBinds id pat +mkMonoBind EmptyMonoBinds _ _ = EmptyBinds +mkMonoBind mbinds sigs is_rec = MonoBind mbinds sigs is_rec \end{code} \begin{code} @@ -95,13 +98,17 @@ data MonoBinds id pat | AndMonoBinds (MonoBinds id pat) (MonoBinds id pat) - | PatMonoBind pat - (GRHSs id pat) + | FunMonoBind id -- Used for both functions f x = e + -- and variables f = \x -> e + -- Reason: the Match stuff lets us have an optional + -- result type sig f :: a->a = ...mentions a... + Bool -- True => infix declaration + [Match id pat] SrcLoc - | FunMonoBind id - Bool -- True => infix declaration - [Match id pat] + | PatMonoBind pat -- The pattern is never a simple variable; + -- That case is done by FunMonoBind + (GRHSs id pat) SrcLoc | VarMonoBind id -- TRANSLATION @@ -110,10 +117,11 @@ data MonoBinds id pat | CoreMonoBind id -- TRANSLATION CoreExpr -- No zonking; this is a final CoreExpr with Ids and Types! - | AbsBinds -- Binds abstraction; TRANSLATION - [TyVar] -- Type variables - [id] -- Dicts - [([TyVar], id, id)] -- (type variables, polymorphic, momonmorphic) triples + | AbsBinds -- Binds abstraction; TRANSLATION + [TyVar] -- Type variables + [id] -- Dicts + [([TyVar], id, id)] -- (type variables, polymorphic, momonmorphic) triples + NameSet -- Set of *polymorphic* variables that have an INLINE pragma (MonoBinds id pat) -- The "business end" -- Creates bindings for *new* (polymorphic, overloaded) locals @@ -149,10 +157,11 @@ So the desugarer tries to do a better job: in (fm,gm) \begin{code} -nullMonoBinds :: MonoBinds id pat -> Bool +-- We keep the invariant that a MonoBinds is only empty +-- if it is exactly EmptyMonoBinds +nullMonoBinds :: MonoBinds id pat -> Bool nullMonoBinds EmptyMonoBinds = True -nullMonoBinds (AndMonoBinds bs1 bs2) = nullMonoBinds bs1 && nullMonoBinds bs2 nullMonoBinds other_monobind = False andMonoBinds :: MonoBinds id pat -> MonoBinds id pat -> MonoBinds id pat @@ -161,9 +170,20 @@ andMonoBinds mb EmptyMonoBinds = mb andMonoBinds mb1 mb2 = AndMonoBinds mb1 mb2 andMonoBindList :: [MonoBinds id pat] -> MonoBinds id pat -andMonoBindList binds = foldr AndMonoBinds EmptyMonoBinds binds +andMonoBindList binds + = loop1 binds + where + loop1 [] = EmptyMonoBinds + loop1 (EmptyMonoBinds : binds) = loop1 binds + loop1 (b:bs) = loop2 b bs + + -- acc is non-empty + loop2 acc [] = acc + loop2 acc (EmptyMonoBinds : bs) = loop2 acc bs + loop2 acc (b:bs) = loop2 (acc `AndMonoBinds` b) bs \end{code} + \begin{code} instance (Outputable id, Outputable pat) => Outputable (MonoBinds id pat) where @@ -188,11 +208,12 @@ ppr_monobind (VarMonoBind name expr) ppr_monobind (CoreMonoBind name expr) = sep [ppr name <+> equals, nest 4 (ppr expr)] -ppr_monobind (AbsBinds tyvars dictvars exports val_binds) +ppr_monobind (AbsBinds tyvars dictvars exports inlines val_binds) = sep [ptext SLIT("AbsBinds"), brackets (interpp'SP tyvars), brackets (interpp'SP dictvars), - brackets (interpp'SP exports)] + brackets (sep (punctuate comma (map ppr exports))), + brackets (interpp'SP (nameSetToList inlines))] $$ nest 4 (ppr val_binds) \end{code} @@ -215,82 +236,149 @@ data Sig name SrcLoc | ClassOpSig name -- Selector name - (Maybe name) -- Default-method name (if any) + (Maybe -- Nothing for source-file class signatures + (name, -- Default-method name (if any) + Bool)) -- True <=> there is an explicit, programmer-supplied + -- default declaration in the class decl (HsType name) SrcLoc | SpecSig name -- specialise a function or datatype ... (HsType name) -- ... to these types - (Maybe name) -- ... maybe using this as the code for it SrcLoc | InlineSig name -- INLINE f + (Maybe Int) -- phase SrcLoc | NoInlineSig name -- NOINLINE f + (Maybe Int) -- phase SrcLoc | SpecInstSig (HsType name) -- (Class tys); should be a specialisation of the -- current instance decl SrcLoc - | FixSig (FixitySig name) -- Fixity declaration + | FixSig (FixitySig name) -- Fixity declaration + +data FixitySig name = FixitySig name Fixity SrcLoc -data FixitySig name = FixitySig name Fixity SrcLoc +instance Eq name => Eq (FixitySig name) where + (FixitySig n1 f1 _) == (FixitySig n2 f2 _) = n1==n2 && f1==f2 \end{code} \begin{code} -sigsForMe :: (name -> Bool) -> [Sig name] -> [Sig name] -sigsForMe f sigs - = filter sig_for_me sigs - where - sig_for_me (Sig n _ _) = f n - sig_for_me (ClassOpSig n _ _ _) = f n - sig_for_me (SpecSig n _ _ _) = f n - sig_for_me (InlineSig n _) = f n - sig_for_me (NoInlineSig n _) = f n - sig_for_me (SpecInstSig _ _) = False - sig_for_me (FixSig (FixitySig n _ _)) = f n - -nonFixitySigs :: [Sig name] -> [Sig name] -nonFixitySigs sigs = filter not_fix sigs - where - not_fix (FixSig _) = False - not_fix other = True +okBindSig :: NameSet -> Sig Name -> Bool +okBindSig ns (ClassOpSig _ _ _ _) = False +okBindSig ns sig = sigForThisGroup ns sig + +okClsDclSig :: NameSet -> Sig Name -> Bool +okClsDclSig ns (Sig _ _ _) = False +okClsDclSig ns sig = sigForThisGroup ns sig + +okInstDclSig :: NameSet -> Sig Name -> Bool +okInstDclSig ns (Sig _ _ _) = False +okInstDclSig ns (FixSig _) = False +okInstDclSig ns (SpecInstSig _ _) = True +okInstDclSig ns sig = sigForThisGroup ns sig + +sigForThisGroup ns sig + = case sigName sig of + Nothing -> False + Just n | isUnboundName n -> True -- Don't complain about an unbound name again + | otherwise -> n `elemNameSet` ns + +sigName :: Sig name -> Maybe name +sigName (Sig n _ _) = Just n +sigName (ClassOpSig n _ _ _) = Just n +sigName (SpecSig n _ _) = Just n +sigName (InlineSig n _ _) = Just n +sigName (NoInlineSig n _ _) = Just n +sigName (FixSig (FixitySig n _ _)) = Just n +sigName other = Nothing + +isFixitySig :: Sig name -> Bool +isFixitySig (FixSig _) = True +isFixitySig _ = False + +isClassOpSig :: Sig name -> Bool +isClassOpSig (ClassOpSig _ _ _ _) = True +isClassOpSig _ = False + +isPragSig :: Sig name -> Bool + -- Identifies pragmas +isPragSig (SpecSig _ _ _) = True +isPragSig (InlineSig _ _ _) = True +isPragSig (NoInlineSig _ _ _) = True +isPragSig (SpecInstSig _ _) = True +isPragSig other = False +\end{code} + +\begin{code} +hsSigDoc (Sig _ _ loc) = (SLIT("type signature"),loc) +hsSigDoc (ClassOpSig _ _ _ loc) = (SLIT("class-method type signature"), loc) +hsSigDoc (SpecSig _ _ loc) = (SLIT("SPECIALISE pragma"),loc) +hsSigDoc (InlineSig _ _ loc) = (SLIT("INLINE pragma"),loc) +hsSigDoc (NoInlineSig _ _ loc) = (SLIT("NOINLINE pragma"),loc) +hsSigDoc (SpecInstSig _ loc) = (SLIT("SPECIALISE instance pragma"),loc) +hsSigDoc (FixSig (FixitySig _ _ loc)) = (SLIT("fixity declaration"), loc) \end{code} \begin{code} instance (Outputable name) => Outputable (Sig name) where ppr sig = ppr_sig sig -instance Outputable name => Outputable (FixitySig name) where - ppr (FixitySig name fixity loc) = sep [ppr fixity, ppr name] - - +ppr_sig :: Outputable name => Sig name -> SDoc ppr_sig (Sig var ty _) = sep [ppr var <+> dcolon, nest 4 (ppr ty)] -ppr_sig (ClassOpSig var _ ty _) - = sep [ppr var <+> dcolon, nest 4 (ppr ty)] +ppr_sig (ClassOpSig var dm ty _) + = sep [ppr var <+> pp_dm <+> dcolon, nest 4 (ppr ty)] + where + pp_dm = case dm of + Just (_, True) -> equals -- Default-method indicator + other -> empty -ppr_sig (SpecSig var ty using _) +ppr_sig (SpecSig var ty _) = sep [ hsep [text "{-# SPECIALIZE", ppr var, dcolon], - nest 4 (hsep [ppr ty, pp_using using, text "#-}"]) + nest 4 (ppr ty <+> text "#-}") ] - where - pp_using Nothing = empty - pp_using (Just me) = hsep [char '=', ppr me] -ppr_sig (InlineSig var _) - = hsep [text "{-# INLINE", ppr var, text "#-}"] +ppr_sig (InlineSig var phase _) + = hsep [text "{-# INLINE", ppr_phase phase, ppr var, text "#-}"] -ppr_sig (NoInlineSig var _) - = hsep [text "{-# NOINLINE", ppr var, text "#-}"] +ppr_sig (NoInlineSig var phase _) + = hsep [text "{-# NOINLINE", ppr_phase phase, ppr var, text "#-}"] ppr_sig (SpecInstSig ty _) = hsep [text "{-# SPECIALIZE instance", ppr ty, text "#-}"] ppr_sig (FixSig fix_sig) = ppr fix_sig + + +instance Outputable name => Outputable (FixitySig name) where + ppr (FixitySig name fixity loc) = sep [ppr fixity, ppr name] + +ppr_phase :: Maybe Int -> SDoc +ppr_phase Nothing = empty +ppr_phase (Just n) = int n \end{code} +Checking for distinct signatures; oh, so boring + + +\begin{code} +eqHsSig :: Sig Name -> Sig Name -> Bool +eqHsSig (Sig n1 _ _) (Sig n2 _ _) = n1 == n2 +eqHsSig (InlineSig n1 _ _) (InlineSig n2 _ _) = n1 == n2 +eqHsSig (NoInlineSig n1 _ _) (NoInlineSig n2 _ _) = n1 == n2 + +eqHsSig (SpecInstSig ty1 _) (SpecInstSig ty2 _) = ty1 == ty2 +eqHsSig (SpecSig n1 ty1 _) (SpecSig n2 ty2 _) + = -- may have many specialisations for one value; + -- but not ones that are exactly the same... + (n1 == n2) && (ty1 == ty2) + +eqHsSig other_1 other_2 = False +\end{code}