X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fnofib-analyse%2FSlurp.hs;h=8305f3e87b7e2d48e8257194869b7ba8ce2f3a5e;hb=80b1239ee0f6938195d25081601fb2852dcda1e9;hp=a45785729abca6cf630331170136d9c0d7db1263;hpb=e6d766e81c2c8fd0593778f9996103a65019189a;p=ghc-hetmet.git

diff --git a/utils/nofib-analyse/Slurp.hs b/utils/nofib-analyse/Slurp.hs
index a457857..8305f3e 100644
--- a/utils/nofib-analyse/Slurp.hs
+++ b/utils/nofib-analyse/Slurp.hs
@@ -4,11 +4,11 @@
 --
 -----------------------------------------------------------------------------
 
-module Slurp (Status(..), Results(..), ResultTable(..), parse_log) where
+module Slurp (Status(..), Results(..), ResultTable, parse_log) where
 
 import CmdLine
 import Data.FiniteMap
-import RegexString
+import Text.Regex
 import Data.Maybe
 -- import Debug.Trace
 
@@ -75,7 +75,8 @@ Various banner lines:
 ==nofib== boyer2: time to compile Checker follows...
 -}
 
-banner_re = mkRegex "^==nofib==[ \t]+([A-Za-z0-9\\-_]+):[ \t]+(size of|time to link|time to run|time to compile)[ \t]+([A-Za-z0-9\\-_]+)(\\.o)?[ \t]+follows"
+-- NB. the hyphen must come last (or first) inside [...] to stand for itself.
+banner_re = mkRegex "^==nofib==[ \t]+([A-Za-z0-9_-]+):[ \t]+(size of|time to link|time to run|time to compile)[ \t]+([A-Za-z0-9_-]+)(\\.o)?[ \t]+follows"
 
 {-
 This regexp for the output of "time" works on FreeBSD, other versions