11 files changed, 65 insertions, 65 deletions
diff --git a/src/GF/Conversion/GFC.hs b/src/GF/Conversion/GFC.hs
index f2261ea3c..dbaded139 100644
--- a/src/GF/Conversion/GFC.hs
+++ b/src/GF/Conversion/GFC.hs
@@ -4,20 +4,20 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/18 14:55:32 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.6 $
+-- > CVS $Date: 2005/04/21 16:21:49 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.7 $
 --
 -- All conversions from GFC 
 -----------------------------------------------------------------------------
 
-module GF.Conversion.GFC 
+module GF.Conversion.GFC
     (module GF.Conversion.GFC,
      SGrammar, MGrammar, CGrammar) where
 
-import Option
-import GFC (CanonGrammar)
-import Ident (Ident)
+import GF.Infra.Option
+import GF.Canon.GFC (CanonGrammar)
+import GF.Infra.Ident (Ident)
 import GF.Conversion.Types (CGrammar, MGrammar, EGrammar, SGrammar)
 
 import qualified GF.Conversion.GFCtoSimple as G2S
diff --git a/src/GF/Conversion/GFCtoSimple.hs b/src/GF/Conversion/GFCtoSimple.hs
index 82cc143db..efdf51f2e 100644
--- a/src/GF/Conversion/GFCtoSimple.hs
+++ b/src/GF/Conversion/GFCtoSimple.hs
@@ -4,29 +4,29 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/18 14:55:32 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:21:50 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- Converting GFC to SimpleGFC
 --
 -- the conversion might fail if the GFC grammar has dependent or higher-order types
 -----------------------------------------------------------------------------
 
-module GF.Conversion.GFCtoSimple 
+module GF.Conversion.GFCtoSimple
     (convertGrammar) where
 
-import qualified AbsGFC as A
-import qualified Ident as I
+import qualified GF.Canon.AbsGFC as A
+import qualified GF.Infra.Ident as I
 import GF.Formalism.GCFG
 import GF.Formalism.SimpleGFC 
 import GF.Conversion.Types
 
-import GFC (CanonGrammar)
-import MkGFC (grammar2canon)
-import qualified Look (lookupLin, allParamValues, lookupLincat)
-import qualified CMacros (defLinType)
-import Operations (err, errVal)
+import GF.Canon.GFC (CanonGrammar)
+import GF.Canon.MkGFC (grammar2canon)
+import qualified GF.Canon.Look as Look (lookupLin, allParamValues, lookupLincat)
+import qualified GF.Canon.CMacros as CMacros (defLinType)
+import GF.Data.Operations (err, errVal)
 --import qualified Modules as M
 
 import GF.System.Tracing
diff --git a/src/GF/Conversion/MCFGtoCFG.hs b/src/GF/Conversion/MCFGtoCFG.hs
index add87c9d3..ad8521b3f 100644
--- a/src/GF/Conversion/MCFGtoCFG.hs
+++ b/src/GF/Conversion/MCFGtoCFG.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/18 14:55:32 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:21:51 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- Converting MCFG grammars to (possibly overgenerating) CFG
 -----------------------------------------------------------------------------
@@ -18,7 +18,7 @@ module GF.Conversion.MCFGtoCFG
 import GF.System.Tracing
 import GF.Infra.Print
 
-import Monad
+import Control.Monad
 import GF.Formalism.Utilities
 import GF.Formalism.GCFG
 import GF.Formalism.MCFG
diff --git a/src/GF/Conversion/RemoveEpsilon.hs b/src/GF/Conversion/RemoveEpsilon.hs
index f6e30e16d..bdfdfb41e 100644
--- a/src/GF/Conversion/RemoveEpsilon.hs
+++ b/src/GF/Conversion/RemoveEpsilon.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/18 14:57:29 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:21:52 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Removing epsilon linearizations from MCF grammars
 -----------------------------------------------------------------------------
