normalise file names.

This commit is contained in:
Kazu Yamamoto 2013-03-05 15:18:57 +09:00
parent 4f44d54b0a
commit 87d48127db

View File

@ -14,6 +14,7 @@ import GHC
import qualified Gap import qualified Gap
import HscTypes import HscTypes
import Outputable import Outputable
import System.FilePath (normalise)
---------------------------------------------------------------- ----------------------------------------------------------------
@ -52,10 +53,10 @@ ppErrMsg err = ppMsg spn SevError msg defaultUserStyle ++ ext
ppMsg :: SrcSpan -> Severity-> SDoc -> PprStyle -> String ppMsg :: SrcSpan -> Severity-> SDoc -> PprStyle -> String
ppMsg spn sev msg stl = fromMaybe def $ do ppMsg spn sev msg stl = fromMaybe def $ do
(line,col,_,_) <- Gap.getSrcSpan spn (line,col,_,_) <- Gap.getSrcSpan spn
file <- Gap.getSrcFile spn file <- normalise <$> Gap.getSrcFile spn
let severityCaption = Gap.showSeverityCaption sev let severityCaption = Gap.showSeverityCaption sev
return $ file ++ ":" ++ show line ++ ":" return $ file ++ ":" ++ show line ++ ":"
++ show col ++ ":" ++ severityCaption ++ cts ++ "\0" ++ show col ++ ":" ++ severityCaption ++ cts ++ "\0"
where where
def = "ghc-mod:0:0:Probably mutual module import occurred\0" def = "ghc-mod:0:0:Probably mutual module import occurred\0"
cts = showMsg msg stl cts = showMsg msg stl