move the parsing related stuff to GF.GFCC.Parsing

8 files changed, 17 insertions, 18 deletions

diff --git a/GF.cabal b/GF.cabal
index 07b4548e9..b4efad3a5 100644
--- a/GF.cabal
+++ b/GF.cabal
@@ -46,13 +46,13 @@ library
     GF.Data.SortedList
     GF.Data.Assoc
     GF.Infra.PrintClass
-    GF.Formalism.Utilities
-    GF.Parsing.FCFG.Active
+    GF.GFCC.Parsing.FCFG.Utilities
+    GF.GFCC.Parsing.FCFG.Active
+    GF.GFCC.Parsing.FCFG
     GF.GFCC.Raw.ConvertGFCC
     GF.Data.ErrM
     GF.Command.ParGFShell
     GF.Command.PPrTree
-    GF.Parsing.FCFG
 
 
 executable gf3
@@ -97,18 +97,18 @@ executable gf3
     GF.Infra.PrintClass
     GF.GFCC.CId
     GF.GFCC.Raw.ParGFCCRaw
-    GF.GFCC.Raw.PrintGFCCRaw
-    GF.Formalism.Utilities
+    GF.GFCC.Raw.PrintGFCCRaw    
     GF.GFCC.BuildParser
     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.Macros
     GF.GFCC.Generate
     GF.GFCC.Linearize
     GF.Compile.GenerateFCFG
     GF.Data.ErrM
-    GF.Parsing.FCFG
     GF.Command.ParGFShell
     GF.Command.PPrTree
     GF.GFCC.API
diff --git a/src-3.0/GF/Compile/GenerateFCFG.hs b/src-3.0/GF/Compile/GenerateFCFG.hs
index 7571cae1a..1502e6250 100644
--- a/src-3.0/GF/Compile/GenerateFCFG.hs
+++ b/src-3.0/GF/Compile/GenerateFCFG.hs
@@ -19,7 +19,7 @@ import GF.Infra.PrintClass
 
 import Control.Monad
 
-import GF.Formalism.Utilities
+import GF.GFCC.Parsing.FCFG.Utilities
 
 import GF.GFCC.Macros --hiding (prt)
 import GF.GFCC.DataGFCC
diff --git a/src-3.0/GF/GFCC/API.hs b/src-3.0/GF/GFCC/API.hs
index af0f9c138..7227afa64 100644
--- a/src-3.0/GF/GFCC/API.hs
+++ b/src-3.0/GF/GFCC/API.hs
@@ -26,7 +26,7 @@ import GF.Command.PPrTree
 
 import GF.Data.ErrM
 
-import GF.Parsing.FCFG
+import GF.GFCC.Parsing.FCFG
 
 import qualified Data.Map as Map
 import System.Random (newStdGen)
diff --git a/src-3.0/GF/GFCC/BuildParser.hs b/src-3.0/GF/GFCC/BuildParser.hs
index a32b6c65d..3f03bf648 100644
--- a/src-3.0/GF/GFCC/BuildParser.hs
+++ b/src-3.0/GF/GFCC/BuildParser.hs
@@ -10,7 +10,7 @@
 module GF.GFCC.BuildParser where
 
 import GF.Infra.PrintClass
-import GF.Formalism.Utilities
+import GF.GFCC.Parsing.FCFG.Utilities
 import GF.Data.SortedList
 import GF.Data.Assoc
 import GF.GFCC.CId
diff --git a/src-3.0/GF/Parsing/FCFG.hs b/src-3.0/GF/GFCC/Parsing/FCFG.hs
index 050c30f81..dca89b2f4 100644
--- a/src-3.0/GF/Parsing/FCFG.hs
+++ b/src-3.0/GF/GFCC/Parsing/FCFG.hs
@@ -7,7 +7,7 @@
 -- FCFG parsing
 -----------------------------------------------------------------------------
 
-module GF.Parsing.FCFG
+module GF.GFCC.Parsing.FCFG
     (parseFCF,buildParserInfo,ParserInfo(..),makeFinalEdge) where
 
 import GF.Data.SortedList 
@@ -15,9 +15,8 @@ import GF.Data.Assoc
 
 import GF.Infra.PrintClass
 
-import GF.Formalism.Utilities
-
-import GF.Parsing.FCFG.Active
+import GF.GFCC.Parsing.FCFG.Utilities
+import GF.GFCC.Parsing.FCFG.Active
 
 import GF.GFCC.CId
 import GF.GFCC.DataGFCC
diff --git a/src-3.0/GF/Parsing/FCFG/Active.hs b/src-3.0/GF/GFCC/Parsing/FCFG/Active.hs
index a64d53f1c..288f60e19 100644
--- a/src-3.0/GF/Parsing/FCFG/Active.hs
+++ b/src-3.0/GF/GFCC/Parsing/FCFG/Active.hs
@@ -7,7 +7,7 @@
 -- 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.Assoc
@@ -16,7 +16,7 @@ import GF.Data.Utilities
 
 import GF.GFCC.CId
 import GF.GFCC.DataGFCC
-import GF.Formalism.Utilities
+import GF.GFCC.Parsing.FCFG.Utilities
 
 import GF.Infra.PrintClass
 
diff --git a/src-3.0/GF/Formalism/Utilities.hs b/src-3.0/GF/GFCC/Parsing/FCFG/Utilities.hs
index de54e98a4..ba298f830 100644
--- a/src-3.0/GF/Formalism/Utilities.hs
+++ b/src-3.0/GF/GFCC/Parsing/FCFG/Utilities.hs
@@ -12,7 +12,7 @@
 -----------------------------------------------------------------------------
 
 
-module GF.Formalism.Utilities where
+module GF.GFCC.Parsing.FCFG.Utilities where
 
 import Control.Monad
 import Data.Array
diff --git a/src-3.0/GF/GFCC/Raw/ConvertGFCC.hs b/src-3.0/GF/GFCC/Raw/ConvertGFCC.hs
index 26e7cb153..37f2f3868 100644
--- a/src-3.0/GF/GFCC/Raw/ConvertGFCC.hs
+++ b/src-3.0/GF/GFCC/Raw/ConvertGFCC.hs
@@ -4,9 +4,9 @@ import GF.GFCC.CId
 import GF.GFCC.DataGFCC
 import GF.GFCC.Raw.AbsGFCCRaw
 import GF.GFCC.BuildParser (buildParserInfo)
+import GF.GFCC.Parsing.FCFG.Utilities
 
 import GF.Infra.PrintClass
-import GF.Formalism.Utilities
 
 import qualified Data.Array as Array
 import qualified Data.Map   as Map