msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

Add file name to error message when reading a bad .gfo file (in some cases)

Browse Source 
This turns error messages like 

	gf: too few bytes. Failed reading at byte position 1

	gf: /some/path/somefile.gfo: too few bytes. Failed reading at byte position 1

but a better fix would be to ignore bad .gfo files and compile from source.
The problem is the way this decision is made in
GF.Compile.ReadFiles.selectFormat...
This commit is contained in:
hallgren
2012-06-15 10:15:16 +00:00
parent d0281ef22f
commit fe34a29f4f
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/compiler/GF/Grammar/Binary.hs
View File

@@ -9,6 +9,9 @@
module GF.Grammar.Binary where module GF.Grammar.Binary where
import Prelude hiding (catch)
import Control.Exception(catch,ErrorCall(..),throwIO)
import Data.Char import Data.Char
import Data.Binary import Data.Binary
import Control.Monad import Control.Monad
@@ -291,10 +294,9 @@ putGFOVersion = mapM_ (putWord8 . fromIntegral . ord) gfoVersion
getGFOVersion = replicateM (length gfoVersion) (fmap (chr . fromIntegral) getWord8) getGFOVersion = replicateM (length gfoVersion) (fmap (chr . fromIntegral) getWord8)
decodeModule :: FilePath -> IO SourceModule decodeModule :: FilePath -> IO SourceModule
decodeModule fpath = decodeModule fpath = decodeFile' fpath (getGFOVersion >> get)
decodeFile_ fpath (getGFOVersion >> get)
decodeModuleHeader fpath = decodeFile_ fpath getVersionedMod decodeModuleHeader fpath = decodeFile' fpath getVersionedMod
where where
getVersionedMod = do getVersionedMod = do
ver <- getGFOVersion ver <- getGFOVersion
@@ -306,3 +308,12 @@ decodeModuleHeader fpath = decodeFile_ fpath getVersionedMod
encodeModule :: FilePath -> SourceModule -> IO () encodeModule :: FilePath -> SourceModule -> IO ()
encodeModule fpath mo = encodeModule fpath mo =
encodeFile_ fpath (putGFOVersion >> put mo) encodeFile_ fpath (putGFOVersion >> put mo)
-- | like decodeFile_ but adds file name to error message if there was an error
decodeFile' fpath get = addFPath fpath (decodeFile_ fpath get)
-- | Adds file name to error message if there was an error,
-- | but laziness can cause errors to slip through
addFPath fpath m = m `catch` handle
where
handle (ErrorCall msg) = throwIO (ErrorCall (fpath++": "++msg))