Fixed module names and imports after giant file move.

8 files changed, 64 insertions, 63 deletions

diff --git a/src/GF/Infra/CheckM.hs b/src/GF/Infra/CheckM.hs
index 52802d59b..251ed2b8b 100644
--- a/src/GF/Infra/CheckM.hs
+++ b/src/GF/Infra/CheckM.hs
@@ -5,24 +5,24 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:13 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:22:33 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module CheckM (Check,
+module GF.Infra.CheckM (Check,
 	       checkError, checkCond, checkWarn, checkUpdate, checkInContext,
 	       checkUpdates, checkReset, checkResets, checkGetContext, 
 	       checkLookup, checkStart, checkErr, checkVal, checkIn, 
 	       prtFail
 	      ) where
 
-import Operations
-import Grammar
-import Ident
-import PrGrammar
+import GF.Data.Operations
+import GF.Grammar.Grammar
+import GF.Infra.Ident
+import GF.Grammar.PrGrammar
 
 -- | the strings are non-fatal warnings
 type Check a = STM (Context,[String]) a
diff --git a/src/GF/Infra/Comments.hs b/src/GF/Infra/Comments.hs
index c90224a81..0126db468 100644
--- a/src/GF/Infra/Comments.hs
+++ b/src/GF/Infra/Comments.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:13 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:22:34 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- comment removal
 -----------------------------------------------------------------------------
 
-module Comments ( remComments
+module GF.Infra.Comments ( remComments
 		) where
 
 -- | comment removal : line tails prefixed by -- as well as chunks in @{- ... -}@
diff --git a/src/GF/Infra/Ident.hs b/src/GF/Infra/Ident.hs
index 6b5c51bf3..5259af228 100644
--- a/src/GF/Infra/Ident.hs
+++ b/src/GF/Infra/Ident.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/15 11:18:07 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.6 $
+-- > CVS $Date: 2005/04/21 16:22:35 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.7 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module Ident (-- * Identifiers
+module GF.Infra.Ident (-- * Identifiers
 	      Ident(..), prIdent,
 	      identC, identV, identA, identAV, identW,
 	      argIdent, strVar, wildIdent, isWildIdent,
@@ -22,7 +22,7 @@ module Ident (-- * Identifiers
 	      lookVar, refVar, refVarPlus
 	     ) where
 
-import Operations
+import GF.Data.Operations
 -- import Monad
 
 
diff --git a/src/GF/Infra/Modules.hs b/src/GF/Infra/Modules.hs
index ac903e8ec..e3c0388dd 100644
--- a/src/GF/Infra/Modules.hs
+++ b/src/GF/Infra/Modules.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/24 11:46:35 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.20 $
+-- > CVS $Date: 2005/04/21 16:22:36 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.21 $
 --
 -- Datastructures and functions for modules, common to GF and GFC.
 --
@@ -18,7 +18,7 @@
 -- Invariant: modules are stored in dependency order
 -----------------------------------------------------------------------------
 
-module Modules (MGrammar(..), ModInfo(..), Module(..), ModuleType(..), MReuseType(..),
+module GF.Infra.Modules (MGrammar(..), ModInfo(..), Module(..), ModuleType(..), MReuseType(..),
 		extendm, updateMGrammar, updateModule, replaceJudgements,
 		addOpenQualif, flagsModule, allFlags, mapModules,
 		MainGrammar(..), MainConcreteSpec(..), OpenSpec(..), OpenQualif(..),
@@ -35,11 +35,11 @@ module Modules (MGrammar(..), ModInfo(..), Module(..), ModuleType(..), MReuseTyp
 		allAbstracts, greatestAbstract, allResources, greatestResource, allConcretes
 	       ) where
 
-import Ident
-import Option
-import Operations
+import GF.Infra.Ident
+import GF.Infra.Option
+import GF.Data.Operations
 
-import List
+import Data.List
 
 
 -- AR 29/4/2003
diff --git a/src/GF/Infra/Option.hs b/src/GF/Infra/Option.hs
index b7e7ce598..649534986 100644
--- a/src/GF/Infra/Option.hs
+++ b/src/GF/Infra/Option.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/20 12:49:45 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.25 $
+-- > CVS $Date: 2005/04/21 16:22:37 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.26 $
 --
 -- Options and flags used in GF shell commands and files.
 --
@@ -18,10 +18,10 @@
 --   - The constructor 'Opts' us udes in "API", "Shell" and "ShellCommands"
 -----------------------------------------------------------------------------
 
-module Option where
+module GF.Infra.Option where
 
-import List (partition)
-import Char (isDigit)
+import Data.List (partition)
+import Data.Char (isDigit)
 
 -- * all kinds of options, to be kept abstract
 
diff --git a/src/GF/Infra/Print.hs b/src/GF/Infra/Print.hs
index 75fa52a17..cf5953030 100644
--- a/src/GF/Infra/Print.hs
+++ b/src/GF/Infra/Print.hs
@@ -4,14 +4,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/16 05:40:49 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.2 $
+-- > CVS $Date: 2005/04/21 16:22:38 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.3 $
 --
 -- Pretty-printing
 -----------------------------------------------------------------------------
 
-module GF.Infra.Print 
+module GF.Infra.Print
     (Print(..),
      prtBefore, prtAfter, prtSep, 
      prtBeforeAfter, prtPairList,
@@ -19,15 +19,15 @@ module GF.Infra.Print
     ) where
 
 -- haskell modules:
-import List (intersperse)
-import Char (toUpper)
+import Data.List (intersperse)
+import Data.Char (toUpper)
 -- gf modules:
-import Operations (Err(..))
-import Ident (Ident(..))
-import AbsGFC
-import CF
-import CFIdent
-import qualified PrintGFC as P
+import GF.Data.Operations (Err(..))
+import GF.Infra.Ident (Ident(..))
+import GF.Canon.AbsGFC
+import GF.CF.CF
+import GF.CF.CFIdent
+import qualified GF.Canon.PrintGFC as P
 
 ------------------------------------------------------------
 
diff --git a/src/GF/Infra/ReadFiles.hs b/src/GF/Infra/ReadFiles.hs
index 414df59bb..19da55ca6 100644
--- a/src/GF/Infra/ReadFiles.hs
+++ b/src/GF/Infra/ReadFiles.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/15 17:18:52 $ 
--- > CVS $Author: aarne $
--- > CVS $Revision: 1.21 $
+-- > CVS $Date: 2005/04/21 16:22:39 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.22 $
 --
 -- Decide what files to read as function of dependencies and time stamps.
 --
@@ -18,7 +18,7 @@
 -- and @file.gfc@ or @file.gfr@ otherwise.
 -----------------------------------------------------------------------------
 
-module ReadFiles (-- * Heading 1
+module GF.Infra.ReadFiles (-- * Heading 1
 		  getAllFiles,fixNewlines,ModName,getOptionsFromFile,
 		  -- * Heading 2
 		  gfcFile,gfFile,gfrFile,isGFC,resModName,isOldFile
@@ -26,15 +26,15 @@ module ReadFiles (-- * Heading 1
 
 import Arch (selectLater, modifiedFiles, ModTime, getModTime,laterModTime)
 
-import Option
-import Operations
-import UseIO
+import GF.Infra.Option
+import GF.Data.Operations
+import GF.Infra.UseIO
 
 import System
-import Char
-import Monad
-import List
-import Directory
+import Data.Char
+import Control.Monad
+import Data.List
+import System.Directory
 
 type ModName = String
 type ModEnv  = [(ModName,ModTime)]
diff --git a/src/GF/Infra/UseIO.hs b/src/GF/Infra/UseIO.hs
index 9aabd0f3e..88ef6e3b6 100644
--- a/src/GF/Infra/UseIO.hs
+++ b/src/GF/Infra/UseIO.hs
@@ -5,22 +5,23 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/08 18:08:58 $ 
--- > CVS $Author: aarne $
--- > CVS $Revision: 1.10 $
+-- > CVS $Date: 2005/04/21 16:22:40 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.11 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module UseIO where
+module GF.Infra.UseIO where
 
-import Operations
+import GF.Data.Operations
 import Arch (prCPU)
-import Option
+import GF.Infra.Option
 
-import IO
-import System
-import Monad
+import System.IO
+import System.IO.Error
+import System.Environment
+import Control.Monad
 
 putShow' :: Show a => (c -> a) -> c -> IO ()
 putShow' f = putStrLn . show . length . show . f