[Whitespace only Ian Lynagh **20091203132259] { hunk ./utils/hpc/HpcMarkup.hs 26 -markup_options +markup_options hunk ./utils/hpc/HpcMarkup.hs 37 - , usage = "[OPTION] .. [ [ ..]]" - , options = markup_options - , summary = "Markup Haskell source with program coverage" - , implementation = markup_main - , init_flags = default_flags - , final_flags = default_final_flags - } + , usage = "[OPTION] .. [ [ ..]]" + , options = markup_options + , summary = "Markup Haskell source with program coverage" + , implementation = markup_main + , init_flags = default_flags + , final_flags = default_final_flags + } hunk ./utils/hpc/HpcMarkup.hs 49 - let hpcflags1 = flags - { includeMods = Set.fromList modNames - `Set.union` - includeMods flags } + let hpcflags1 = flags + { includeMods = Set.fromList modNames + `Set.union` + includeMods flags } hunk ./utils/hpc/HpcMarkup.hs 66 - | tix <- tixs - , allowModule hpcflags1 (tixModuleName tix) - ] + | tix <- tixs + , allowModule hpcflags1 (tixModuleName tix) + ] hunk ./utils/hpc/HpcMarkup.hs 80 - writeFileUsing (dest_dir ++ "/" ++ filename ++ ".html") $ - "" ++ - "\n" ++ - "\n" ++ - "" ++ - "" ++ - "" ++ - "" ++ - "" ++ - "" ++ - "" ++ - "" ++ - "" ++ - "" ++ - "" ++ - "" ++ - "" ++ - "" ++ - concat [ showModuleSummary (modName,fileName,modSummary) - | (modName,fileName,modSummary) <- mods' - ] ++ - "" ++ - showTotalSummary (mconcat - [ modSummary - | (_,_,modSummary) <- mods' - ]) - ++ "
moduleTop Level DefinitionsAlternativesExpressions
%covered / total%covered / total%covered / total
\n" + writeFileUsing (dest_dir ++ "/" ++ filename ++ ".html") $ + "" ++ + "\n" ++ + "\n" ++ + "" ++ + "" ++ + "" ++ + "" ++ + "" ++ + "" ++ + "" ++ + "" ++ + "" ++ + "" ++ + "" ++ + "" ++ + "" ++ + "" ++ + concat [ showModuleSummary (modName,fileName,modSummary) + | (modName,fileName,modSummary) <- mods' + ] ++ + "" ++ + showTotalSummary (mconcat + [ modSummary + | (_,_,modSummary) <- mods' + ]) + ++ "
moduleTop Level DefinitionsAlternativesExpressions
%covered / total%covered / total%covered / total
\n" hunk ./utils/hpc/HpcMarkup.hs 116 - - writeSummary index_fun $ \ (_,_,s1) (_,_,s2) -> + + writeSummary index_fun $ \ (_,_,s1) (_,_,s2) -> hunk ./utils/hpc/HpcMarkup.hs 119 - (percent (topFunTicked s1) (topFunTotal s1)) + (percent (topFunTicked s1) (topFunTotal s1)) hunk ./utils/hpc/HpcMarkup.hs 121 - writeSummary index_alt $ \ (_,_,s1) (_,_,s2) -> + writeSummary index_alt $ \ (_,_,s1) (_,_,s2) -> hunk ./utils/hpc/HpcMarkup.hs 123 - (percent (altTicked s1) (altTotal s1)) + (percent (altTicked s1) (altTotal s1)) hunk ./utils/hpc/HpcMarkup.hs 125 - writeSummary index_exp $ \ (_,_,s1) (_,_,s2) -> + writeSummary index_exp $ \ (_,_,s1) (_,_,s2) -> hunk ./utils/hpc/HpcMarkup.hs 127 - (percent (expTicked s1) (expTotal s1)) + (percent (expTicked s1) (expTotal s1)) hunk ./utils/hpc/HpcMarkup.hs 131 - = hpcError markup_plugin $ "no .tix file or executable name specified" + = hpcError markup_plugin $ "no .tix file or executable name specified" hunk ./utils/hpc/HpcMarkup.hs 142 - let modName0 = tixModuleName tix + let modName0 = tixModuleName tix hunk ./utils/hpc/HpcMarkup.hs 148 - $ tixModuleTixs tix + $ tixModuleTixs tix hunk ./utils/hpc/HpcMarkup.hs 151 - tickedWith n = arr_tix ! n + tickedWith n = arr_tix ! n hunk ./utils/hpc/HpcMarkup.hs 156 - | (gid,(pos,boxLabel)) <- zip [0 ..] mix' - , let binBox = case (isTicked gid,isTicked (gid+1)) of - (False,False) -> [] - (True,False) -> [TickedOnlyTrue] - (False,True) -> [TickedOnlyFalse] - (True,True) -> [] + | (gid,(pos,boxLabel)) <- zip [0 ..] mix' + , let binBox = case (isTicked gid,isTicked (gid+1)) of + (False,False) -> [] + (True,False) -> [TickedOnlyTrue] + (False,True) -> [TickedOnlyFalse] + (True,True) -> [] hunk ./utils/hpc/HpcMarkup.hs 163 - then [IsTicked] - else [NotTicked] - , theMarkup <- case boxLabel of - ExpBox {} -> tickBox - TopLevelBox {} - -> TopLevelDecl theFunTotals (tickedWith gid) : tickBox - LocalBox {} -> tickBox - BinBox _ True -> binBox - _ -> [] + then [IsTicked] + else [NotTicked] + , theMarkup <- case boxLabel of + ExpBox {} -> tickBox + TopLevelBox {} + -> TopLevelDecl theFunTotals (tickedWith gid) : tickBox + LocalBox {} -> tickBox + BinBox _ True -> binBox + _ -> [] hunk ./utils/hpc/HpcMarkup.hs 175 - let modSummary = foldr (.) id - [ \ st -> - case boxLabel of - ExpBox False - -> st { expTicked = ticked (expTicked st) - , expTotal = succ (expTotal st) - } - ExpBox True - -> st { expTicked = ticked (expTicked st) - , expTotal = succ (expTotal st) - , altTicked = ticked (altTicked st) - , altTotal = succ (altTotal st) - } - TopLevelBox _ -> - st { topFunTicked = ticked (topFunTicked st) - , topFunTotal = succ (topFunTotal st) - } + let modSummary = foldr (.) id + [ \ st -> + case boxLabel of + ExpBox False + -> st { expTicked = ticked (expTicked st) + , expTotal = succ (expTotal st) + } + ExpBox True + -> st { expTicked = ticked (expTicked st) + , expTotal = succ (expTotal st) + , altTicked = ticked (altTicked st) + , altTotal = succ (altTotal st) + } + TopLevelBox _ -> + st { topFunTicked = ticked (topFunTicked st) + , topFunTotal = succ (topFunTotal st) + } hunk ./utils/hpc/HpcMarkup.hs 193 - | (gid,(_pos,boxLabel)) <- zip [0 ..] mix' + | (gid,(_pos,boxLabel)) <- zip [0 ..] mix' hunk ./utils/hpc/HpcMarkup.hs 195 - then succ - else id + then succ + else id hunk ./utils/hpc/HpcMarkup.hs 204 - let addLine n xs = "" ++ show' n ++ " " ++ xs + let addLine n xs = "" ++ show' n ++ " " ++ xs hunk ./utils/hpc/HpcMarkup.hs 209 - unlines [ "", - "
"] ++ addLines content' ++ "\n
\n\n"; + unlines [ "", + "
"] ++ addLines content' ++ "\n
\n\n"; hunk ./utils/hpc/HpcMarkup.hs 230 - deriving (Eq,Ord,Show) + deriving (Eq,Ord,Show) hunk ./utils/hpc/HpcMarkup.hs 232 -data Markup - = NotTicked - | TickedOnlyTrue - | TickedOnlyFalse +data Markup + = NotTicked + | TickedOnlyTrue + | TickedOnlyFalse hunk ./utils/hpc/HpcMarkup.hs 237 - | TopLevelDecl - Bool -- display entry totals - Integer + | TopLevelDecl + Bool -- display entry totals + Integer hunk ./utils/hpc/HpcMarkup.hs 242 -markup :: Int -- ^tabStop - -> [(HpcPos,Markup)] -- random list of tick location pairs - -> String -- text to mark up - -> String -markup tabStop mix str = addMarkup tabStop str (Loc 1 1) [] sortedTickLocs +markup :: Int -- ^tabStop + -> [(HpcPos,Markup)] -- random list of tick location pairs + -> String -- text to mark up + -> String +markup tabStop mix str = addMarkup tabStop str (Loc 1 1) [] sortedTickLocs hunk ./utils/hpc/HpcMarkup.hs 249 - | (pos,mark) <- mix - , let (ln1,c1,ln2,c2) = fromHpcPos pos - ] + | (pos,mark) <- mix + , let (ln1,c1,ln2,c2) = fromHpcPos pos + ] hunk ./utils/hpc/HpcMarkup.hs 255 -addMarkup :: Int -- tabStop - -> String -- text to mark up - -> Loc -- current location - -> [(Loc,Markup)] -- stack of open ticks, with closing location - -> [(Loc,Loc,Markup)] -- sorted list of tick location pairs - -> String +addMarkup :: Int -- tabStop + -> String -- text to mark up + -> Loc -- current location + -> [(Loc,Markup)] -- stack of open ticks, with closing location + -> [(Loc,Loc,Markup)] -- sorted list of tick location pairs + -> String hunk ./utils/hpc/HpcMarkup.hs 263 ---addMarkup tabStop cs loc os ticks +--addMarkup tabStop cs loc os ticks hunk ./utils/hpc/HpcMarkup.hs 266 ---addMarkup tabStop cs loc os@(_:_) ticks +--addMarkup tabStop cs loc os@(_:_) ticks hunk ./utils/hpc/HpcMarkup.hs 271 - concatMap (const closeTick) os + concatMap (const closeTick) os hunk ./utils/hpc/HpcMarkup.hs 280 - ((_,tik'):_) - | not (allowNesting tik0 tik') + ((_,tik'):_) + | not (allowNesting tik0 tik') hunk ./utils/hpc/HpcMarkup.hs 288 - | otherwise = (t',tik):(t',tik'):xs + | otherwise = (t',tik):(t',tik'):xs hunk ./utils/hpc/HpcMarkup.hs 291 - -- throw away this tick, because it is from a previous place ?? - addMarkup tabStop0 cs loc os ticks + -- throw away this tick, because it is from a previous place ?? + addMarkup tabStop0 cs loc os ticks hunk ./utils/hpc/HpcMarkup.hs 294 -addMarkup tabStop0 ('\n':cs) loc@(Loc ln col) os@((Loc ln2 col2,_):_) ticks - | ln == ln2 && col < col2 - = addMarkup tabStop0 (' ':'\n':cs) loc os ticks +addMarkup tabStop0 ('\n':cs) loc@(Loc ln col) os@((Loc ln2 col2,_):_) ticks + | ln == ln2 && col < col2 + = addMarkup tabStop0 (' ':'\n':cs) loc os ticks hunk ./utils/hpc/HpcMarkup.hs 317 - expand _ "" = "" + expand _ "" = "" hunk ./utils/hpc/HpcMarkup.hs 323 - + hunk ./utils/hpc/HpcMarkup.hs 328 - + hunk ./utils/hpc/HpcMarkup.hs 332 - + hunk ./utils/hpc/HpcMarkup.hs 336 -openTick NotTicked = "" -openTick IsTicked = "" -openTick TickedOnlyTrue = "" -openTick TickedOnlyFalse = "" +openTick NotTicked = "" +openTick IsTicked = "" +openTick TickedOnlyTrue = "" +openTick TickedOnlyFalse = "" hunk ./utils/hpc/HpcMarkup.hs 341 -openTick (TopLevelDecl True 0) - = "-- never entered" ++ - openTopDecl -openTick (TopLevelDecl True 1) - = "-- entered once" ++ - openTopDecl -openTick (TopLevelDecl True n0) - = "-- entered " ++ showBigNum n0 ++ " times" ++ openTopDecl +openTick (TopLevelDecl True 0) + = "-- never entered" ++ + openTopDecl +openTick (TopLevelDecl True 1) + = "-- entered once" ++ + openTopDecl +openTick (TopLevelDecl True n0) + = "-- entered " ++ showBigNum n0 ++ " times" ++ openTopDecl hunk ./utils/hpc/HpcMarkup.hs 350 - | otherwise = showBigNum' (n `div` 1000) ++ "," ++ showWith (n `mod` 1000) + | otherwise = showBigNum' (n `div` 1000) ++ "," ++ showWith (n `mod` 1000) hunk ./utils/hpc/HpcMarkup.hs 352 - | otherwise = showBigNum' (n `div` 1000) ++ "," ++ showWith (n `mod` 1000) + | otherwise = showBigNum' (n `div` 1000) ++ "," ++ showWith (n `mod` 1000) hunk ./utils/hpc/HpcMarkup.hs 369 -allowNesting :: Markup -- innermost - -> Markup -- outermost - -> Bool -allowNesting n m | n == m = False -- no need to double nest +allowNesting :: Markup -- innermost + -> Markup -- outermost + -> Bool +allowNesting n m | n == m = False -- no need to double nest hunk ./utils/hpc/HpcMarkup.hs 375 -allowNesting _ _ = True +allowNesting _ _ = True hunk ./utils/hpc/HpcMarkup.hs 379 -data ModuleSummary = ModuleSummary +data ModuleSummary = ModuleSummary hunk ./utils/hpc/HpcMarkup.hs 392 - "\n" ++ - "  module " - ++ modName ++ "\n" ++ + "\n" ++ + "  module " + ++ modName ++ "\n" ++ hunk ./utils/hpc/HpcMarkup.hs 402 - "\n" ++ + "\n" ++ hunk ./utils/hpc/HpcMarkup.hs 410 -showSummary ticked total = - "" ++ showP (percent ticked total) ++ "" ++ - "" ++ show ticked ++ "/" ++ show total ++ "" ++ - "" ++ - (case percent ticked total of - Nothing -> " " - Just w -> bar w "bar" - ) ++ "" +showSummary ticked total = + "" ++ showP (percent ticked total) ++ "" ++ + "" ++ show ticked ++ "/" ++ show total ++ "" ++ + "" ++ + (case percent ticked total of + Nothing -> " " + Just w -> bar w "bar" + ) ++ "" hunk ./utils/hpc/HpcMarkup.hs 423 - "" ++ - "" ++ - "
" + "" ++ + "" ++ + "
" hunk ./utils/hpc/HpcMarkup.hs 433 - { expTicked = 0 - , expTotal = 0 + { expTicked = 0 + , expTotal = 0 hunk ./utils/hpc/HpcMarkup.hs 441 - (ModuleSummary eTik2 eTot2 tTik2 tTot2 aTik2 aTot2) + (ModuleSummary eTik2 eTot2 tTik2 tTot2 aTik2 aTot2) hunk ./utils/hpc/HpcMarkup.hs 455 -#if __GLASGOW_HASKELL__ >= 604 +#if __GLASGOW_HASKELL__ >= 604 }