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

SymbPN and SymbCN in resources

Browse Source
This commit is contained in:
aarne
2004-06-03 19:31:39 +00:00
parent 7716f81886
commit e78e5a6af7
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/GF/Canon/GetGFC.hs
View File

@@ -18,5 +18,5 @@ getCanonModule file = do
getCanonGrammar :: FilePath -> IOE CanonGrammar getCanonGrammar :: FilePath -> IOE CanonGrammar
getCanonGrammar file = do getCanonGrammar file = do
s <- ioeIO $ readFileIf file s <- ioeIO $ readFileIf file
c <- ioeErr $ err2err $ pCanon $ myLexer s c <- ioeErr {- $ err2err -} $ pCanon $ myLexer s
return $ canon2grammar c return $ canon2grammar c

7
src/GF/Compile/Compile.hs
View File

@@ -87,15 +87,16 @@ compileModule opts1 st0 file = do
let ps = if useFileOpt let ps = if useFileOpt
then (map (prefixPathName fpath) ps0) then (map (prefixPathName fpath) ps0)
else 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 putp = putPointE opts
let st = st0 --- if useFileOpt then emptyShellState else st0 let st = st0 --- if useFileOpt then emptyShellState else st0
let rfs = readFiles st let rfs = readFiles st
let file' = if useFileOpt then justFileName file else file -- to find file itself let file' = if useFileOpt then justFileName file else file -- to find file itself
files <- getAllFiles opts ps rfs file' 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 let names = map justModuleName files
ioeIO $ putStrLn $ "modules to include:" +++ show names ---- ioeIOIf $ putStrLn $ "modules to include:" +++ show names ----
let env0 = compileEnvShSt st names let env0 = compileEnvShSt st names
(_,sgr,cgr) <- foldM (compileOne opts) env0 files (_,sgr,cgr) <- foldM (compileOne opts) env0 files
t <- ioeIO getNowTime t <- ioeIO getNowTime

4
src/GF/Compile/GetGrammar.hs
View File

@@ -31,7 +31,7 @@ getSourceModule :: FilePath -> IOE SourceModule
getSourceModule file = do getSourceModule file = do
string <- readFileIOE file string <- readFileIOE file
let tokens = myLexer string let tokens = myLexer string
mo1 <- ioeErr $ err2err $ pModDef tokens mo1 <- ioeErr $ {- err2err $ -} pModDef tokens
ioeErr $ transModDef mo1 ioeErr $ transModDef mo1
@@ -62,7 +62,7 @@ parseOldGrammar :: FilePath -> IOE ([FilePath],[A.TopDef])
parseOldGrammar file = do parseOldGrammar file = do
putStrE $ "reading old file" +++ file putStrE $ "reading old file" +++ file
s <- ioeIO $ readFileIf 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 includes <- ioeErr $ transInclude incl
return (includes, topdefs) return (includes, topdefs)

2
src/GF/Compile/PGrammar.hs
View File

@@ -15,7 +15,7 @@ import Operations
pTerm :: String -> Err Term pTerm :: String -> Err Term
pTerm s = do pTerm s = do
e <- err2err $ pExp $ myLexer s e <- {- err2err $ -} pExp $ myLexer s
transExp e transExp e
pTrm :: String -> Term pTrm :: String -> Term

2
src/Today.hs
View File

@@ -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"