Fixed module names and imports after giant file move.

15 files changed, 133 insertions, 133 deletions

diff --git a/src/GF/Canon/AbsGFC.hs b/src/GF/Canon/AbsGFC.hs
index 058b4c97b..918338b18 100644
--- a/src/GF/Canon/AbsGFC.hs
+++ b/src/GF/Canon/AbsGFC.hs
@@ -1,7 +1,7 @@
 
-module AbsGFC where
+module GF.Canon.AbsGFC where
 
-import Ident --H
+import GF.Infra.Ident --H
 
 -- Haskell module generated by the BNF converter, except --H
 
diff --git a/src/GF/Canon/CMacros.hs b/src/GF/Canon/CMacros.hs
index a097c4926..2c1e6f639 100644
--- a/src/GF/Canon/CMacros.hs
+++ b/src/GF/Canon/CMacros.hs
@@ -5,30 +5,30 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/08 15:31:22 $ 
+-- > CVS $Date: 2005/04/21 16:21:21 $ 
 -- > CVS $Author: bringert $
--- > CVS $Revision: 1.23 $
+-- > CVS $Revision: 1.24 $
 --
 -- Macros for building and analysing terms in GFC concrete syntax.
 --
 -- macros for concrete syntax in GFC that do not need lookup in a grammar
 -----------------------------------------------------------------------------
 
-module CMacros where
+module GF.Canon.CMacros where
 
-import Ident
-import AbsGFC
-import GFC
-import qualified Ident as A ---- no need to qualif? 21/9
-import qualified Values as V
-import qualified MMacros as M
-import PrGrammar
-import Str
+import GF.Infra.Ident
+import GF.Canon.AbsGFC
+import GF.Canon.GFC
+import qualified GF.Infra.Ident as A ---- no need to qualif? 21/9
+import qualified GF.Grammar.Values as V
+import qualified GF.Grammar.MMacros as M
+import GF.Grammar.PrGrammar
+import GF.Data.Str
 
-import Operations
+import GF.Data.Operations
 
-import Char
-import Monad
+import Data.Char
+import Control.Monad
 
 -- | how to mark subtrees, dep. on node, position, whether focus
 type JustMarker = V.TrNode -> [Int] -> Bool -> (String, String)
diff --git a/src/GF/Canon/CanonToGrammar.hs b/src/GF/Canon/CanonToGrammar.hs
index 4ed1bd9be..b26aeca26 100644
--- a/src/GF/Canon/CanonToGrammar.hs
+++ b/src/GF/Canon/CanonToGrammar.hs
@@ -5,28 +5,28 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:06 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.12 $
+-- > CVS $Date: 2005/04/21 16:21:21 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.13 $
 --
 -- a decompiler. AR 12/6/2003 -- 19/4/2004
 -----------------------------------------------------------------------------
 
-module CanonToGrammar (canon2sourceGrammar, canon2sourceModule, redFlag) where
+module GF.Canon.CanonToGrammar (canon2sourceGrammar, canon2sourceModule, redFlag) where
 
-import AbsGFC
-import GFC
-import MkGFC
+import GF.Canon.AbsGFC
+import GF.Canon.GFC
+import GF.Canon.MkGFC
 ---import CMacros
-import qualified Modules as M
-import qualified Option  as O
-import qualified Grammar as G
-import qualified Macros  as F
+import qualified GF.Infra.Modules as M
+import qualified GF.Infra.Option as O
+import qualified GF.Grammar.Grammar as G
+import qualified GF.Grammar.Macros as F
 
-import Ident
-import Operations
+import GF.Infra.Ident
+import GF.Data.Operations
 
-import Monad
+import Control.Monad
 
 canon2sourceGrammar :: CanonGrammar -> Err G.SourceGrammar
 canon2sourceGrammar gr = do
