diff --git a/src/GF/Canon/GetGFC.hs b/src/GF/Canon/GetGFC.hs index 225b0712a..8bf2fab82 100644 --- a/src/GF/Canon/GetGFC.hs +++ b/src/GF/Canon/GetGFC.hs @@ -18,5 +18,5 @@ getCanonModule file = do getCanonGrammar :: FilePath -> IOE CanonGrammar getCanonGrammar file = do s <- ioeIO $ readFileIf file - c <- ioeErr $ err2err $ pCanon $ myLexer s + c <- ioeErr {- $ err2err -} $ pCanon $ myLexer s return $ canon2grammar c diff --git a/src/GF/Compile/Compile.hs b/src/GF/Compile/Compile.hs index 88f601a18..cfe8376ec 100644 --- a/src/GF/Compile/Compile.hs +++ b/src/GF/Compile/Compile.hs @@ -87,15 +87,16 @@ compileModule opts1 st0 file = do let ps = if useFileOpt then (map (prefixPathName fpath) ps0) else ps0 - ioeIO $ putStrLn $ "module search path:" +++ show ps ---- + let ioeIOIf = if oElem beSilent opts then (const (return ())) else ioeIO + ioeIOIf $ putStrLn $ "module search path:" +++ show ps ---- let putp = putPointE opts let st = st0 --- if useFileOpt then emptyShellState else st0 let rfs = readFiles st let file' = if useFileOpt then justFileName file else file -- to find file itself files <- getAllFiles opts ps rfs file' - ioeIO $ putStrLn $ "files to read:" +++ show files ---- + ioeIOIf $ putStrLn $ "files to read:" +++ show files ---- let names = map justModuleName files - ioeIO $ putStrLn $ "modules to include:" +++ show names ---- + ioeIOIf $ putStrLn $ "modules to include:" +++ show names ---- let env0 = compileEnvShSt st names (_,sgr,cgr) <- foldM (compileOne opts) env0 files t <- ioeIO getNowTime diff --git a/src/GF/Compile/GetGrammar.hs b/src/GF/Compile/GetGrammar.hs index a9cae513a..4e641dc3d 100644 --- a/src/GF/Compile/GetGrammar.hs +++ b/src/GF/Compile/GetGrammar.hs @@ -31,7 +31,7 @@ getSourceModule :: FilePath -> IOE SourceModule getSourceModule file = do string <- readFileIOE file let tokens = myLexer string - mo1 <- ioeErr $ err2err $ pModDef tokens + mo1 <- ioeErr $ {- err2err $ -} pModDef tokens ioeErr $ transModDef mo1 @@ -62,7 +62,7 @@ parseOldGrammar :: FilePath -> IOE ([FilePath],[A.TopDef]) parseOldGrammar file = do putStrE $ "reading old file" +++ file s <- ioeIO $ readFileIf file - A.OldGr incl topdefs <- ioeErr $ err2err $ pOldGrammar $ oldLexer $ fixNewlines s + A.OldGr incl topdefs <- ioeErr $ {- err2err $ -} pOldGrammar $ oldLexer $ fixNewlines s includes <- ioeErr $ transInclude incl return (includes, topdefs) diff --git a/src/GF/Compile/PGrammar.hs b/src/GF/Compile/PGrammar.hs index e2fdebd58..54c152496 100644 --- a/src/GF/Compile/PGrammar.hs +++ b/src/GF/Compile/PGrammar.hs @@ -15,7 +15,7 @@ import Operations pTerm :: String -> Err Term pTerm s = do - e <- err2err $ pExp $ myLexer s + e <- {- err2err $ -} pExp $ myLexer s transExp e pTrm :: String -> Term diff --git a/src/Today.hs b/src/Today.hs index c8f07c07a..f9ac9d793 100644 --- a/src/Today.hs +++ b/src/Today.hs @@ -1 +1 @@ -module Today where today = "Fri May 28 15:17:28 CEST 2004" +module Today where today = "Thu Jun 3 19:06:03 CEST 2004"