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

A bit more verbosity when combining PGF files. Use putPointE when writing output files.

Browse Source
This commit is contained in:
bjorn
2008-10-16 10:12:57 +00:00
parent 21e3858442
commit e75ccc2542
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GF/Infra/UseIO.hs
View File

@@ -26,6 +26,7 @@ import System.IO.Error
import System.Environment import System.Environment
import System.Exit import System.Exit
import System.CPUTime import System.CPUTime
import Text.Printf
import Control.Monad import Control.Monad
import Control.Exception(evaluate) import Control.Exception(evaluate)
import qualified Data.ByteString.Char8 as BS import qualified Data.ByteString.Char8 as BS
@@ -239,7 +240,8 @@ putPointE v opts msg act = do
t2 <- ioeIO $ getCPUTime t2 <- ioeIO $ getCPUTime
if flag optShowCPUTime opts if flag optShowCPUTime opts
then putStrLnE (" " ++ show ((t2 - t1) `div` 1000000000) ++ " msec") then do let msec = (t2 - t1) `div` 1000000000
putStrLnE (printf " %5d msec" msec)
else when (verbAtLeast opts v) $ putStrLnE "" else when (verbAtLeast opts v) $ putStrLnE ""
return a return a

12
src/GFC.hs
View File

@@ -51,9 +51,10 @@ compileCFFiles opts fs =
unionPGFFiles :: Options -> [FilePath] -> IOE () unionPGFFiles :: Options -> [FilePath] -> IOE ()
unionPGFFiles opts fs = unionPGFFiles opts fs =
do pgfs <- ioeIO $ mapM readPGF fs do pgfs <- mapM readPGFVerbose fs
let pgf = foldl1 unionPGF pgfs let pgf = foldl1 unionPGF pgfs
writeOutputs opts pgf writeOutputs opts pgf
where readPGFVerbose f = putPointE Normal opts ("Reading " ++ f ++ "...") $ ioeIO $ readPGF f
writeOutputs :: Options -> PGF -> IOE () writeOutputs :: Options -> PGF -> IOE ()
writeOutputs opts pgf = writeOutputs opts pgf =
@@ -66,9 +67,8 @@ writeOutput opts file str =
do let path = case flag optOutputDir opts of do let path = case flag optOutputDir opts of
Nothing -> file Nothing -> file
Just dir -> dir </> file Just dir -> dir </> file
writeOutputFile path str writeOutputFile opts path str
writeOutputFile :: FilePath -> String -> IOE () writeOutputFile :: Options -> FilePath -> String -> IOE ()
writeOutputFile outfile output = ioeIO $ writeOutputFile opts outfile output =
do writeFile outfile output do putPointE Normal opts ("Writing " ++ outfile ++ "...") $ ioeIO $ writeFile outfile output
putStrLn $ "wrote file " ++ outfile