move the parsing related stuff to GF.GFCC.Parsing

This commit is contained in:
krasimir
2008-05-29 12:38:09 +00:00
parent 9c2d27b8d1
commit ecfb1f5e01
8 changed files with 17 additions and 18 deletions

View File

@@ -46,13 +46,13 @@ library
GF.Data.SortedList GF.Data.SortedList
GF.Data.Assoc GF.Data.Assoc
GF.Infra.PrintClass GF.Infra.PrintClass
GF.Formalism.Utilities GF.GFCC.Parsing.FCFG.Utilities
GF.Parsing.FCFG.Active GF.GFCC.Parsing.FCFG.Active
GF.GFCC.Parsing.FCFG
GF.GFCC.Raw.ConvertGFCC GF.GFCC.Raw.ConvertGFCC
GF.Data.ErrM GF.Data.ErrM
GF.Command.ParGFShell GF.Command.ParGFShell
GF.Command.PPrTree GF.Command.PPrTree
GF.Parsing.FCFG
executable gf3 executable gf3
@@ -98,17 +98,17 @@ executable gf3
GF.GFCC.CId GF.GFCC.CId
GF.GFCC.Raw.ParGFCCRaw GF.GFCC.Raw.ParGFCCRaw
GF.GFCC.Raw.PrintGFCCRaw GF.GFCC.Raw.PrintGFCCRaw
GF.Formalism.Utilities
GF.GFCC.BuildParser GF.GFCC.BuildParser
GF.GFCC.DataGFCC GF.GFCC.DataGFCC
GF.Parsing.FCFG.Active GF.GFCC.Parsing.FCFG.Utilities
GF.GFCC.Parsing.FCFG.Active
GF.GFCC.Parsing.FCFG
GF.GFCC.Raw.ConvertGFCC GF.GFCC.Raw.ConvertGFCC
GF.GFCC.Macros GF.GFCC.Macros
GF.GFCC.Generate GF.GFCC.Generate
GF.GFCC.Linearize GF.GFCC.Linearize
GF.Compile.GenerateFCFG GF.Compile.GenerateFCFG
GF.Data.ErrM GF.Data.ErrM
GF.Parsing.FCFG
GF.Command.ParGFShell GF.Command.ParGFShell
GF.Command.PPrTree GF.Command.PPrTree
GF.GFCC.API GF.GFCC.API

View File

@@ -19,7 +19,7 @@ import GF.Infra.PrintClass
import Control.Monad import Control.Monad
import GF.Formalism.Utilities import GF.GFCC.Parsing.FCFG.Utilities
import GF.GFCC.Macros --hiding (prt) import GF.GFCC.Macros --hiding (prt)
import GF.GFCC.DataGFCC import GF.GFCC.DataGFCC

View File

@@ -26,7 +26,7 @@ import GF.Command.PPrTree
import GF.Data.ErrM import GF.Data.ErrM
import GF.Parsing.FCFG import GF.GFCC.Parsing.FCFG
import qualified Data.Map as Map import qualified Data.Map as Map
import System.Random (newStdGen) import System.Random (newStdGen)

View File

@@ -10,7 +10,7 @@
module GF.GFCC.BuildParser where module GF.GFCC.BuildParser where
import GF.Infra.PrintClass import GF.Infra.PrintClass
import GF.Formalism.Utilities import GF.GFCC.Parsing.FCFG.Utilities
import GF.Data.SortedList import GF.Data.SortedList
import GF.Data.Assoc import GF.Data.Assoc
import GF.GFCC.CId import GF.GFCC.CId

View File

@@ -7,7 +7,7 @@
-- FCFG parsing -- FCFG parsing
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
module GF.Parsing.FCFG module GF.GFCC.Parsing.FCFG
(parseFCF,buildParserInfo,ParserInfo(..),makeFinalEdge) where (parseFCF,buildParserInfo,ParserInfo(..),makeFinalEdge) where
import GF.Data.SortedList import GF.Data.SortedList
@@ -15,9 +15,8 @@ import GF.Data.Assoc
import GF.Infra.PrintClass import GF.Infra.PrintClass
import GF.Formalism.Utilities import GF.GFCC.Parsing.FCFG.Utilities
import GF.GFCC.Parsing.FCFG.Active
import GF.Parsing.FCFG.Active
import GF.GFCC.CId import GF.GFCC.CId
import GF.GFCC.DataGFCC import GF.GFCC.DataGFCC

View File

@@ -7,7 +7,7 @@
-- MCFG parsing, the active algorithm -- MCFG parsing, the active algorithm
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
module GF.Parsing.FCFG.Active (FCFParser, parse, makeFinalEdge) where module GF.GFCC.Parsing.FCFG.Active (FCFParser, parse, makeFinalEdge) where
import GF.Data.GeneralDeduction import GF.Data.GeneralDeduction
import GF.Data.Assoc import GF.Data.Assoc
@@ -16,7 +16,7 @@ import GF.Data.Utilities
import GF.GFCC.CId import GF.GFCC.CId
import GF.GFCC.DataGFCC import GF.GFCC.DataGFCC
import GF.Formalism.Utilities import GF.GFCC.Parsing.FCFG.Utilities
import GF.Infra.PrintClass import GF.Infra.PrintClass

View File

@@ -12,7 +12,7 @@
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
module GF.Formalism.Utilities where module GF.GFCC.Parsing.FCFG.Utilities where
import Control.Monad import Control.Monad
import Data.Array import Data.Array

View File

@@ -4,9 +4,9 @@ import GF.GFCC.CId
import GF.GFCC.DataGFCC import GF.GFCC.DataGFCC
import GF.GFCC.Raw.AbsGFCCRaw import GF.GFCC.Raw.AbsGFCCRaw
import GF.GFCC.BuildParser (buildParserInfo) import GF.GFCC.BuildParser (buildParserInfo)
import GF.GFCC.Parsing.FCFG.Utilities
import GF.Infra.PrintClass import GF.Infra.PrintClass
import GF.Formalism.Utilities
import qualified Data.Array as Array import qualified Data.Array as Array
import qualified Data.Map as Map import qualified Data.Map as Map