Fixed module names and imports after giant file move.

4 files changed, 46 insertions, 46 deletions

diff --git a/src/GF/OldParsing/ConvertGFCtoMCFG/Coercions.hs b/src/GF/OldParsing/ConvertGFCtoMCFG/Coercions.hs
index 650f8b646..3ed6a3f48 100644
--- a/src/GF/OldParsing/ConvertGFCtoMCFG/Coercions.hs
+++ b/src/GF/OldParsing/ConvertGFCtoMCFG/Coercions.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:55 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:54 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Adding coercion functions to a MCFG if necessary.
 -----------------------------------------------------------------------------
@@ -21,12 +21,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/ConvertGFCtoMCFG/Nondet.hs b/src/GF/OldParsing/ConvertGFCtoMCFG/Nondet.hs
index d27e240bc..ef9265d91 100644
--- a/src/GF/OldParsing/ConvertGFCtoMCFG/Nondet.hs
+++ b/src/GF/OldParsing/ConvertGFCtoMCFG/Nondet.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:55 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:55 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Converting GFC grammars to MCFG grammars, nondeterministically.
 --
@@ -26,21 +26,21 @@ import GF.Printing.PrintSimplifiedTerm
 -- import PrintGFC
 -- import qualified PrGrammar as PG
 
-import Monad
-import Ident (Ident(..))
-import AbsGFC
-import GFC
-import Look
-import Operations
-import qualified Modules as M
-import CMacros (defLinType)
-import MkGFC (grammar2canon)
+import Control.Monad
+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
 
diff --git a/src/GF/OldParsing/ConvertGFCtoMCFG/Old.hs b/src/GF/OldParsing/ConvertGFCtoMCFG/Old.hs
index d0869c8f5..b9fbf3b8c 100644
--- a/src/GF/OldParsing/ConvertGFCtoMCFG/Old.hs
+++ b/src/GF/OldParsing/ConvertGFCtoMCFG/Old.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:55 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:56 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Converting GFC grammars to MCFG grammars. (Old variant)
 --
@@ -24,24 +24,24 @@ 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/ConvertGFCtoMCFG/Strict.hs b/src/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs
index 604fb460b..d1e5c5b20 100644
--- a/src/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs
+++ b/src/GF/OldParsing/ConvertGFCtoMCFG/Strict.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:56 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Converting GFC grammars to MCFG grammars, nondeterministically.
 --
@@ -27,21 +27,21 @@ import GF.Printing.PrintSimplifiedTerm
 -- import PrintGFC
 -- import qualified PrGrammar as PG
 
-import Monad
-import Ident (Ident(..))
-import AbsGFC
-import GFC
-import Look
-import Operations
-import qualified Modules as M
-import CMacros (defLinType)
-import MkGFC (grammar2canon)
+import Control.Monad
+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