diff options
| author | bringert <bringert@cs.chalmers.se> | 2007-12-20 17:34:12 +0000 |
|---|---|---|
| committer | bringert <bringert@cs.chalmers.se> | 2007-12-20 17:34:12 +0000 |
| commit | 5b01d912cec744f41b5e0ba5720d7d641ca08195 (patch) | |
| tree | bd353951e362393e300f33fdbbff3fc192f1ae6c /src/GF/Parsing | |
| parent | 4ab0df67c5c5ae837e63b3c7285ef97058740778 (diff) | |
Replace all the different ErrM.hs modules with GF.Data.ErrM.
Diffstat (limited to 'src/GF/Parsing')
| -rw-r--r-- | src/GF/Parsing/FCFG.hs | 2 | ||||
| -rw-r--r-- | src/GF/Parsing/GFC.hs | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/GF/Parsing/FCFG.hs b/src/GF/Parsing/FCFG.hs index 8cd969b69..30a7801c8 100644 --- a/src/GF/Parsing/FCFG.hs +++ b/src/GF/Parsing/FCFG.hs @@ -24,7 +24,7 @@ import GF.Parsing.FCFG.PInfo import GF.GFCC.DataGFCC import GF.GFCC.CId import GF.GFCC.Macros -import GF.GFCC.ErrM +import GF.Data.ErrM import qualified Data.Map as Map diff --git a/src/GF/Parsing/GFC.hs b/src/GF/Parsing/GFC.hs index ed450b63f..9f1328a50 100644 --- a/src/GF/Parsing/GFC.hs +++ b/src/GF/Parsing/GFC.hs @@ -19,14 +19,13 @@ import GF.System.Tracing import GF.Infra.Print import qualified GF.Grammar.PrGrammar as PrGrammar -import GF.Data.Operations (Err(..)) +import GF.Data.ErrM import qualified GF.Grammar.Grammar as Grammar import qualified GF.Grammar.Macros as Macros import qualified GF.Canon.AbsGFC as AbsGFC import qualified GF.GFCC.DataGFCC as AbsGFCC import GF.GFCC.CId -import qualified GF.GFCC.ErrM as ErrM import qualified GF.Infra.Ident as Ident import GF.CF.CFIdent (CFCat, cfCat2Ident, CFTok, wordsCFTok, prCFTok) @@ -73,7 +72,7 @@ parse :: String -- ^ parsing algorithm (mcfg or cfg) -> Ident.Ident -- ^ abstract module name -> CFCat -- ^ starting category -> [CFTok] -- ^ input tokens - -> GF.Data.Operations.Err [Grammar.Term] -- ^ resulting GF terms + -> Err [Grammar.Term] -- ^ resulting GF terms -- parsing via CFG @@ -137,8 +136,8 @@ parse "f" strategy pinfo abs startCat inString = let Ident.IC x = cfCat2Ident startCat cat' = CId x in case PF.parseFCF strategy (fcfPInfo pinfo) cat' (map prCFTok inString) of - ErrM.Ok es -> Ok (map (exp2term abs) es) - ErrM.Bad msg -> Bad msg + Ok es -> Ok (map (exp2term abs) es) + Bad msg -> Bad msg -- error parser: |