Fixed module names and imports after giant file move.

13 files changed, 88 insertions, 88 deletions

diff --git a/src/GF/Parsing/CF.hs b/src/GF/Parsing/CF.hs
index 4bdaf0869..1a65f6caf 100644
--- a/src/GF/Parsing/CF.hs
+++ b/src/GF/Parsing/CF.hs
@@ -4,27 +4,27 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/20 12:49:44 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.3 $
+-- > CVS $Date: 2005/04/21 16:23:04 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.4 $
 --
 -- Chart parsing of grammars in CF format
 -----------------------------------------------------------------------------
 
-module GF.NewParsing.CF (parse) where
+module GF.Parsing.CF (parse) where
 
-import Operations (errVal)
+import GF.Data.Operations (errVal)
 
 import GF.System.Tracing
 import GF.Infra.Print
 
 import GF.Data.SortedList (nubsort)
 import GF.Data.Assoc
-import qualified CF
-import qualified CFIdent as CFI
+import qualified GF.CF.CF as CF
+import qualified GF.CF.CFIdent as CFI
 import GF.Formalism.Utilities
 import GF.Formalism.CFG
-import qualified GF.NewParsing.CFG as P
+import qualified GF.Parsing.CFG as P
 
 type Token    = CFI.CFTok
 type Name     = CFI.CFFun
diff --git a/src/GF/Parsing/CFG.hs b/src/GF/Parsing/CFG.hs
index 051e8bab0..34b1619a4 100644
--- a/src/GF/Parsing/CFG.hs
+++ b/src/GF/Parsing/CFG.hs
@@ -4,24 +4,24 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/20 12:49:44 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.3 $
+-- > CVS $Date: 2005/04/21 16:23:05 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.4 $
 --
 -- CFG parsing
 -----------------------------------------------------------------------------
 
-module GF.NewParsing.CFG 
-    (parseCF, module GF.NewParsing.CFG.PInfo) where
+module GF.Parsing.CFG
+    (parseCF, module GF.Parsing.CFG.PInfo) where
 
-import Operations (Err(..))
+import GF.Data.Operations (Err(..))
 
 import GF.Formalism.Utilities
 import GF.Formalism.CFG
-import GF.NewParsing.CFG.PInfo
+import GF.Parsing.CFG.PInfo
 
-import qualified GF.NewParsing.CFG.Incremental as Inc
-import qualified GF.NewParsing.CFG.General     as Gen
+import qualified GF.Parsing.CFG.Incremental as Inc
+import qualified GF.Parsing.CFG.General as Gen
 
 ----------------------------------------------------------------------
 -- parsing
diff --git a/src/GF/Parsing/CFG/General.hs b/src/GF/Parsing/CFG/General.hs
index 52b3c5665..4f5959a85 100644
--- a/src/GF/Parsing/CFG/General.hs
+++ b/src/GF/Parsing/CFG/General.hs
@@ -4,14 +4,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/18 14:55:33 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.3 $
+-- > CVS $Date: 2005/04/21 16:23:08 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.4 $
 --
 -- CFG parsing with a general chart
 -----------------------------------------------------------------------------
 
-module GF.NewParsing.CFG.General
+module GF.Parsing.CFG.General
     (parse, Strategy) where
 
 import GF.System.Tracing
@@ -19,10 +19,10 @@ import GF.Infra.Print
 
 import GF.Formalism.Utilities
 import GF.Formalism.CFG
-import GF.NewParsing.CFG.PInfo
-import GF.NewParsing.GeneralChart 
+import GF.Parsing.CFG.PInfo
+import GF.Data.GeneralDeduction
 import GF.Data.Assoc
-import Monad
+import Control.Monad
 
 parse :: (Ord n, Ord c, Ord t) => Strategy -> CFParser c n t
 parse strategy grammar start = extract .
