slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix double error message output, clean up some ghc-version-specific imports

Browse Source
This commit is contained in:
Simon Michael 2010-09-03 23:39:11 +00:00
parent 0ea8a67c68
commit 334974dedd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hledger-lib/Hledger/Read.hs
View File

@ -29,12 +29,12 @@ import Safe (headDef)
import System.Directory (doesFileExist, getHomeDirectory) import System.Directory (doesFileExist, getHomeDirectory)
import System.Environment (getEnv) import System.Environment (getEnv)
import System.FilePath ((</>)) import System.FilePath ((</>))
import System.IO (IOMode(..), withFile, hGetContents, stderr) import System.IO (IOMode(..), withFile, stderr)
#if __GLASGOW_HASKELL__ <= 610 #if __GLASGOW_HASKELL__ <= 610
import Prelude hiding (readFile, putStr, putStrLn, print, getContents) import Prelude hiding (getContents)
import System.IO.UTF8 import System.IO.UTF8 (getContents, hGetContents)
#else #else
import System.IO (hPutStrLn) import System.IO (hGetContents)
#endif #endif
@ -70,7 +70,7 @@ journalFromPathAndString format fp s = do
Nothing -> readers Nothing -> readers
(errors, journals) <- partitionEithers `fmap` mapM tryReader readers' (errors, journals) <- partitionEithers `fmap` mapM tryReader readers'
case journals of j:_ -> return $ Right j case journals of j:_ -> return $ Right j
_ -> let s = errMsg errors in hPutStrLn stderr s >> return (Left s) _ -> return $ Left $ errMsg errors
where where
tryReader r = (runErrorT . (rParser r) fp) s tryReader r = (runErrorT . (rParser r) fp) s
errMsg [] = unknownFormatMsg errMsg [] = unknownFormatMsg