GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-22 03:09:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

switched to unmodified BNFC-generated components

Browse Source
This commit is contained in:
aarne
2008-03-15 14:53:42 +00:00
parent eff08dfe88
commit c73bc4f996
13 changed files with 860 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@ module GF.Compile.GetGrammar (
) where
import GF.Data.Operations
import qualified GF.Data.ErrM as E ----
import qualified GF.Source.ErrM as E
import GF.Infra.UseIO
import GF.Grammar.Grammar
@@ -62,14 +62,14 @@ getSourceModule opts file0 = do
Just "utf8" -> decodeUTF8 string0
_ -> string0
let tokens = myLexer string
mo1 <- ioeErr $ {- err2err $ -} pModDef tokens
mo1 <- ioeErr $ err2err $ pModDef tokens
ioeErr $ transModDef mo1
getSourceGrammar :: Options -> FilePath -> IOE SourceGrammar
getSourceGrammar opts file = do
string <- readFileIOE file
let tokens = myLexer string
gr1 <- ioeErr $ {- err2err $ -} pGrammar tokens
gr1 <- ioeErr $ err2err $ pGrammar tokens
ioeErr $ transGrammar gr1
@@ -101,7 +101,7 @@ parseOldGrammar :: FilePath -> IOE ([FilePath],[A.TopDef])
parseOldGrammar file = do
putStrLnE $ "reading old file" +++ file
s <- ioeIO $ readFileIf file
A.OldGr incl topdefs <- ioeErr $ pOldGrammar $ oldLexer $ fixNewlines s
A.OldGr incl topdefs <- ioeErr $ err2err $ pOldGrammar $ oldLexer $ fixNewlines s
includes <- ioeErr $ transInclude incl
return (includes, topdefs)

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

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