Fixed module names and imports after giant file move.

17 files changed, 87 insertions, 86 deletions

diff --git a/src/GF/Data/BacktrackM.hs b/src/GF/Data/BacktrackM.hs
index ba03884fd..58860d8f6 100644
--- a/src/GF/Data/BacktrackM.hs
+++ b/src/GF/Data/BacktrackM.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:49 $
--- > CVS $Author: peb $
--- > CVS $Revision: 1.3 $
+-- > CVS $Date: 2005/04/21 16:22:00 $
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.4 $
 --
 -- Backtracking state monad, with r\/o environment
 -----------------------------------------------------------------------------
@@ -29,7 +29,7 @@ module GF.Data.BacktrackM ( -- * the backtracking state monad
 		    finalStates
 		  ) where
 
-import Monad
+import Control.Monad
 
 ------------------------------------------------------------
 -- type declarations
diff --git a/src/GF/Data/ErrM.hs b/src/GF/Data/ErrM.hs
index 60dd1826d..8d5ab5403 100644
--- a/src/GF/Data/ErrM.hs
+++ b/src/GF/Data/ErrM.hs
@@ -5,15 +5,16 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:14 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:22:00 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- hack for BNFC generated files. AR 21/9/2003
 -----------------------------------------------------------------------------
 
-module ErrM (module Operations
+module GF.Data.ErrM (
+		     module GF.Data.Operations
 	    ) where
 
-import Operations
+import GF.Data.Operations
 
diff --git a/src/GF/Data/GeneralDeduction.hs b/src/GF/Data/GeneralDeduction.hs
index a5d191260..ea139bb4d 100644
--- a/src/GF/Data/GeneralDeduction.hs
+++ b/src/GF/Data/GeneralDeduction.hs
@@ -4,14 +4,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/20 12:49:44 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.2 $
+-- > CVS $Date: 2005/04/21 16:22:01 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.3 $
 --
 -- Simple implementation of deductive chart parsing
 -----------------------------------------------------------------------------
 
-module GF.NewParsing.GeneralChart 
+module GF.Data.GeneralDeduction
     (-- * Type definition
      ParseChart,
      -- * Main functions
@@ -28,7 +28,7 @@ module GF.NewParsing.GeneralChart
 -- import Trace 
 
 import GF.Data.RedBlackSet
-import Monad (foldM)
+import Control.Monad (foldM)
 
 ----------------------------------------------------------------------
 -- main functions
diff --git a/src/GF/Data/Glue.hs b/src/GF/Data/Glue.hs
index eaa7244f0..b3a766418 100644
--- a/src/GF/Data/Glue.hs
+++ b/src/GF/Data/Glue.hs
@@ -5,18 +5,18 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:14 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.6 $
+-- > CVS $Date: 2005/04/21 16:22:02 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.7 $
 --
 -- AR 8-11-2003, using Markus Forsberg's implementation of Huet's @unglue@
 -----------------------------------------------------------------------------
 
-module Glue (decomposeSimple) where
+module GF.Data.Glue (decomposeSimple) where
 
-import Trie2
-import Operations
-import List
+import GF.Data.Trie2
+import GF.Data.Operations
+import Data.List
 
 decomposeSimple :: Trie Char a -> [Char] -> Err [[Char]]
 decomposeSimple t s = do
diff --git a/src/GF/Data/IncrementalDeduction.hs b/src/GF/Data/IncrementalDeduction.hs
index 072a1334f..1cf810c0e 100644
--- a/src/GF/Data/IncrementalDeduction.hs
+++ b/src/GF/Data/IncrementalDeduction.hs
@@ -4,15 +4,15 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/11 13:52:51 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Date: 2005/04/21 16:22:03 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.2 $
 --
 -- Implementation of /incremental/ deductive parsing,
 -- i.e. parsing one word at the time.
 -----------------------------------------------------------------------------
 
-module GF.NewParsing.IncrementalChart
+module GF.Data.IncrementalDeduction
     (-- * Type definitions
      IncrementalChart,
      -- * Functions
@@ -21,7 +21,7 @@ module GF.NewParsing.IncrementalChart
      chartList
     ) where
 
-import Array
+import Data.Array
 import GF.Data.SortedList
 import GF.Data.Assoc
 
diff --git a/src/GF/Data/Map.hs b/src/GF/Data/Map.hs
index 1130db2ac..ea27826f6 100644
--- a/src/GF/Data/Map.hs
+++ b/src/GF/Data/Map.hs
@@ -5,14 +5,14 @@
 -- Stability   : Stable
 -- Portability : Haskell 98
 --
--- > CVS $Date: 2005/02/18 19:21:15 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.5 $
+-- > CVS $Date: 2005/04/21 16:22:04 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.6 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module Map (
+module GF.Data.Map (
            Map,
            empty,
            isEmpty,	   
@@ -24,7 +24,7 @@ module Map (
 	   flatten
 	   ) where
 
-import RedBlack
+import GF.Data.RedBlack
 
 type Map key el = Tree key el
 
diff --git a/src/GF/Data/Operations.hs b/src/GF/Data/Operations.hs
index 3f5600f93..e20dc8086 100644
--- a/src/GF/Data/Operations.hs
+++ b/src/GF/Data/Operations.hs
@@ -5,16 +5,16 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/29 11:17:56 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.18 $
+-- > CVS $Date: 2005/04/21 16:22:05 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.19 $
 --
 -- some auxiliary GF operations. AR 19\/6\/1998 -- 6\/2\/2001
 --
 -- Copyright (c) Aarne Ranta 1998-2000, under GNU General Public License (see GPL)
 -----------------------------------------------------------------------------
 
-module Operations (-- * misc functions
+module GF.Data.Operations (-- * misc functions
 		   ifNull, onSnd,
 
 		   -- * the Error monad
@@ -75,9 +75,9 @@ module Operations (-- * misc functions
 
 		  ) where
 
-import Char  (isSpace, toUpper, isSpace, isDigit)
-import List  (nub, sortBy, sort, deleteBy, nubBy)
-import Monad (liftM2, MonadPlus, mzero, mplus)
+import Data.Char (isSpace, toUpper, isSpace, isDigit)
+import Data.List (nub, sortBy, sort, deleteBy, nubBy)
+import Control.Monad (liftM2, MonadPlus, mzero, mplus)
 
 infixr 5 +++
 infixr 5 ++-
diff --git a/src/GF/Data/OrdMap2.hs b/src/GF/Data/OrdMap2.hs
index 2fba5ac10..3590f0584 100644
--- a/src/GF/Data/OrdMap2.hs
+++ b/src/GF/Data/OrdMap2.hs
@@ -5,9 +5,9 @@
 -- Stability   : Obsolete
 -- Portability : Haskell 98
 --
--- > CVS $Date: 2005/02/18 19:21:15 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.5 $
+-- > CVS $Date: 2005/04/21 16:22:05 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.6 $
 --
 -- The class of finite maps, as described in
 -- \"Pure Functional Parsing\", section 2.2.2
@@ -17,9 +17,9 @@
 -- /OBSOLETE/! this is only used in module "ChartParser"
 -----------------------------------------------------------------------------
 
-module OrdMap2 (OrdMap(..), Map) where
+module GF.Data.OrdMap2 (OrdMap(..), Map) where
 
-import List (intersperse)
+import Data.List (intersperse)
 
 
 --------------------------------------------------
diff --git a/src/GF/Data/OrdSet.hs b/src/GF/Data/OrdSet.hs
index 526d5a53d..34eb0705d 100644
--- a/src/GF/Data/OrdSet.hs
+++ b/src/GF/Data/OrdSet.hs
@@ -5,9 +5,9 @@
 -- Stability   : Obsolete
 -- Portability : Haskell 98
 --
--- > CVS $Date: 2005/02/18 19:21:15 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.5 $
+-- > CVS $Date: 2005/04/21 16:22:06 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.6 $
 --
 -- The class of ordered sets, as described in
 -- \"Pure Functional Parsing\", section 2.2.1,
@@ -17,9 +17,9 @@
 -- /OBSOLETE/! this is only used in module "ChartParser"
 -----------------------------------------------------------------------------
 
-module OrdSet (OrdSet(..), Set) where
+module GF.Data.OrdSet (OrdSet(..), Set) where
 
-import List (intersperse)
+import Data.List (intersperse)
 
 
 --------------------------------------------------
diff --git a/src/GF/Data/Parsers.hs b/src/GF/Data/Parsers.hs
index 6dbe9611a..7333510f8 100644
--- a/src/GF/Data/Parsers.hs
+++ b/src/GF/Data/Parsers.hs
@@ -5,16 +5,16 @@
 -- Stability   : Almost Obsolete
 -- Portability : Haskell 98
 --
--- > CVS $Date: 2005/02/24 11:46:35 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.5 $
+-- > CVS $Date: 2005/04/21 16:22:06 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.6 $
 --
 -- some parser combinators a la Wadler and Hutton.
 -- no longer used in many places in GF
 -- (only used in module "EBNF")
 -----------------------------------------------------------------------------
 
-module Parsers (-- * Main types and functions
+module GF.Data.Parsers (-- * Main types and functions
 		Parser, parseResults, parseResultErr,
 		-- * Basic combinators (on any token type)
 		(...), (.>.), (|||), (+||), literal, (***),
@@ -31,8 +31,8 @@ module Parsers (-- * Main types and functions
 		pQuotedString, pIntc
 	       ) where
 
-import Operations
-import Char
+import GF.Data.Operations
+import Data.Char
 
 
 infixr 2 |||, +||
diff --git a/src/GF/Data/RedBlack.hs b/src/GF/Data/RedBlack.hs
index 309f6b601..fd70dba63 100644
--- a/src/GF/Data/RedBlack.hs
+++ b/src/GF/Data/RedBlack.hs
@@ -5,14 +5,14 @@
 -- Stability   : Stable
 -- Portability : Haskell 98
 --
--- > CVS $Date: 2005/02/18 19:21:15 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.5 $
+-- > CVS $Date: 2005/04/21 16:22:07 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.6 $
 --
 -- Modified version of Osanaki's implementation.
 -----------------------------------------------------------------------------
 
-module RedBlack (
+module GF.Data.RedBlack (
                 emptyTree,
 		isEmpty,		
 		Tree,
diff --git a/src/GF/Data/SharedString.hs b/src/GF/Data/SharedString.hs
index b92475881..9d037b512 100644
--- a/src/GF/Data/SharedString.hs
+++ b/src/GF/Data/SharedString.hs
@@ -1,5 +1,5 @@
 
-module SharedString (shareString) where
+module GF.Data.SharedString (shareString) where
 
 import Data.HashTable as H
 import System.IO.Unsafe (unsafePerformIO)
diff --git a/src/GF/Data/SortedList.hs b/src/GF/Data/SortedList.hs
index 8f96bdc59..d77ff68d4 100644
--- a/src/GF/Data/SortedList.hs
+++ b/src/GF/Data/SortedList.hs
@@ -4,9 +4,9 @@
 -- Stability   : stable
 -- Portability : portable
 --
--- > CVS $Date: 2005/04/11 13:52:49 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.2 $
+-- > CVS $Date: 2005/04/21 16:22:08 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.3 $
 --
 -- Sets as sorted lists
 --
@@ -17,7 +17,7 @@
 --    * /O(n^2)/ fixed point iteration
 -----------------------------------------------------------------------------
 
-module GF.Data.SortedList 
+module GF.Data.SortedList
     ( -- * type declarations
       SList, SMap,
       -- * set operations		    
@@ -30,7 +30,7 @@ module GF.Data.SortedList
       unionMap, mergeMap
     ) where
 
-import List (groupBy)
+import Data.List (groupBy)
 import GF.Data.Utilities (split, foldMerge)
 
 -- | The list must be sorted and contain no duplicates.
diff --git a/src/GF/Data/Str.hs b/src/GF/Data/Str.hs
index c0a545106..6f65764c7 100644
--- a/src/GF/Data/Str.hs
+++ b/src/GF/Data/Str.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/24 11:46:35 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.7 $
+-- > CVS $Date: 2005/04/21 16:22:09 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.8 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module Str (
+module GF.Data.Str (
   Str (..), Tok (..),        --- constructors needed in PrGrammar 
   str2strings, str2allStrings, str, sstr, sstrV, 
   isZeroTok, prStr, plusStr, glueStr,
@@ -20,8 +20,8 @@ module Str (
   allItems
 ) where
 
-import Operations
-import List (isPrefixOf, isSuffixOf, intersperse)
+import GF.Data.Operations
+import Data.List (isPrefixOf, isSuffixOf, intersperse)
 
 -- | abstract token list type. AR 2001, revised and simplified 20\/4\/2003
 newtype Str = Str [Tok]  deriving (Read, Show, Eq, Ord)
diff --git a/src/GF/Data/Trie.hs b/src/GF/Data/Trie.hs
index 6c0e2933f..9fb5daa27 100644
--- a/src/GF/Data/Trie.hs
+++ b/src/GF/Data/Trie.hs
@@ -5,14 +5,14 @@
 -- Stability   : Obsolete
 -- Portability : Haskell 98
 --
--- > CVS $Date: 2005/02/18 19:21:16 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.5 $
+-- > CVS $Date: 2005/04/21 16:22:09 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.6 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module Trie (
+module GF.Data.Trie (
              tcompile,
 	     collapse,
              Trie,
@@ -22,7 +22,7 @@ module Trie (
              atW, atP, atWP
 	    ) where
 
-import Map
+import GF.Data.Map
 
 --- data Attr = W | P | WP deriving Eq
 type Attr = Int
diff --git a/src/GF/Data/Trie2.hs b/src/GF/Data/Trie2.hs
index bdd2b84b8..36fcc3221 100644
--- a/src/GF/Data/Trie2.hs
+++ b/src/GF/Data/Trie2.hs
@@ -5,14 +5,14 @@
 -- Stability   : Stable
 -- Portability : Haskell 98
 --
--- > CVS $Date: 2005/02/18 19:21:16 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.6 $
+-- > CVS $Date: 2005/04/21 16:22:10 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.7 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module Trie2 (
+module GF.Data.Trie2 (
              tcompile,
 	     collapse,
              Trie,
@@ -22,8 +22,8 @@ module Trie2 (
              emptyTrie
 	    ) where
 
-import Map
-import List
+import GF.Data.Map
+import Data.List
 
 newtype TrieT a b = TrieT ([(a,TrieT a b)],[b])
 
diff --git a/src/GF/Data/Zipper.hs b/src/GF/Data/Zipper.hs
index 11643b765..66859f9ca 100644
--- a/src/GF/Data/Zipper.hs
+++ b/src/GF/Data/Zipper.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/24 11:46:36 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.7 $
+-- > CVS $Date: 2005/04/21 16:22:11 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.8 $
 --
 -- Gérard Huet's zipper (JFP 7 (1997)). AR 10\/8\/2001
 -----------------------------------------------------------------------------
 
-module Zipper (-- * types
+module GF.Data.Zipper (-- * types
 	       Tr(..),
 	       Path(..),
 	       Loc(..),
@@ -53,7 +53,7 @@ module Zipper (-- * types
 	       arityTree
 	      ) where
 
-import Operations
+import GF.Data.Operations
 
 newtype Tr a = Tr (a,[Tr a]) deriving (Show,Eq)