X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FdeSugar%2FCoverage.lhs;h=6d6f1f044ba343e99118096445d57d75b2fadedc;hp=976b47f72ef94dc4971ff0a3c6b968242e41415c;hb=1a3efdd6b616f3a101e182f715df5a0e306eb348;hpb=6a05ec5ef5373f61b7f9f5bdc344483417fa801b diff --git a/compiler/deSugar/Coverage.lhs b/compiler/deSugar/Coverage.lhs index 976b47f..6d6f1f0 100644 --- a/compiler/deSugar/Coverage.lhs +++ b/compiler/deSugar/Coverage.lhs @@ -5,13 +5,6 @@ \section[Coverage]{@coverage@: the main function} \begin{code} -{-# OPTIONS -w #-} --- The above warning supression flag is a temporary kludge. --- While working on this module you are encouraged to remove it and fix --- any warnings in the module. See --- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings --- for details - module Coverage (addCoverageTicksToBinds) where #include "HsVersions.h" @@ -31,20 +24,12 @@ import Data.List import FastString import HscTypes import StaticFlags -import UniqFM -import Type import TyCon import FiniteMap -import PackageConfig import Data.Array -import System.Time (ClockTime(..)) import System.IO (FilePath) -#if __GLASGOW_HASKELL__ < 603 -import Compat.Directory ( createDirectoryIfMissing ) -#else import System.Directory ( createDirectoryIfMissing ) -#endif import Trace.Hpc.Mix import Trace.Hpc.Util @@ -65,7 +50,7 @@ addCoverageTicksToBinds :: DynFlags -> Module -> ModLocation -- of the current module - -> [TyCon] -- type constructor in this module + -> [TyCon] -- type constructor in this module -> LHsBinds Id -> IO (LHsBinds Id, HpcInfo, ModBreaks) @@ -148,14 +133,14 @@ addTickLHsBinds :: LHsBinds Id -> TM (LHsBinds Id) addTickLHsBinds binds = mapBagM addTickLHsBind binds addTickLHsBind :: LHsBind Id -> TM (LHsBind Id) -addTickLHsBind (L pos t@(AbsBinds abs_tvs abs_dicts abs_exports abs_binds)) = do +addTickLHsBind (L pos (AbsBinds abs_tvs abs_dicts abs_exports abs_binds)) = do abs_binds' <- addTickLHsBinds abs_binds return $ L pos $ AbsBinds abs_tvs abs_dicts abs_exports abs_binds' addTickLHsBind (L pos (funBind@(FunBind { fun_id = (L _ id) }))) = do let name = getOccString id decl_path <- getPathEntry - (fvs, mg@(MatchGroup matches' ty)) <- + (fvs, (MatchGroup matches' ty)) <- getFreeVars $ addPathEntry name $ addTickMatchGroup (fun_matches funBind) @@ -195,12 +180,8 @@ addTickLHsBind (L pos (pat@(PatBind { pat_rhs = rhs }))) = do -} return $ L pos $ pat { pat_rhs = rhs' } -{- only internal stuff, not from source, uses VarBind, so we ignore it. -addTickLHsBind (VarBind var_id var_rhs) = do - var_rhs' <- addTickLHsExpr var_rhs - return $ VarBind var_id var_rhs' --} -addTickLHsBind other = return other +-- Only internal stuff, not from source, uses VarBind, so we ignore it. +addTickLHsBind var_bind@(L _ (VarBind {})) = return var_bind -- Add a tick to the expression no matter what it is. There is one exception: -- for the debugger, if the expression is a 'let', then we don't want to add @@ -249,7 +230,7 @@ isGoodBreakExpr (RecordCon {}) = True isGoodBreakExpr (RecordUpd {}) = True isGoodBreakExpr (ArithSeq {}) = True isGoodBreakExpr (PArrSeq {}) = True -isGoodBreakExpr other = False +isGoodBreakExpr _other = False addTickLHsExprOptAlt :: Bool -> LHsExpr Id -> TM (LHsExpr Id) addTickLHsExprOptAlt oneOfMany (L pos e0) @@ -268,7 +249,7 @@ addTickHsExpr e@(HsVar id) = do freeVar id; return e addTickHsExpr e@(HsIPVar _) = return e addTickHsExpr e@(HsOverLit _) = return e addTickHsExpr e@(HsLit _) = return e -addTickHsExpr e@(HsLam matchgroup) = +addTickHsExpr (HsLam matchgroup) = liftM HsLam (addTickMatchGroup matchgroup) addTickHsExpr (HsApp e1 e2) = liftM2 HsApp (addTickLHsExprNever e1) (addTickLHsExpr e2) @@ -345,7 +326,7 @@ addTickHsExpr (ArithSeq ty arith_seq) = liftM2 ArithSeq (return ty) (addTickArithSeqInfo arith_seq) -addTickHsExpr (HsTickPragma (file,(l1,c1),(l2,c2)) (L pos e0)) = do +addTickHsExpr (HsTickPragma _ (L pos e0)) = do e2 <- allocTickBox (ExpBox False) pos $ addTickHsExpr e0 return $ unLoc e2 @@ -385,16 +366,12 @@ addTickHsExpr (HsArrForm e fix cmdtop) = (return fix) (mapM (liftL (addTickHsCmdTop)) cmdtop) -addTickHsExpr e@(HsType ty) = return e +addTickHsExpr e@(HsType _) = return e -- Others dhould never happen in expression content. -addTickHsExpr e@(ExprWithTySig {}) = pprPanic "addTickHsExpr" (ppr e) -addTickHsExpr e@(EAsPat _ _) = pprPanic "addTickHsExpr" (ppr e) -addTickHsExpr e@(ELazyPat _) = pprPanic "addTickHsExpr" (ppr e) -addTickHsExpr e@(EWildPat) = pprPanic "addTickHsExpr" (ppr e) -addTickHsExpr e@(HsBinTick _ _ _) = pprPanic "addTickHsExpr" (ppr e) -addTickHsExpr e@(HsTick _ _ _) = pprPanic "addTickHsExpr" (ppr e) +addTickHsExpr e = pprPanic "addTickHsExpr" (ppr e) +addTickMatchGroup :: MatchGroup Id -> TM (MatchGroup Id) addTickMatchGroup (MatchGroup matches ty) = do let isOneOfMany = matchesOneOfMany matches matches' <- mapM (liftL (addTickMatch isOneOfMany)) matches @@ -438,7 +415,7 @@ addTickLStmts' isGuard lstmts res binders = map unLoc (collectLStmtsBinders lstmts) addTickStmt :: (Maybe (Bool -> BoxLabel)) -> Stmt Id -> TM (Stmt Id) -addTickStmt isGuard (BindStmt pat e bind fail) = do +addTickStmt _isGuard (BindStmt pat e bind fail) = do liftM4 BindStmt (addTickLPat pat) (addTickLHsExprAlways e) @@ -446,23 +423,34 @@ addTickStmt isGuard (BindStmt pat e bind fail) = do (addTickSyntaxExpr hpcSrcSpan fail) addTickStmt isGuard (ExprStmt e bind' ty) = do liftM3 ExprStmt - (addTick e) + (addTick isGuard e) (addTickSyntaxExpr hpcSrcSpan bind') (return ty) - where - addTick e | Just fn <- isGuard = addBinTickLHsExpr fn e - | otherwise = addTickLHsExprAlways e - -addTickStmt isGuard (LetStmt binds) = do +addTickStmt _isGuard (LetStmt binds) = do liftM LetStmt (addTickHsLocalBinds binds) addTickStmt isGuard (ParStmt pairs) = do - liftM ParStmt (mapM process pairs) - where - process (stmts,ids) = - liftM2 (,) - (addTickLStmts isGuard stmts) - (return ids) + liftM ParStmt + (mapM (addTickStmtAndBinders isGuard) pairs) +addTickStmt isGuard (TransformStmt (stmts, ids) usingExpr maybeByExpr) = do + liftM3 TransformStmt + (addTickStmtAndBinders isGuard (stmts, ids)) + (addTickLHsExprAlways usingExpr) + (addTickMaybeByLHsExpr maybeByExpr) +addTickStmt isGuard (GroupStmt (stmts, binderMap) groupByClause) = do + liftM2 GroupStmt + (addTickStmtAndBinders isGuard (stmts, binderMap)) + (case groupByClause of + GroupByNothing usingExpr -> addTickLHsExprAlways usingExpr >>= (return . GroupByNothing) + GroupBySomething eitherUsingExpr byExpr -> do + eitherUsingExpr' <- mapEitherM addTickLHsExprAlways (addTickSyntaxExpr hpcSrcSpan) eitherUsingExpr + byExpr' <- addTickLHsExprAlways byExpr + return $ GroupBySomething eitherUsingExpr' byExpr') + where + mapEitherM f g x = do + case x of + Left a -> f a >>= (return . Left) + Right b -> g b >>= (return . Right) addTickStmt isGuard (RecStmt stmts ids1 ids2 tys dictbinds) = do liftM5 RecStmt (addTickLStmts isGuard stmts) @@ -471,6 +459,23 @@ addTickStmt isGuard (RecStmt stmts ids1 ids2 tys dictbinds) = do (return tys) (addTickDictBinds dictbinds) +addTick :: Maybe (Bool -> BoxLabel) -> LHsExpr Id -> TM (LHsExpr Id) +addTick isGuard e | Just fn <- isGuard = addBinTickLHsExpr fn e + | otherwise = addTickLHsExprAlways e + +addTickStmtAndBinders :: Maybe (Bool -> BoxLabel) -> ([LStmt Id], a) + -> TM ([LStmt Id], a) +addTickStmtAndBinders isGuard (stmts, ids) = + liftM2 (,) + (addTickLStmts isGuard stmts) + (return ids) + +addTickMaybeByLHsExpr :: Maybe (LHsExpr Id) -> TM (Maybe (LHsExpr Id)) +addTickMaybeByLHsExpr maybeByExpr = + case maybeByExpr of + Nothing -> return Nothing + Just byExpr -> addTickLHsExprAlways byExpr >>= (return . Just) + addTickHsLocalBinds :: HsLocalBinds Id -> TM (HsLocalBinds Id) addTickHsLocalBinds (HsValBinds binds) = liftM HsValBinds @@ -480,6 +485,7 @@ addTickHsLocalBinds (HsIPBinds binds) = (addTickHsIPBinds binds) addTickHsLocalBinds (EmptyLocalBinds) = return EmptyLocalBinds +addTickHsValBinds :: HsValBindsLR Id a -> TM (HsValBindsLR Id b) addTickHsValBinds (ValBindsOut binds sigs) = liftM2 ValBindsOut (mapM (\ (rec,binds') -> @@ -488,7 +494,9 @@ addTickHsValBinds (ValBindsOut binds sigs) = (addTickLHsBinds binds')) binds) (return sigs) +addTickHsValBinds _ = panic "addTickHsValBinds" +addTickHsIPBinds :: HsIPBinds Id -> TM (HsIPBinds Id) addTickHsIPBinds (IPBinds ipbinds dictbinds) = liftM2 IPBinds (mapM (liftL (addTickIPBind)) ipbinds) @@ -565,6 +573,7 @@ data TickTransEnv = TTE { fileName :: FastString -- deriving Show type FreeVars = OccEnv Id +noFVs :: FreeVars noFVs = emptyOccEnv -- Note [freevars] @@ -584,7 +593,7 @@ data TM a = TM { unTM :: TickTransEnv -> TickTransState -> (a,FreeVars,TickTrans -- monad (FreeVars). instance Monad TM where - return a = TM $ \ env st -> (a,noFVs,st) + return a = TM $ \ _env st -> (a,noFVs,st) (TM m) >>= k = TM $ \ env st -> case m env st of (r1,fv1,st1) -> @@ -595,8 +604,8 @@ instance Monad TM where -- getState :: TM TickTransState -- getState = TM $ \ env st -> (st, noFVs, st) -setState :: (TickTransState -> TickTransState) -> TM () -setState f = TM $ \ env st -> ((), noFVs, f st) +-- setState :: (TickTransState -> TickTransState) -> TM () +-- setState f = TM $ \ env st -> ((), noFVs, f st) getEnv :: TM TickTransEnv getEnv = TM $ \ env st -> (env, noFVs, st) @@ -653,7 +662,7 @@ allocTickBox boxLabel pos m | isGoodSrcSpan' pos = sameFileName pos (do e <- m; return (L pos e)) $ do (fvs, e) <- getFreeVars m - TM $ \ env st -> + TM $ \ _env st -> let c = tickBoxCount st ids = occEnvElts fvs mes = mixEntries st @@ -663,14 +672,14 @@ allocTickBox boxLabel pos m | isGoodSrcSpan' pos = , fvs , st {tickBoxCount=c+1,mixEntries=me:mes} ) -allocTickBox boxLabel pos m = do e <- m; return (L pos e) +allocTickBox _boxLabel pos m = do e <- m; return (L pos e) -- the tick application inherits the source position of its -- expression argument to support nested box allocations allocATickBox :: BoxLabel -> SrcSpan -> FreeVars -> TM (Maybe (Int,[Id])) allocATickBox boxLabel pos fvs | isGoodSrcSpan' pos = sameFileName pos - (return Nothing) $ TM $ \ env st -> + (return Nothing) $ TM $ \ _env st -> let me = (pos, map (nameOccName.idName) ids, boxLabel) c = tickBoxCount st mes = mixEntries st @@ -679,10 +688,10 @@ allocATickBox boxLabel pos fvs | isGoodSrcSpan' pos = , noFVs , st {tickBoxCount=c+1, mixEntries=me:mes} ) -allocATickBox boxLabel pos fvs = return Nothing +allocATickBox _boxLabel _pos _fvs = return Nothing allocBinTickBox :: (Bool -> BoxLabel) -> LHsExpr Id -> TM (LHsExpr Id) -allocBinTickBox boxLabel (L pos e) | isGoodSrcSpan' pos = TM $ \ env st -> +allocBinTickBox boxLabel (L pos e) | isGoodSrcSpan' pos = TM $ \ _env st -> let meT = (pos,[],boxLabel True) meF = (pos,[],boxLabel False) meE = (pos,[],ExpBox False) @@ -703,8 +712,9 @@ allocBinTickBox boxLabel (L pos e) | isGoodSrcSpan' pos = TM $ \ env st -> , st {tickBoxCount=c+1,mixEntries=meE:mes} ) -allocBinTickBox boxLabel e = return e +allocBinTickBox _boxLabel e = return e +isGoodSrcSpan' :: SrcSpan -> Bool isGoodSrcSpan' pos | not (isGoodSrcSpan pos) = False | start == end = False @@ -726,8 +736,7 @@ mkHpcPos pos , srcLocCol end ) -noHpcPos = toHpcPos (0,0,0,0) - +hpcSrcSpan :: SrcSpan hpcSrcSpan = mkGeneralSrcSpan (FSLIT("Haskell Program Coverage internals")) \end{code}