Fixed module names and imports after giant file move.

4 files changed, 44 insertions, 44 deletions

diff --git a/src/GF/OldParsing/ConvertSimpleToMCFG/Coercions.hs b/src/GF/OldParsing/ConvertSimpleToMCFG/Coercions.hs
index 1c107356b..adc42115a 100644
--- a/src/GF/OldParsing/ConvertSimpleToMCFG/Coercions.hs
+++ b/src/GF/OldParsing/ConvertSimpleToMCFG/Coercions.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/16 05:40:50 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.2 $
+-- > CVS $Date: 2005/04/21 16:22:57 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.3 $
 --
 -- Adding coercion functions to a MCFG if necessary.
 -----------------------------------------------------------------------------
@@ -20,12 +20,12 @@ import GF.Printing.PrintSimplifiedTerm
 -- import PrintGFC
 -- import qualified PrGrammar as PG
 
-import qualified Ident
+import qualified GF.Infra.Ident as Ident
 import GF.OldParsing.Utilities
 --import GF.OldParsing.GrammarTypes 
 import GF.OldParsing.MCFGrammar (Rule(..), Lin(..))
 import GF.Data.SortedList
-import List (groupBy) -- , transpose)
+import Data.List (groupBy) -- , transpose)
 
 ----------------------------------------------------------------------
 
diff --git a/src/GF/OldParsing/ConvertSimpleToMCFG/Nondet.hs b/src/GF/OldParsing/ConvertSimpleToMCFG/Nondet.hs
index da7511eaf..6627c5f2e 100644
--- a/src/GF/OldParsing/ConvertSimpleToMCFG/Nondet.hs
+++ b/src/GF/OldParsing/ConvertSimpleToMCFG/Nondet.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:56 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:58 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Converting SimpleGFC grammars to MCFG grammars, nondeterministically.
 --
@@ -24,14 +24,14 @@ import GF.Printing.PrintSimplifiedTerm
 -- import PrintGFC
 -- import qualified PrGrammar as PG
 
-import Monad
+import Control.Monad
 -- import Ident (Ident(..))
-import qualified AbsGFC 
+import qualified GF.Canon.AbsGFC as AbsGFC
 -- import GFC
-import Look
-import Operations
+import GF.Canon.Look
+import GF.Data.Operations
 -- import qualified Modules as M
-import CMacros (defLinType)
+import GF.Canon.CMacros (defLinType)
 -- import MkGFC (grammar2canon)
 import GF.OldParsing.Utilities
 -- import GF.OldParsing.GrammarTypes 
@@ -39,7 +39,7 @@ import GF.Data.SortedList
 import qualified GF.OldParsing.MCFGrammar as MCF (Grammar, Rule(..), Lin(..)) 
 import GF.OldParsing.SimpleGFC 
 -- import Maybe (listToMaybe)
-import List (groupBy) -- , transpose)
+import Data.List (groupBy) -- , transpose)
 
 import GF.Data.BacktrackM
 
diff --git a/src/GF/OldParsing/ConvertSimpleToMCFG/Old.hs b/src/GF/OldParsing/ConvertSimpleToMCFG/Old.hs
index 88a459625..dd2ff0713 100644
--- a/src/GF/OldParsing/ConvertSimpleToMCFG/Old.hs
+++ b/src/GF/OldParsing/ConvertSimpleToMCFG/Old.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:56 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:59 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Converting GFC grammars to MCFG grammars. (Old variant)
 --
@@ -18,30 +18,30 @@
 -----------------------------------------------------------------------------
 
 
-module GF.OldParsing.ConvertGFCtoMCFG.Old (convertGrammar) where
+module GF.OldParsing.ConvertSimpleToMCFG.Old (convertGrammar) where
 
 import GF.System.Tracing
 import GF.Printing.PrintParser
 import GF.Printing.PrintSimplifiedTerm
 --import PrintGFC
-import qualified PrGrammar as PG
+import qualified GF.Grammar.PrGrammar as PG
 
-import Monad (liftM, liftM2, guard)
+import Control.Monad (liftM, liftM2, guard)
 -- import Maybe (listToMaybe)
-import Ident (Ident(..))
-import AbsGFC
-import GFC
-import Look
-import Operations
-import qualified Modules as M
-import CMacros (defLinType)
-import MkGFC (grammar2canon)
+import GF.Infra.Ident (Ident(..))
+import GF.Canon.AbsGFC
+import GF.Canon.GFC
+import GF.Canon.Look
+import GF.Data.Operations
+import qualified GF.Infra.Modules as M
+import GF.Canon.CMacros (defLinType)
+import GF.Canon.MkGFC (grammar2canon)
 import GF.OldParsing.Utilities
 import GF.OldParsing.GrammarTypes 
 import GF.OldParsing.MCFGrammar (Rule(..), Lin(..))
 import GF.Data.SortedList (nubsort, groupPairs)
-import Maybe (listToMaybe)
-import List (groupBy, transpose)
+import Data.Maybe (listToMaybe)
+import Data.List (groupBy, transpose)
 
 ----------------------------------------------------------------------
 -- old style types
diff --git a/src/GF/OldParsing/ConvertSimpleToMCFG/Strict.hs b/src/GF/OldParsing/ConvertSimpleToMCFG/Strict.hs
index a1be8af4e..aa741518a 100644
--- a/src/GF/OldParsing/ConvertSimpleToMCFG/Strict.hs
+++ b/src/GF/OldParsing/ConvertSimpleToMCFG/Strict.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:56 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:23:00 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Converting SimpleGFC grammars to MCFG grammars, deterministic.
 --
@@ -16,12 +16,12 @@
 -----------------------------------------------------------------------------
 
 
-module GF.OldParsing.ConvertGFCtoMCFG.Strict (convertGrammar) where
+module GF.OldParsing.ConvertSimpleToMCFG.Strict (convertGrammar) where
 
 import GF.System.Tracing
 import GF.Infra.Print
 
-import Monad
+import Control.Monad
 
 import GF.Formalism.Utilities
 import GF.Formalism.GCFG 
@@ -32,20 +32,20 @@ import GF.Conversion.Types
 import GF.Data.BacktrackM
 
 {-
-import Ident (Ident(..))
-import AbsGFC
-import GFC
-import Look
-import Operations
-import qualified Modules as M
-import CMacros (defLinType)
-import MkGFC (grammar2canon)
+import GF.Infra.Ident (Ident(..))
+import GF.Canon.AbsGFC
+import GF.Canon.GFC
+import GF.Canon.Look
+import GF.Data.Operations
+import qualified GF.Infra.Modules as M
+import GF.Canon.CMacros (defLinType)
+import GF.Canon.MkGFC (grammar2canon)
 import GF.OldParsing.Utilities
 import GF.OldParsing.GrammarTypes 
 import GF.OldParsing.MCFGrammar (Grammar, Rule(..), Lin(..))
 import GF.Data.SortedList
 -- import Maybe (listToMaybe)
-import List (groupBy) -- , transpose)
+import Data.List (groupBy) -- , transpose)
 
 import GF.Data.BacktrackM
 -}