summaryrefslogtreecommitdiff
path: root/src/GF/Compile
diff options
context:
space:
mode:
authoraarne <unknown>2004-06-03 19:31:39 +0000
committeraarne <unknown>2004-06-03 19:31:39 +0000
commite78e5a6af7d92a2596d587588b6fabc03618e8d3 (patch)
tree83d22d534aa856d2e03cb6d0b141f3ded5a4d791 /src/GF/Compile
parent7716f818869971da138cf706c124a6be73bbab62 (diff)
SymbPN and SymbCN in resources
Diffstat (limited to 'src/GF/Compile')
-rw-r--r--src/GF/Compile/Compile.hs7
-rw-r--r--src/GF/Compile/GetGrammar.hs4
-rw-r--r--src/GF/Compile/PGrammar.hs2
3 files changed, 7 insertions, 6 deletions
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