diff options
| author | krasimir <krasimir@chalmers.se> | 2008-05-29 12:08:45 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2008-05-29 12:08:45 +0000 |
| commit | 9a759a66dc33f82f457fc649b669fcc8d32edf3e (patch) | |
| tree | ba7e5a77804767f134e1a6e34ac6a67cc23aa30e /src-3.0/GF/Parsing/FCFG | |
| parent | 363ddd7b916a48f86f1520350097f83175a0debf (diff) | |
move GF.Formalism.FCFG types to GF.GFCC.DataGFCC
Diffstat (limited to 'src-3.0/GF/Parsing/FCFG')
| -rw-r--r-- | src-3.0/GF/Parsing/FCFG/Active.hs | 2 | ||||
| -rw-r--r-- | src-3.0/GF/Parsing/FCFG/PInfo.hs | 20 |
2 files changed, 2 insertions, 20 deletions
diff --git a/src-3.0/GF/Parsing/FCFG/Active.hs b/src-3.0/GF/Parsing/FCFG/Active.hs index 7db4fbb61..3b389f237 100644 --- a/src-3.0/GF/Parsing/FCFG/Active.hs +++ b/src-3.0/GF/Parsing/FCFG/Active.hs @@ -15,7 +15,7 @@ import GF.Data.SortedList import GF.Data.Utilities import GF.GFCC.CId -import GF.Formalism.FCFG +import GF.GFCC.DataGFCC import GF.Formalism.Utilities import GF.Infra.PrintClass diff --git a/src-3.0/GF/Parsing/FCFG/PInfo.hs b/src-3.0/GF/Parsing/FCFG/PInfo.hs index 2d6385feb..e151a5ac1 100644 --- a/src-3.0/GF/Parsing/FCFG/PInfo.hs +++ b/src-3.0/GF/Parsing/FCFG/PInfo.hs @@ -11,10 +11,10 @@ module GF.Parsing.FCFG.PInfo where import GF.Infra.PrintClass import GF.Formalism.Utilities -import GF.Formalism.FCFG import GF.Data.SortedList import GF.Data.Assoc import GF.GFCC.CId +import GF.GFCC.DataGFCC import Data.Array import Data.Maybe @@ -37,24 +37,6 @@ makeFinalEdge cat i j = (cat, [makeRange i j]) ------------------------------------------------------------ -- parser information -type RuleId = Int - -data FCFPInfo - = FCFPInfo { allRules :: Array RuleId FRule - , topdownRules :: Assoc FCat (SList RuleId) - -- ^ used in 'GF.Parsing.MCFG.Active' (Earley): - -- , emptyRules :: [RuleId] - , epsilonRules :: [RuleId] - -- ^ used in 'GF.Parsing.MCFG.Active' (Kilbury): - , leftcornerCats :: Assoc FCat (SList RuleId) - , leftcornerTokens :: Assoc FToken (SList RuleId) - -- ^ used in 'GF.Parsing.MCFG.Active' (Kilbury): - , grammarCats :: SList FCat - , grammarToks :: SList FToken - , startupCats :: Map.Map CId [FCat] - } - - getLeftCornerTok (FRule _ _ _ _ lins) | inRange (bounds syms) 0 = case syms ! 0 of FSymTok tok -> [tok] |