diff --git a/src/GF/Canon/GFC.hs b/src/GF/Canon/GFC.hs
index 6e8648045..ae34dc249 100644
--- a/src/GF/Canon/GFC.hs
+++ b/src/GF/Canon/GFC.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/20 20:09:19 $ 
--- > CVS $Author: aarne $
--- > CVS $Revision: 1.11 $
+-- > CVS $Date: 2005/04/21 16:21:22 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.12 $
 --
 -- canonical GF. AR 10\/9\/2002 -- 9\/5\/2003 -- 21\/9
 -----------------------------------------------------------------------------
 
-module GFC (Context,
+module GF.Canon.GFC (Context,
 	    CanonGrammar,
 	    CanonModInfo,
 	    CanonModule,
@@ -24,17 +24,17 @@ module GFC (Context,
 	    setFlag
 	   ) where
 
-import AbsGFC
-import PrintGFC
-import qualified Abstract as A
+import GF.Canon.AbsGFC
+import GF.Canon.PrintGFC
+import qualified GF.Grammar.Abstract as A
 
-import Ident
-import Option
-import Zipper
-import Operations
-import qualified Modules as M
+import GF.Infra.Ident
+import GF.Infra.Option
+import GF.Data.Zipper
+import GF.Data.Operations
+import qualified GF.Infra.Modules as M
 
-import Char
+import Data.Char
 import Control.Arrow (first)
 
 type Context = [(Ident,Exp)]
diff --git a/src/GF/Canon/GetGFC.hs b/src/GF/Canon/GetGFC.hs
index 4c2a29c98..de476211f 100644
--- a/src/GF/Canon/GetGFC.hs
+++ b/src/GF/Canon/GetGFC.hs
@@ -5,22 +5,22 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:06 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.6 $
+-- > CVS $Date: 2005/04/21 16:21:23 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.7 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module GetGFC (getCanonModule, getCanonGrammar) where
+module GF.Canon.GetGFC (getCanonModule, getCanonGrammar) where
 
-import Operations
-import ParGFC
-import GFC
-import MkGFC
-import Modules
-import GetGrammar (err2err) ---
-import UseIO
+import GF.Data.Operations
+import GF.Canon.ParGFC
+import GF.Canon.GFC
+import GF.Canon.MkGFC
+import GF.Infra.Modules
+import GF.Compile.GetGrammar (err2err) ---
+import GF.Infra.UseIO
 
 getCanonModule :: FilePath -> IOE CanonModule
 getCanonModule file = do
diff --git a/src/GF/Canon/LexGFC.hs b/src/GF/Canon/LexGFC.hs
index b181a18ec..3f6473f2e 100644
--- a/src/GF/Canon/LexGFC.hs
+++ b/src/GF/Canon/LexGFC.hs
@@ -1,16 +1,16 @@
 {-# OPTIONS -cpp #-}
 {-# LINE 3 "LexGFC.x" #-}
-module LexGFC where
+module GF.Canon.LexGFC where
 
-import ErrM
+import GF.Data.ErrM
 
 #if __GLASGOW_HASKELL__ >= 503
 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
 alex_base :: Array Int Int
 alex_base = listArray (0,14) [1,57,66,0,9,29,11,32,154,362,0,277,485,211,51]
diff --git a/src/GF/Canon/Look.hs b/src/GF/Canon/Look.hs
index 442bcf0f3..410010b53 100644
--- a/src/GF/Canon/Look.hs
+++ b/src/GF/Canon/Look.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:06 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.11 $
+-- > CVS $Date: 2005/04/21 16:21:25 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.12 $
 --
 -- lookup in GFC. AR 2003
 -----------------------------------------------------------------------------
 
-module Look (lookupCncInfo,
+module GF.Canon.Look (lookupCncInfo,
 	     lookupLin,
 	     lookupLincat,
 	     lookupPrintname,
@@ -24,20 +24,20 @@ module Look (lookupCncInfo,
 	     ccompute
 	    ) where
 
-import AbsGFC
-import GFC
-import PrGrammar
-import CMacros
+import GF.Canon.AbsGFC
+import GF.Canon.GFC
+import GF.Grammar.PrGrammar
+import GF.Canon.CMacros
 ----import Values
-import MMacros
-import qualified Modules as M
-import qualified CanonToGrammar as CG
+import GF.Grammar.MMacros
+import qualified GF.Infra.Modules as M
+import qualified GF.Canon.CanonToGrammar as CG
 
-import Operations
-import Option
+import GF.Data.Operations
+import GF.Infra.Option
 
-import Monad
-import List
+import Control.Monad
+import Data.List
 
 -- linearization lookup
 
diff --git a/src/GF/Canon/MkGFC.hs b/src/GF/Canon/MkGFC.hs
index 93813d1a2..382eaf567 100644
--- a/src/GF/Canon/MkGFC.hs
+++ b/src/GF/Canon/MkGFC.hs
@@ -5,26 +5,26 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:07 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.11 $
+-- > CVS $Date: 2005/04/21 16:21:26 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.12 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module MkGFC (prCanonModInfo, prCanon, prCanonMGr, 
+module GF.Canon.MkGFC (prCanonModInfo, prCanon, prCanonMGr,
 	      canon2grammar, grammar2canon, 
 	      info2mod,
 	      trExp, rtExp, rtQIdent) where
 
-import GFC
-import AbsGFC
-import qualified Abstract as A
-import PrGrammar
+import GF.Canon.GFC
+import GF.Canon.AbsGFC
+import qualified GF.Grammar.Abstract as A
+import GF.Grammar.PrGrammar
 
-import Ident
-import Operations
-import qualified Modules as M
+import GF.Infra.Ident
+import GF.Data.Operations
+import qualified GF.Infra.Modules as M
 
 prCanonModInfo :: CanonModule -> String
 prCanonModInfo = prt . info2mod
diff --git a/src/GF/Canon/ParGFC.hs b/src/GF/Canon/ParGFC.hs
index c0197435f..84e93a327 100644
--- a/src/GF/Canon/ParGFC.hs
+++ b/src/GF/Canon/ParGFC.hs
@@ -1,12 +1,12 @@
 {-# OPTIONS -fglasgow-exts -cpp #-}
 -- parser produced by Happy Version 1.13
 
-module ParGFC where
-import AbsGFC
-import LexGFC
-import ErrM
-import Ident --H
-import Array
+module GF.Canon.ParGFC where
+import GF.Canon.AbsGFC
+import GF.Canon.LexGFC
+import GF.Data.ErrM
+import GF.Infra.Ident --H
+import Data.Array
 #if __GLASGOW_HASKELL__ >= 503
 import GHC.Exts
 #else
@@ -1767,7 +1767,7 @@ happyError ts =
 
 myLexer = tokens
 {-# LINE 1 "GenericTemplate.hs" #-}
--- $Id: ParGFC.hs,v 1.8 2005/02/04 14:17:06 bringert Exp $
+-- $Id: ParGFC.hs,v 1.9 2005/04/21 16:21:27 bringert Exp $
 
 
 
diff --git a/src/GF/Canon/PrExp.hs b/src/GF/Canon/PrExp.hs
index 04a607cc1..6202a760e 100644
--- a/src/GF/Canon/PrExp.hs
+++ b/src/GF/Canon/PrExp.hs
@@ -5,19 +5,19 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:07 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:21:28 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- print trees without qualifications
 -----------------------------------------------------------------------------
 
-module PrExp (prExp) where
+module GF.Canon.PrExp (prExp) where
 
-import AbsGFC
-import GFC
+import GF.Canon.AbsGFC
+import GF.Canon.GFC
 
-import Operations
+import GF.Data.Operations
 
 prExp :: Exp -> String
 prExp e = case e of
diff --git a/src/GF/Canon/PrintGFC.hs b/src/GF/Canon/PrintGFC.hs
index 87b4bea31..e2c5c44a4 100644
--- a/src/GF/Canon/PrintGFC.hs
+++ b/src/GF/Canon/PrintGFC.hs
@@ -1,11 +1,11 @@
 
-module PrintGFC where
+module GF.Canon.PrintGFC where
 
 -- pretty-printer generated by the BNF converter, except handhacked spacing --H
 
-import Ident --H
-import AbsGFC
-import Char
+import GF.Infra.Ident --H
+import GF.Canon.AbsGFC
+import Data.Char
 
 -- the top-level printing method
 printTree :: Print a => a -> String
diff --git a/src/GF/Canon/Share.hs b/src/GF/Canon/Share.hs
index 26596a695..0cad8bdb1 100644
--- a/src/GF/Canon/Share.hs
+++ b/src/GF/Canon/Share.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:07 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.10 $
+-- > CVS $Date: 2005/04/21 16:21:30 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.11 $
 --
 -- Optimizations on GFC code: sharing, parametrization, value sets.
 --
@@ -15,16 +15,16 @@
 -- following advice of Josef Svenningsson
 -----------------------------------------------------------------------------
 
-module Share (shareModule, OptSpec, shareOpt, paramOpt, valOpt, allOpt) where
+module GF.Canon.Share (shareModule, OptSpec, shareOpt, paramOpt, valOpt, allOpt) where
 
-import AbsGFC
-import Ident
-import GFC
-import qualified CMacros as C
-import PrGrammar (prt)
-import Operations
-import List
-import qualified Modules as M
+import GF.Canon.AbsGFC
+import GF.Infra.Ident
+import GF.Canon.GFC
+import qualified GF.Canon.CMacros as C
+import GF.Grammar.PrGrammar (prt)
+import GF.Data.Operations
+import Data.List
+import qualified GF.Infra.Modules as M
 
 type OptSpec = [Integer] ---
 
diff --git a/src/GF/Canon/SkelGFC.hs b/src/GF/Canon/SkelGFC.hs
index 9f5729418..fd3fc9086 100644
--- a/src/GF/Canon/SkelGFC.hs
+++ b/src/GF/Canon/SkelGFC.hs
@@ -1,10 +1,10 @@
 
-module SkelGFC where
+module GF.Canon.SkelGFC where
 
 -- Haskell module generated by the BNF converter
 
-import AbsGFC
-import ErrM
+import GF.Canon.AbsGFC
+import GF.Data.ErrM
 type Result = Err String
 
 failure :: Show a => a -> Result
diff --git a/src/GF/Canon/TestGFC.hs b/src/GF/Canon/TestGFC.hs
index 9dc2f3e88..7af035f69 100644
--- a/src/GF/Canon/TestGFC.hs
+++ b/src/GF/Canon/TestGFC.hs
@@ -1,19 +1,19 @@
 
 -- automatically generated by BNF Converter
-module Main where
+module GF.Canon.TestGFC where
 
 
-import IO ( stdin, hGetContents )
+import System.IO ( stdin, hGetContents )
 import System ( getArgs, getProgName )
 
-import LexGFC
-import ParGFC
-import SkelGFC
-import PrintGFC
-import AbsGFC
+import GF.Canon.LexGFC
+import GF.Canon.ParGFC
+import GF.Canon.SkelGFC
+import GF.Canon.PrintGFC
+import GF.Canon.AbsGFC
 
 
-import ErrM
+import GF.Data.ErrM
 
 type ParseFun a = [Token] -> Err a
 
diff --git a/src/GF/Canon/Unlex.hs b/src/GF/Canon/Unlex.hs
index 2a9fe118f..dd93390e2 100644
--- a/src/GF/Canon/Unlex.hs
+++ b/src/GF/Canon/Unlex.hs
@@ -5,20 +5,20 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:07 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.7 $
+-- > CVS $Date: 2005/04/21 16:21:32 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.8 $
 --
 -- elementary text postprocessing. AR 21/11/2001
 -----------------------------------------------------------------------------
 
-module Unlex (formatAsText, unlex, performBinds) where
+module GF.Canon.Unlex (formatAsText, unlex, performBinds) where
 
-import Operations
-import Str
+import GF.Data.Operations
+import GF.Data.Str
 
-import Char
-import List (isPrefixOf)
+import Data.Char
+import Data.List (isPrefixOf)
 
 formatAsText :: String -> String
 formatAsText = unwords . format . cap . words where