@@ -18,16 +18,16 @@ module GF.Conversion.RemoveEpsilon where
 import GF.System.Tracing
 import GF.Infra.Print
 
-import Monad
-import List (mapAccumL)
-import Maybe (mapMaybe)
+import Control.Monad
+import Data.List (mapAccumL)
+import Data.Maybe (mapMaybe)
 import GF.Formalism.Utilities
 import GF.Formalism.GCFG
 import GF.Formalism.MCFG
 import GF.Conversion.Types
 import GF.Data.Assoc
 import GF.Data.SortedList
-import GF.NewParsing.GeneralChart
+import GF.Data.GeneralDeduction
 
 convertGrammar :: EGrammar -> EGrammar
 convertGrammar grammar = undefined
diff --git a/src/GF/Conversion/RemoveErasing.hs b/src/GF/Conversion/RemoveErasing.hs
index a7ff2c6df..34fccd937 100644
--- a/src/GF/Conversion/RemoveErasing.hs
+++ b/src/GF/Conversion/RemoveErasing.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/18 14:57:29 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:21:53 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Removing erasingness from MCFG grammars (as in Ljungl�f 2004, sec 4.5.1)
 -----------------------------------------------------------------------------
@@ -18,16 +18,16 @@ module GF.Conversion.RemoveErasing
 import GF.System.Tracing
 import GF.Infra.Print
 
-import Monad
-import List (mapAccumL)
-import Maybe (mapMaybe)
+import Control.Monad
+import Data.List (mapAccumL)
+import Data.Maybe (mapMaybe)
 import GF.Formalism.Utilities
 import GF.Formalism.GCFG
 import GF.Formalism.MCFG
 import GF.Conversion.Types
 import GF.Data.Assoc
 import GF.Data.SortedList
-import GF.NewParsing.GeneralChart
+import GF.Data.GeneralDeduction
 
 convertGrammar :: EGrammar -> MGrammar
 convertGrammar grammar
diff --git a/src/GF/Conversion/RemoveSingletons.hs b/src/GF/Conversion/RemoveSingletons.hs
index 53f39dede..0bb5c9ff7 100644
--- a/src/GF/Conversion/RemoveSingletons.hs
+++ b/src/GF/Conversion/RemoveSingletons.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/18 14:55:32 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.2 $
+-- > CVS $Date: 2005/04/21 16:21:54 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.3 $
 --
 -- Instantiating all types which only have one single element.
 --
@@ -26,7 +26,7 @@ import GF.Conversion.Types
 import GF.Data.SortedList
 import GF.Data.Assoc
 
-import List (mapAccumL)
+import Data.List (mapAccumL)
 
 convertGrammar :: SGrammar -> SGrammar
 convertGrammar grammar = if singles == emptyAssoc then grammar
diff --git a/src/GF/Conversion/SimpleToFinite.hs b/src/GF/Conversion/SimpleToFinite.hs
index 3480a2a23..7cefd7844 100644
--- a/src/GF/Conversion/SimpleToFinite.hs
+++ b/src/GF/Conversion/SimpleToFinite.hs
@@ -4,14 +4,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/18 14:55:32 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:21:54 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- Calculating the finiteness of each type in a grammar
 -----------------------------------------------------------------------------
 
-module GF.Conversion.SimpleToFinite 
+module GF.Conversion.SimpleToFinite
     (convertGrammar) where
 
 import GF.System.Tracing
@@ -26,7 +26,7 @@ import GF.Data.Assoc
 import GF.Data.BacktrackM
 import GF.Data.Utilities (lookupList)
 
-import Ident (Ident(..))
+import GF.Infra.Ident (Ident(..))
 
 type CnvMonad a = BacktrackM () a
 
