[commit: nofib] master: Detect unhandled ghc output lines in Slurp (66f6df2)
Max Bolingbroke
batterseapower at hotmail.com
Thu Feb 23 20:42:10 CET 2012
Repository : ssh://darcs.haskell.org//srv/darcs/nofib
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/66f6df2d5b95d6ba8c04473f02e1a57c70231d9f
>---------------------------------------------------------------
commit 66f6df2d5b95d6ba8c04473f02e1a57c70231d9f
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date: Thu Feb 23 19:28:02 2012 +0000
Detect unhandled ghc output lines in Slurp
>---------------------------------------------------------------
nofib-analyse/Slurp.hs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/nofib-analyse/Slurp.hs b/nofib-analyse/Slurp.hs
index 43653a4..68d99b7 100644
--- a/nofib-analyse/Slurp.hs
+++ b/nofib-analyse/Slurp.hs
@@ -9,6 +9,7 @@ module Slurp (Status(..), Results(..), ResultTable, parse_log) where
import Control.Monad
import qualified Data.Map as Map
import Data.Map (Map)
+import Data.List (isPrefixOf)
import Text.Regex
-- import Debug.Trace
@@ -411,7 +412,8 @@ parse_run_time prog (l:ls) res ex =
[gc0_count] [gc0] [gc0_elapsed] [gc1_count] [gc1] [gc1_elapsed] [bal]
[gc_work'] Nothing Nothing Nothing Nothing [in_use];
- Nothing ->
+ Nothing | "<<ghc" `isPrefixOf` l -> error $ "Failed to parse GHC output " ++ show l
+ | otherwise ->
case matchRegex wrong_output l of {
Just ["stdout"] ->
More information about the Cvs-ghc
mailing list