diff options
| author | aarne <unknown> | 2005-03-08 17:08:58 +0000 |
|---|---|---|
| committer | aarne <unknown> | 2005-03-08 17:08:58 +0000 |
| commit | 73b0f9dbabde5363e7386e2efcc30d6248f5ff19 (patch) | |
| tree | 72ca90a8fdc76558cf590b99b43877169f2f4ead /src/GF/Infra | |
| parent | eefced4abe9b45dbd284c639d8b8943977ba2107 (diff) | |
auto-insert default lincat; eliminate deps bug; less verbosity in import; take away word order variants in Scand
Diffstat (limited to 'src/GF/Infra')
| -rw-r--r-- | src/GF/Infra/ReadFiles.hs | 12 | ||||
| -rw-r--r-- | src/GF/Infra/UseIO.hs | 18 |
2 files changed, 19 insertions, 11 deletions
diff --git a/src/GF/Infra/ReadFiles.hs b/src/GF/Infra/ReadFiles.hs index d65ffedfb..9315633b3 100644 --- a/src/GF/Infra/ReadFiles.hs +++ b/src/GF/Infra/ReadFiles.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/02/18 19:21:15 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.19 $ +-- > CVS $Date: 2005/03/08 18:08:58 $ +-- > CVS $Author: aarne $ +-- > CVS $Revision: 1.20 $ -- -- Decide what files to read as function of dependencies and time stamps. -- @@ -45,9 +45,9 @@ getAllFiles opts ps env file = do -- read module headers from all files recursively ds0 <- getImports ps file let ds = [((snd m,map fst ms),p) | ((m,ms),p) <- ds0] - if oElem beSilent opts - then return () - else ioeIO $ putStrLn $ "all modules:" +++ show (map (fst . fst) ds) + if oElem beVerbose opts + then ioeIO $ putStrLn $ "all modules:" +++ show (map (fst . fst) ds) + else return () -- get a topological sorting of files: returns file names --- deletes paths ds1 <- ioeErr $ either return diff --git a/src/GF/Infra/UseIO.hs b/src/GF/Infra/UseIO.hs index 51dfc71e8..9aabd0f3e 100644 --- a/src/GF/Infra/UseIO.hs +++ b/src/GF/Infra/UseIO.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/02/24 11:46:36 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.9 $ +-- > CVS $Date: 2005/03/08 18:08:58 $ +-- > CVS $Author: aarne $ +-- > CVS $Revision: 1.10 $ -- -- (Description of the module) ----------------------------------------------------------------------------- @@ -227,9 +227,17 @@ putStrLnE = ioeIO . putStrLnFlush putStrE :: String -> IOE () putStrE = ioeIO . putStrFlush +-- this is more verbose putPointE :: Options -> String -> IOE a -> IOE a -putPointE opts msg act = do - let ve x = if oElem beSilent opts then return () else x +putPointE = putPointEgen (oElem beSilent) + +-- this is less verbose +putPointEsil :: Options -> String -> IOE a -> IOE a +putPointEsil = putPointEgen (not . oElem beVerbose) + +putPointEgen :: (Options -> Bool) -> Options -> String -> IOE a -> IOE a +putPointEgen cond opts msg act = do + let ve x = if cond opts then return () else x ve $ ioeIO $ putStrFlush msg a <- act --- ve $ ioeIO $ putShow' id a --- replace by a statistics command |