diff --git a/src/GF/Conversion/SimpleToMCFG/Coercions.hs b/src/GF/Conversion/SimpleToMCFG/Coercions.hs
index 98dfd3e7e..48b09cee2 100644
--- a/src/GF/Conversion/SimpleToMCFG/Coercions.hs
+++ b/src/GF/Conversion/SimpleToMCFG/Coercions.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/18 14:55:32 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.3 $
+-- > CVS $Date: 2005/04/21 16:21:57 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.4 $
 --
 -- Adding coercion functions to a MCFG if necessary.
 -----------------------------------------------------------------------------
@@ -23,7 +23,7 @@ import GF.Formalism.GCFG
 import GF.Formalism.MCFG
 import GF.Conversion.Types 
 import GF.Data.SortedList
-import List (groupBy)
+import Data.List (groupBy)
 
 ----------------------------------------------------------------------
 
diff --git a/src/GF/Conversion/SimpleToMCFG/Nondet.hs b/src/GF/Conversion/SimpleToMCFG/Nondet.hs
index 46e89c09a..39ac709cd 100644
--- a/src/GF/Conversion/SimpleToMCFG/Nondet.hs
+++ b/src/GF/Conversion/SimpleToMCFG/Nondet.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/18 14:55:32 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.3 $
+-- > CVS $Date: 2005/04/21 16:21:57 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.4 $
 --
 -- Converting SimpleGFC grammars to MCFG grammars, nondeterministically.
 -- Afterwards, the grammar has to be extended with coercion functions,
@@ -18,13 +18,13 @@
 -----------------------------------------------------------------------------
 
 
-module GF.Conversion.SimpleToMCFG.Nondet 
+module GF.Conversion.SimpleToMCFG.Nondet
     (convertGrammar) where
 
 import GF.System.Tracing
 import GF.Infra.Print
 
-import Monad
+import Control.Monad
 
 import GF.Formalism.Utilities
 import GF.Formalism.GCFG 
diff --git a/src/GF/Conversion/SimpleToMCFG/Strict.hs b/src/GF/Conversion/SimpleToMCFG/Strict.hs
index 9e14c9dc5..c6b703f04 100644
--- a/src/GF/Conversion/SimpleToMCFG/Strict.hs
+++ b/src/GF/Conversion/SimpleToMCFG/Strict.hs
@@ -4,9 +4,9 @@
 -- 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:21:58 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.4 $
 --
 -- Converting SimpleGFC grammars to MCFG grammars, deterministic.
 --
@@ -22,7 +22,7 @@ module GF.Conversion.SimpleToMCFG.Strict
 import GF.System.Tracing
 import GF.Infra.Print
 
-import Monad
+import Control.Monad
 
 import GF.Formalism.Utilities
 import GF.Formalism.GCFG 
diff --git a/src/GF/Conversion/Types.hs b/src/GF/Conversion/Types.hs
index 404d090ba..05a7e66b5 100644
--- a/src/GF/Conversion/Types.hs
+++ b/src/GF/Conversion/Types.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/20 12:49:44 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.6 $
+-- > CVS $Date: 2005/04/21 16:21:56 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.7 $
 --
 -- All possible instantiations of different grammar formats used in conversion from GFC
 -----------------------------------------------------------------------------
@@ -14,9 +14,9 @@
 
 module GF.Conversion.Types where
 
-import qualified Ident   (Ident, wildIdent, isWildIdent)
-import qualified AbsGFC  (CIdent(..))
-import qualified Grammar (Term)
+import qualified GF.Infra.Ident as Ident (Ident, wildIdent, isWildIdent)
+import qualified GF.Canon.AbsGFC as AbsGFC (CIdent(..))
+import qualified GF.Grammar.Grammar as Grammar (Term)
 
 import GF.Formalism.GCFG
 import GF.Formalism.SimpleGFC
@@ -26,7 +26,7 @@ import GF.Formalism.Utilities
 import GF.Infra.Print
 import GF.Data.Assoc
 
-import Monad (foldM)
+import Control.Monad (foldM)
 
 ----------------------------------------------------------------------
 -- * basic (leaf) types