From 6aacec3591e0e6e1d3ddca4605f6467e302cb65f Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Mon, 24 Sep 2007 08:12:11 +0000 Subject: remove FTypes module and move all definitions to Formalism.FCFG --- src/GF/Parsing/GFC.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/GF/Parsing/GFC.hs') diff --git a/src/GF/Parsing/GFC.hs b/src/GF/Parsing/GFC.hs index 6d6c662c0..90ba718c7 100644 --- a/src/GF/Parsing/GFC.hs +++ b/src/GF/Parsing/GFC.hs @@ -32,11 +32,11 @@ import GF.Data.SortedList import GF.Data.Assoc import GF.Formalism.Utilities import GF.Conversion.Types -import GF.Conversion.FTypes import qualified GF.Formalism.GCFG as G import qualified GF.Formalism.SimpleGFC as S import qualified GF.Formalism.MCFG as M +import GF.Formalism.FCFG import qualified GF.Formalism.CFG as C import qualified GF.Parsing.MCFG as PM import qualified GF.Parsing.FCFG as PF @@ -46,12 +46,11 @@ import qualified GF.Parsing.CFG as PC -- parsing information data PInfo = PInfo { mcfPInfo :: MCFPInfo - , fcfPInfo :: FCFPInfo + , fcfPInfo :: PF.FCFPInfo , cfPInfo :: CFPInfo } type MCFPInfo = PM.MCFPInfo MCat Name MLabel Token -type FCFPInfo = PF.FCFPInfo FCat FName Token type CFPInfo = PC.CFPInfo CCat Name Token buildPInfo :: MGrammar -> FGrammar -> CGrammar -> PInfo -- cgit v1.2.3