diff --git a/src/GF/Parsing/CFG/Incremental.hs b/src/GF/Parsing/CFG/Incremental.hs
index 54aaf3b6d..adab2b73c 100644
--- a/src/GF/Parsing/CFG/Incremental.hs
+++ b/src/GF/Parsing/CFG/Incremental.hs
@@ -4,29 +4,29 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/18 14:55:33 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.3 $
+-- > CVS $Date: 2005/04/21 16:23:09 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.4 $
 --
 -- Incremental chart parsing for CFG
 -----------------------------------------------------------------------------
  
 
-module GF.NewParsing.CFG.Incremental 
+module GF.Parsing.CFG.Incremental
     (parse, Strategy) where
 
 import GF.System.Tracing
 import GF.Infra.Print
 
-import Array
+import Data.Array
 
-import Operations
+import GF.Data.Operations
 import GF.Data.SortedList
 import GF.Data.Assoc
 import GF.Formalism.Utilities
 import GF.Formalism.CFG
-import GF.NewParsing.CFG.PInfo
-import GF.NewParsing.IncrementalChart
+import GF.Parsing.CFG.PInfo
+import GF.Data.IncrementalDeduction
 
 
 -- | parsing strategy: (predict:(BU, TD), filter:(BU, TD))
diff --git a/src/GF/Parsing/CFG/PInfo.hs b/src/GF/Parsing/CFG/PInfo.hs
index c8bb9af29..81d8d3724 100644
--- a/src/GF/Parsing/CFG/PInfo.hs
+++ b/src/GF/Parsing/CFG/PInfo.hs
@@ -4,14 +4,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/18 14:55:33 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.3 $
+-- > CVS $Date: 2005/04/21 16:23:10 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.4 $
 --
 -- CFG parsing, parser information
 -----------------------------------------------------------------------------
 
-module GF.NewParsing.CFG.PInfo
+module GF.Parsing.CFG.PInfo
     (CFParser, CFPInfo(..), buildCFPInfo) where
 
 import GF.System.Tracing
diff --git a/src/GF/Parsing/GFC.hs b/src/GF/Parsing/GFC.hs
index 039cb34a7..7f54186a7 100644
--- a/src/GF/Parsing/GFC.hs
+++ b/src/GF/Parsing/GFC.hs
@@ -4,28 +4,28 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/20 12:49:44 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.5 $
+-- > CVS $Date: 2005/04/21 16:23:06 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.6 $
 --
 -- The main parsing module, parsing GFC grammars
 -- by translating to simpler formats, such as PMCFG and CFG
 ----------------------------------------------------------------------
 
-module GF.NewParsing.GFC
+module GF.Parsing.GFC
     (parse, PInfo(..), buildPInfo) where
 
 import GF.System.Tracing 
 import GF.Infra.Print
-import qualified PrGrammar
+import qualified GF.Grammar.PrGrammar as PrGrammar
 
-import Operations (Err(..))
+import GF.Data.Operations (Err(..))
 
-import qualified Grammar 
-import qualified Macros 
-import qualified AbsGFC
-import qualified Ident
-import CFIdent (CFCat, cfCat2Ident, CFTok, wordsCFTok)
+import qualified GF.Grammar.Grammar as Grammar
+import qualified GF.Grammar.Macros as Macros
+import qualified GF.Canon.AbsGFC as AbsGFC
+import qualified GF.Infra.Ident as Ident
+import GF.CF.CFIdent (CFCat, cfCat2Ident, CFTok, wordsCFTok)
 
 import GF.Data.SortedList 
 import GF.Data.Assoc
@@ -36,8 +36,8 @@ import qualified GF.Formalism.GCFG as G
 import qualified GF.Formalism.SimpleGFC as S
 import qualified GF.Formalism.MCFG as M
 import qualified GF.Formalism.CFG as C
