diff options
| author | kr.angelov <kr.angelov@gmail.com> | 2007-09-24 08:12:11 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@gmail.com> | 2007-09-24 08:12:11 +0000 |
| commit | 6aacec3591e0e6e1d3ddca4605f6467e302cb65f (patch) | |
| tree | b18525e17809f1bbef96c6778038085eb7bd8ea0 /src/GF/Compile/ShellState.hs | |
| parent | 0cd5e62e836e8cb8d2b49f76bfb899081aa2366f (diff) | |
remove FTypes module and move all definitions to Formalism.FCFG
Diffstat (limited to 'src/GF/Compile/ShellState.hs')
| -rw-r--r-- | src/GF/Compile/ShellState.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/GF/Compile/ShellState.hs b/src/GF/Compile/ShellState.hs index e9533e1a0..41bcf50c7 100644 --- a/src/GF/Compile/ShellState.hs +++ b/src/GF/Compile/ShellState.hs @@ -44,6 +44,7 @@ import GF.System.Arch (ModTime) import qualified Transfer.InterpreterAPI as T +import GF.Formalism.FCFG import qualified GF.OldParsing.ConvertGrammar as CnvOld -- OBSOLETE import qualified GF.Conversion.GFC as Cnv import qualified GF.Conversion.SimpleToFCFG as FCnv @@ -67,7 +68,7 @@ data ShellState = ShSt { cfs :: [(Ident,CF)] , -- ^ context-free grammars (small, no parameters, very over-generating) abstracts :: [(Ident,[Ident])], -- ^ abstracts and their associated concretes mcfgs :: [(Ident, Cnv.MGrammar)], -- ^ MCFG, converted according to Ljunglöf (2004, ch 3) - fcfgs :: [(Ident, Cnv.FGrammar)], -- ^ FCFG, optimized MCFG by Krasimir Angelov + fcfgs :: [(Ident, FGrammar)], -- ^ FCFG, optimized MCFG by Krasimir Angelov cfgs :: [(Ident, Cnv.CGrammar)], -- ^ CFG, converted from mcfg -- (large, with parameters, no-so overgenerating) pInfos :: [(Ident, Prs.PInfo)], -- ^ parsing information (compiled mcfg&cfg grammars) @@ -146,7 +147,7 @@ data StateGrammar = StGr { grammar :: CanonGrammar, cf :: CF, mcfg :: Cnv.MGrammar, - fcfg :: Cnv.FGrammar, + fcfg :: FGrammar, cfg :: Cnv.CGrammar, pInfo :: Prs.PInfo, morpho :: Morpho, @@ -174,7 +175,7 @@ emptyStateGrammar = StGr { stateGrammarST :: StateGrammar -> CanonGrammar stateCF :: StateGrammar -> CF stateMCFG :: StateGrammar -> Cnv.MGrammar -stateFCFG :: StateGrammar -> Cnv.FGrammar +stateFCFG :: StateGrammar -> FGrammar stateCFG :: StateGrammar -> Cnv.CGrammar statePInfo :: StateGrammar -> Prs.PInfo stateMorpho :: StateGrammar -> Morpho |