Fixed module names and imports after giant file move.

5 files changed, 28 insertions, 28 deletions

diff --git a/src/GF/CFGM/AbsCFG.hs b/src/GF/CFGM/AbsCFG.hs
index c605ce212..be50d204b 100644
--- a/src/GF/CFGM/AbsCFG.hs
+++ b/src/GF/CFGM/AbsCFG.hs
@@ -1,4 +1,4 @@
-module AbsCFG where
+module GF.CFGM.AbsCFG where
 
 -- Haskell module generated by the BNF converter
 
diff --git a/src/GF/CFGM/LexCFG.hs b/src/GF/CFGM/LexCFG.hs
index b06420998..881bf51b9 100644
--- a/src/GF/CFGM/LexCFG.hs
+++ b/src/GF/CFGM/LexCFG.hs
@@ -1,8 +1,8 @@
 {-# OPTIONS -fglasgow-exts -cpp #-}
 {-# LINE 3 "LexCFG.x" #-}
-module LexCFG where
+module GF.CFGM.LexCFG where
 
-import ErrM
+import GF.Data.ErrM
 
 
 #if __GLASGOW_HASKELL__ >= 503
@@ -10,8 +10,8 @@ import Data.Array
 import Data.Char (ord)
 import Data.Array.Base (unsafeAt)
 #else
-import Array
-import Char (ord)
+import Data.Array
+import Data.Char (ord)
 #endif
 #if __GLASGOW_HASKELL__ >= 503
 import GHC.Exts
diff --git a/src/GF/CFGM/ParCFG.hs b/src/GF/CFGM/ParCFG.hs
index e41aefb98..e95f28d46 100644
--- a/src/GF/CFGM/ParCFG.hs
+++ b/src/GF/CFGM/ParCFG.hs
@@ -1,9 +1,9 @@
 {-# OPTIONS -fglasgow-exts -cpp #-}
-module ParCFG where
-import AbsCFG
-import LexCFG
-import ErrM
-import Array
+module GF.CFGM.ParCFG where
+import GF.CFGM.AbsCFG
+import GF.CFGM.LexCFG
+import GF.Data.ErrM
+import Data.Array
 #if __GLASGOW_HASKELL__ >= 503
 import GHC.Exts
 #else
@@ -476,7 +476,7 @@ happyError ts =
 
 myLexer = tokens
 {-# LINE 1 "GenericTemplate.hs" #-}
--- $Id: ParCFG.hs,v 1.6 2005/03/21 14:27:06 bringert Exp $
+-- $Id: ParCFG.hs,v 1.7 2005/04/21 16:21:17 bringert Exp $
 
 
 
diff --git a/src/GF/CFGM/PrintCFG.hs b/src/GF/CFGM/PrintCFG.hs
index 7310da562..e81be449f 100644
--- a/src/GF/CFGM/PrintCFG.hs
+++ b/src/GF/CFGM/PrintCFG.hs
@@ -1,9 +1,9 @@
-module PrintCFG where
+module GF.CFGM.PrintCFG where
 
 -- pretty-printer generated by the BNF converter
 
-import AbsCFG
-import Char
+import GF.CFGM.AbsCFG
+import Data.Char
 
 -- the top-level printing method
 printTree :: Print a => a -> String
diff --git a/src/GF/CFGM/PrintCFGrammar.hs b/src/GF/CFGM/PrintCFGrammar.hs
index 005da1404..504c21e6c 100644
--- a/src/GF/CFGM/PrintCFGrammar.hs
+++ b/src/GF/CFGM/PrintCFGrammar.hs
@@ -5,33 +5,33 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/16 05:40:50 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.16 $
+-- > CVS $Date: 2005/04/21 16:21:19 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.17 $
 --
 -- Handles printing a CFGrammar in CFGM format.
 -----------------------------------------------------------------------------
 
-module PrintCFGrammar (prCanonAsCFGM) where
+module GF.CFGM.PrintCFGrammar (prCanonAsCFGM) where
 
-import AbsGFC
-import qualified PrintCFG
-import Ident
-import GFC
-import Modules
+import GF.Canon.AbsGFC
+import qualified GF.CFGM.PrintCFG as PrintCFG
+import GF.Infra.Ident
+import GF.Canon.GFC
+import GF.Infra.Modules
 
 import qualified GF.Conversion.GFC as Cnv
 import GF.Infra.Print (prt)
 import GF.Formalism.CFG (CFRule(..))
 import qualified GF.Conversion.Types as GT
-import qualified AbsCFG
+import qualified GF.CFGM.AbsCFG as AbsCFG
 import GF.Formalism.Utilities (Symbol(..))
 
-import ErrM
-import qualified Option
+import GF.Data.ErrM
+import qualified GF.Infra.Option as Option
 
-import List (intersperse)
-import Maybe (listToMaybe, maybe)
+import Data.List (intersperse)
+import Data.Maybe (listToMaybe, maybe)
 
 -- | FIXME: should add an Options argument,
 -- to be able to decide which CFG conversion one wants to use