-import qualified GF.NewParsing.MCFG as PM
-import qualified GF.NewParsing.CFG as PC
+import qualified GF.Parsing.MCFG as PM
+import qualified GF.Parsing.CFG as PC
 
 ----------------------------------------------------------------------
 -- parsing information
diff --git a/src/GF/Parsing/MCFG.hs b/src/GF/Parsing/MCFG.hs
index 7c239ba3b..11c845365 100644
--- a/src/GF/Parsing/MCFG.hs
+++ b/src/GF/Parsing/MCFG.hs
@@ -4,26 +4,26 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/20 12:49:45 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.2 $
+-- > CVS $Date: 2005/04/21 16:23:07 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.3 $
 --
 -- MCFG parsing
 -----------------------------------------------------------------------------
 
-module GF.NewParsing.MCFG
-    (parseMCF, module GF.NewParsing.MCFG.PInfo) where
+module GF.Parsing.MCFG
+    (parseMCF, module GF.Parsing.MCFG.PInfo) where
 
-import Operations (Err(..))
+import GF.Data.Operations (Err(..))
 
 import GF.Formalism.Utilities
 import GF.Formalism.GCFG
 import GF.Formalism.MCFG
-import GF.NewParsing.MCFG.PInfo
+import GF.Parsing.MCFG.PInfo
 
-import qualified GF.NewParsing.MCFG.Naive as Naive
-import qualified GF.NewParsing.MCFG.Active as Active
-import qualified GF.NewParsing.MCFG.Range as Range (makeRange)
+import qualified GF.Parsing.MCFG.Naive as Naive
+import qualified GF.Parsing.MCFG.Active as Active
+import qualified GF.Parsing.MCFG.Range as Range (makeRange)
 
 ----------------------------------------------------------------------
 -- parsing
diff --git a/src/GF/Parsing/MCFG/Active.hs b/src/GF/Parsing/MCFG/Active.hs
index dd8516379..44661b0c9 100644
--- a/src/GF/Parsing/MCFG/Active.hs
+++ b/src/GF/Parsing/MCFG/Active.hs
@@ -1,14 +1,14 @@
 
-module GF.NewParsing.MCFG.Active (parse) where
+module GF.Parsing.MCFG.Active (parse) where
 
-import GF.NewParsing.GeneralChart
+import GF.Data.GeneralDeduction
 import GF.Formalism.GCFG
 import GF.Formalism.MCFG
 import GF.Formalism.Utilities
-import GF.NewParsing.MCFG.Range
-import GF.NewParsing.MCFG.PInfo
+import GF.Parsing.MCFG.Range
+import GF.Parsing.MCFG.PInfo
 import GF.System.Tracing
-import Monad (guard)
+import Control.Monad (guard)
 
 ----------------------------------------------------------------------
 -- * parsing
diff --git a/src/GF/Parsing/MCFG/Incremental.hs b/src/GF/Parsing/MCFG/Incremental.hs
index 897d365c9..21467078f 100644
--- a/src/GF/Parsing/MCFG/Incremental.hs
+++ b/src/GF/Parsing/MCFG/Incremental.hs
@@ -8,19 +8,19 @@
                As described in Ljunglöf (2004)   
 ------------------------------------------------------------------------------}
 
-module IncrementalParse where
+module GF.Parsing.MCFG.Incremental where
 
 
 -- Haskell
-import List
+import Data.List
 
 -- GF modules
 import Examples
-import GeneralChart
-import MCFGrammar
+import GF.OldParsing.GeneralChart
+import GF.OldParsing.MCFGrammar
 import MCFParser
 import Parser
-import Range
+import GF.Parsing.MCFG.Range
 import Nondet
 
 
diff --git a/src/GF/Parsing/MCFG/Naive.hs b/src/GF/Parsing/MCFG/Naive.hs
index 1d315506d..4b994e726 100644
--- a/src/GF/Parsing/MCFG/Naive.hs
+++ b/src/GF/Parsing/MCFG/Naive.hs
@@ -1,14 +1,14 @@
 
