X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2FdeSugar%2FCoverage.lhs;h=af9f002723f6c1427de0b03a3fe65a9f400c77d2;hb=8100cd4395e46ae747be4298c181a4730d6206bc;hp=36b04041ba8c574a17e0b2114a0865715c57aa4f;hpb=ec3c7841346821c2d5342d0d9c3ff1ae4558aeb6;p=ghc-hetmet.git

diff --git a/compiler/deSugar/Coverage.lhs b/compiler/deSugar/Coverage.lhs
index 36b0404..af9f002 100644
--- a/compiler/deSugar/Coverage.lhs
+++ b/compiler/deSugar/Coverage.lhs
@@ -58,11 +58,23 @@ import System.Directory ( createDirectoryIfMissing )
 
 \begin{code}
 addCoverageTicksToBinds dflags mod mod_loc binds = do 
+  { let orig_file = 
+             case ml_hs_file mod_loc of
+		    Just file -> file
+		    Nothing -> error "can not find the original file during hpc trans"
+
+  ; if "boot" `isSuffixOf` orig_file then return (binds, 0)  
+    else addCoverageTicksToBinds2 dflags mod orig_file binds 
+  }
+
+addCoverageTicksToBinds2 dflags mod orig_file binds = do 
   let main_mod = mainModIs dflags
       main_is  = case mainFunIs dflags of
 		  Nothing -> "main"
 		  Just main -> main 
 
+  modTime <- getModificationTime' orig_file
+
   let mod_name = moduleNameString (moduleName mod)
 
   let (binds1,st)
@@ -78,12 +90,6 @@ addCoverageTicksToBinds dflags mod mod_loc binds = do
   -- write the mix entries for this module
   let tabStop = 1 -- <tab> counts as a normal char in GHC's location ranges.
 
-  let orig_file = case ml_hs_file mod_loc of
-		    Just file -> file
-		    Nothing -> error "can not find the original file during hpc trans"
-
-  modTime <- getModificationTime' orig_file
-
   createDirectoryIfMissing True hpc_dir
 
   mixCreate hpc_dir mod_name (Mix orig_file modTime tabStop $ reverse $ mixEntries st)
@@ -122,7 +128,7 @@ addTickLHsBind (L pos (funBind@(FunBind { fun_id = (L _ id)  })))  = do
   let arg_count = matchGroupArity mg
   let (tys,res_ty) = splitFunTysN arg_count ty
 
-  return $ L pos $ funBind { fun_matches = MatchGroup ({-L pos fn_entry:-}matches') ty 
+  return $ L pos $ funBind { fun_matches = MatchGroup matches' ty 
 			   , fun_tick = tick_no
 			   }
 
@@ -289,7 +295,7 @@ addTickHsExpr (HsBinTick _ _ _) = error "addTickhsExpr: HsBinTick _ _ _"
 addTickHsExpr (HsTick _ _) = error "addTickhsExpr: HsTick _ _"
 
 addTickMatchGroup (MatchGroup matches ty) = do
-  let isOneOfMany = True -- AJG: for now
+  let isOneOfMany = matchesOneOfMany matches
   matches' <- mapM (liftL (addTickMatch isOneOfMany)) matches
   return $ MatchGroup matches' ty
 
@@ -514,6 +520,14 @@ hpcLoc = L hpcSrcSpan
 
 
 \begin{code}
+matchesOneOfMany :: [LMatch Id] -> Bool
+matchesOneOfMany lmatches = sum (map matchCount lmatches) > 1
+  where
+	matchCount (L _ (Match _pats _ty (GRHSs grhss _binds))) = length grhss
+\end{code}
+
+
+\begin{code}
 ---------------------------------------------------------------
 -- Datatypes and file-access routines for the per-module (.mix)
 -- indexes used by Hpc.