diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-12-03 13:55:20 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-12-03 13:55:20 +0000 |
| commit | 91d25cf9ee703506ff198bd899d0cd40c4cba0cd (patch) | |
| tree | 40911be030a972e5dadf1fdb7a248621c8018168 | |
| parent | c2792423039fc62d809bb56a5f9f57494d05176b (diff) | |
| download | haskell-91d25cf9ee703506ff198bd899d0cd40c4cba0cd.tar.gz | |
Fix HPC column numbers, following the column number changes in GHC
| -rw-r--r-- | compiler/deSugar/Coverage.lhs | 4 | ||||
| -rw-r--r-- | utils/hpc/HpcLexer.hs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/deSugar/Coverage.lhs b/compiler/deSugar/Coverage.lhs index 2136d01675..b161a21528 100644 --- a/compiler/deSugar/Coverage.lhs +++ b/compiler/deSugar/Coverage.lhs @@ -742,9 +742,9 @@ mkHpcPos pos start = srcSpanStart pos end = srcSpanEnd pos hpcPos = toHpcPos ( srcLocLine start - , srcLocCol start + 1 + , srcLocCol start , srcLocLine end - , srcLocCol end + , srcLocCol end - 1 ) hpcSrcSpan :: SrcSpan diff --git a/utils/hpc/HpcLexer.hs b/utils/hpc/HpcLexer.hs index db886a38ac..feeb35a8ff 100644 --- a/utils/hpc/HpcLexer.hs +++ b/utils/hpc/HpcLexer.hs @@ -11,11 +11,11 @@ data Token deriving (Eq,Show) initLexer :: String -> [Token] -initLexer str = [ t | (_,_,t) <- lexer str 1 0 ] +initLexer str = [ t | (_,_,t) <- lexer str 1 1 ] lexer :: String -> Int -> Int -> [(Int,Int,Token)] lexer (c:cs) line column - | c == '\n' = lexer cs (succ line) 0 + | c == '\n' = lexer cs (succ line) 1 | c == '\"' = lexerSTR cs line (succ column) | c == '[' = lexerCAT cs "" line (succ column) | c `elem` "{};-:" |