-module GF.NewParsing.MCFG.Naive (parse) where
+module GF.Parsing.MCFG.Naive (parse) where
 
 
 -- GF modules
-import GF.NewParsing.GeneralChart
+import GF.Data.GeneralDeduction
 import GF.Formalism.GCFG
 import GF.Formalism.MCFG
 import GF.Formalism.Utilities
-import GF.NewParsing.MCFG.Range
-import GF.NewParsing.MCFG.PInfo
+import GF.Parsing.MCFG.Range
+import GF.Parsing.MCFG.PInfo
 import GF.Data.SortedList
 import GF.Data.Assoc
 import GF.System.Tracing
diff --git a/src/GF/Parsing/MCFG/PInfo.hs b/src/GF/Parsing/MCFG/PInfo.hs
index a51ec7d20..b89ce6d5e 100644
--- a/src/GF/Parsing/MCFG/PInfo.hs
+++ b/src/GF/Parsing/MCFG/PInfo.hs
@@ -4,14 +4,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/20 12:49:45 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.2 $
+-- > CVS $Date: 2005/04/21 16:23:14 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.3 $
 --
 -- MCFG parsing, parser information
 -----------------------------------------------------------------------------
 
-module GF.NewParsing.MCFG.PInfo where
+module GF.Parsing.MCFG.PInfo where
 
 import GF.System.Tracing
 import GF.Infra.Print
@@ -21,7 +21,7 @@ import GF.Formalism.GCFG
 import GF.Formalism.MCFG
 import GF.Data.SortedList
 import GF.Data.Assoc
-import GF.NewParsing.MCFG.Range
+import GF.Parsing.MCFG.Range
 
 ----------------------------------------------------------------------
 -- type declarations
diff --git a/src/GF/Parsing/MCFG/Range.hs b/src/GF/Parsing/MCFG/Range.hs
index e60b9916e..994f8fdb7 100644
--- a/src/GF/Parsing/MCFG/Range.hs
+++ b/src/GF/Parsing/MCFG/Range.hs
@@ -1,10 +1,10 @@
 
-module GF.NewParsing.MCFG.Range where
+module GF.Parsing.MCFG.Range where
 
 
 -- Haskell
-import List
-import Monad
+import Data.List
+import Control.Monad
 
 -- GF modules
 import GF.Formalism.GCFG
diff --git a/src/GF/Parsing/MCFG/ViaCFG.hs b/src/GF/Parsing/MCFG/ViaCFG.hs
index f1b76bb75..5007eec20 100644
--- a/src/GF/Parsing/MCFG/ViaCFG.hs
+++ b/src/GF/Parsing/MCFG/ViaCFG.hs
@@ -8,24 +8,24 @@
 	       Ljunglöf (2004)   
 ------------------------------------------------------------------------------}
 
-module ApproxParse where
+module GF.Parsing.MCFG.ViaCFG where
 
 
 -- Haskell modules
-import List
-import Monad
+import Data.List
+import Control.Monad
 
 -- GF modules 
 import ConvertMCFGtoDecoratedCFG
 import qualified DecoratedCFParser as CFP
 import qualified DecoratedGrammar as CFG
 import Examples
-import GeneralChart
-import qualified MCFGrammar as MCFG 
+import GF.OldParsing.GeneralChart
+import qualified GF.OldParsing.MCFGrammar as MCFG
 import MCFParser
 import Nondet 
 import Parser
-import Range
+import GF.Parsing.MCFG.Range
 
 
 {-- Datatypes -----------------------------------------------------------------
@@ -180,4 +180,4 @@ symToRec beta = map makeLblRng $ groupBy (\(_, d) (_, d') -> (d == d'))
 	  sBd (_, d) (_, d') 
 	      | d < d' = LT
 	      | d > d' = GT
-	      | otherwise = EQ
\ No newline at end of file
+	      | otherwise = EQ