X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FhsSyn%2FHsBinds.lhs;h=b5456d23520e1c40c52312b8ebe0b581e0990077;hb=76293b141bba4c15a6fd619dd980502e98614790;hp=dea4fafcf9721404e3e63fb002c1ae83952741de;hpb=48eec5685167006e5e0932d334f8bd2017d7f5d3;p=ghc-hetmet.git diff --git a/ghc/compiler/hsSyn/HsBinds.lhs b/ghc/compiler/hsSyn/HsBinds.lhs index dea4faf..b5456d2 100644 --- a/ghc/compiler/hsSyn/HsBinds.lhs +++ b/ghc/compiler/hsSyn/HsBinds.lhs @@ -10,22 +10,25 @@ module HsBinds where #include "HsVersions.h" -import {-# SOURCE #-} HsExpr ( pprExpr, HsExpr ) -import {-# SOURCE #-} HsMatches ( pprMatches, Match, pprGRHSs, GRHSs ) +import {-# SOURCE #-} HsExpr ( HsExpr, pprExpr, + Match, pprFunBind, + GRHSs, pprPatBind ) -- friends: +import HsImpExp ( ppr_var ) import HsTypes ( HsType ) import CoreSyn ( CoreExpr ) -import PprCore () -- Instances for Outputable +import PprCore ( {- instance Outputable (Expr a) -} ) --others: -import Id ( Id ) -import NameSet ( NameSet, nameSetToList ) -import BasicTypes ( RecFlag(..), Fixity ) +import Name ( Name ) +import PrelNames ( isUnboundName ) +import NameSet ( NameSet, elemNameSet, nameSetToList ) +import BasicTypes ( RecFlag(..), Fixity, Activation(..) ) import Outputable -import Bag import SrcLoc ( SrcLoc ) import Var ( TyVar ) +import Class ( DefMeth (..) ) \end{code} %************************************************************************ @@ -73,16 +76,18 @@ instance (Outputable pat, Outputable id) => ppr_binds EmptyBinds = empty ppr_binds (ThenBinds binds1 binds2) - = ($$) (ppr_binds binds1) (ppr_binds binds2) + = ppr_binds binds1 $$ ppr_binds binds2 ppr_binds (MonoBind bind sigs is_rec) - = vcat [ifNotPprForUser (ptext rec_str), + = vcat [ppr_isrec, vcat (map ppr sigs), ppr bind ] where - rec_str = case is_rec of - Recursive -> SLIT("{- rec -}") - NonRecursive -> SLIT("{- nonrec -}") + ppr_isrec = getPprStyle $ \ sty -> + if userStyle sty then empty else + case is_rec of + Recursive -> ptext SLIT("{- rec -}") + NonRecursive -> ptext SLIT("{- nonrec -}") \end{code} %************************************************************************ @@ -100,15 +105,23 @@ data MonoBinds id pat | AndMonoBinds (MonoBinds id pat) (MonoBinds id pat) - | PatMonoBind pat - (GRHSs id pat) - SrcLoc - - | FunMonoBind id + | 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... + -- + -- This also means that instance decls can only have + -- FunMonoBinds, so if you change this, you'll need to + -- change e.g. rnMethodBinds Bool -- True => infix declaration [Match id pat] SrcLoc + | PatMonoBind pat -- The pattern is never a simple variable; + -- That case is done by FunMonoBind + (GRHSs id pat) + SrcLoc + | VarMonoBind id -- TRANSLATION (HsExpr id pat) @@ -181,6 +194,7 @@ andMonoBindList binds loop2 acc (b:bs) = loop2 (acc `AndMonoBinds` b) bs \end{code} + \begin{code} instance (Outputable id, Outputable pat) => Outputable (MonoBinds id pat) where @@ -192,11 +206,8 @@ ppr_monobind EmptyMonoBinds = empty ppr_monobind (AndMonoBinds binds1 binds2) = ppr_monobind binds1 $$ ppr_monobind binds2 -ppr_monobind (PatMonoBind pat grhss locn) - = sep [ppr pat, nest 4 (pprGRHSs False grhss)] - -ppr_monobind (FunMonoBind fun inf matches locn) - = pprMatches (False, ppr fun) matches +ppr_monobind (PatMonoBind pat grhss locn) = pprPatBind pat grhss +ppr_monobind (FunMonoBind fun inf matches locn) = pprFunBind fun matches -- ToDo: print infix if appropriate ppr_monobind (VarMonoBind name expr) @@ -233,9 +244,8 @@ data Sig name SrcLoc | ClassOpSig name -- Selector name - name -- Default-method name (if any) - Bool -- True <=> there is an explicit, programmer-supplied - -- default declaration in the class decl + (DefMeth name) -- Default-method info + -- See "THE NAMING STORY" in HsDecls (HsType name) SrcLoc @@ -243,96 +253,135 @@ data Sig name (HsType name) -- ... to these types SrcLoc - | InlineSig name -- INLINE f - (Maybe Int) -- phase - SrcLoc - - | NoInlineSig name -- NOINLINE f - (Maybe Int) -- phase + | InlineSig Bool -- True <=> INLINE f, False <=> NOINLINE f + name -- Function name + Activation -- When inlining is *active* SrcLoc | SpecInstSig (HsType name) -- (Class tys); should be a specialisation of the -- current instance decl SrcLoc - | FixSig (FixitySig name) -- Fixity declaration - - | DeprecSig name -- DEPRECATED - DeprecTxt - SrcLoc + | FixSig (FixitySig name) -- Fixity declaration -data FixitySig name = FixitySig name Fixity SrcLoc +data FixitySig name = FixitySig name Fixity SrcLoc -type DeprecTxt = FAST_STRING -- reason/explanation for deprecation +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 - sig_for_me (DeprecSig n _ _) = f n +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 (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 +isClassOpSig (ClassOpSig _ _ _ _) = True +isClassOpSig _ = False isPragSig :: Sig name -> Bool -- Identifies pragmas isPragSig (SpecSig _ _ _) = True -isPragSig (InlineSig _ _ _) = True -isPragSig (NoInlineSig _ _ _) = True +isPragSig (InlineSig _ _ _ _) = True isPragSig (SpecInstSig _ _) = True -isPragSig (DeprecSig _ _ _) = 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 True _ _ loc) = (SLIT("INLINE pragma"),loc) +hsSigDoc (InlineSig False _ _ 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 var <+> dcolon, + nest 4 (ppr ty), + nest 4 (pp_dm_comment) ] + where + pp_dm = case dm of + DefMeth _ -> equals -- Default method indicator + GenDefMeth -> semi -- Generic method indicator + NoDefMeth -> empty -- No Method at all + pp_dm_comment = case dm of + DefMeth _ -> text "{- has default method -}" + GenDefMeth -> text "{- has generic method -}" + NoDefMeth -> empty -- No Method at all ppr_sig (SpecSig var ty _) = sep [ hsep [text "{-# SPECIALIZE", ppr var, dcolon], nest 4 (ppr ty <+> text "#-}") ] -ppr_sig (InlineSig var phase _) - = hsep [text "{-# INLINE", ppr_phase phase, ppr var, text "#-}"] +ppr_sig (InlineSig True var phase _) + = hsep [text "{-# INLINE", ppr phase, ppr var, text "#-}"] -ppr_sig (NoInlineSig var phase _) - = hsep [text "{-# NOINLINE", ppr_phase phase, ppr var, text "#-}"] +ppr_sig (InlineSig False var phase _) + = hsep [text "{-# NOINLINE", ppr phase, ppr var, text "#-}"] ppr_sig (SpecInstSig ty _) = hsep [text "{-# SPECIALIZE instance", ppr ty, text "#-}"] ppr_sig (FixSig fix_sig) = ppr fix_sig -ppr_sig (DeprecSig n txt _) - = hsep [text "{-# DEPRECATED", ppr n, doubleQuotes(ppr txt), text "#-}"] -ppr_phase Nothing = empty -ppr_phase (Just n) = int n +instance Outputable name => Outputable (FixitySig name) where + ppr (FixitySig name fixity loc) = sep [ppr fixity, ppr name] \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 b1 n1 _ _)(InlineSig b2 n2 _ _) = b1 == b2 && 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 _other1 _other2 = False +\end{code}