From fcc25f0bbac6b949f970e042069d1fe122a9f388 Mon Sep 17 00:00:00 2001
From: peb <unknown>
Date: Mon, 21 Mar 2005 21:40:03 +0000
Subject: [PATCH] "Committed_by_peb"

---
 src/GF/CFGM/PrintCFGrammar.hs          | 14 +++++++-------
 src/GF/Compile/ShellState.hs           |  6 +++---
 src/GF/Parsing/ConvertGFCtoMCFG/Old.hs |  6 +++---
 src/GF/Speech/PrGSL.hs                 | 10 +++++-----
 src/GF/Speech/PrJSGF.hs                | 10 +++++-----
 src/GF/Speech/SRG.hs                   | 10 +++++-----
 src/GF/Speech/TransformCFG.hs          | 10 +++++-----
 src/GF/UseGrammar/Custom.hs            |  6 +++---
 8 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/GF/CFGM/PrintCFGrammar.hs b/src/GF/CFGM/PrintCFGrammar.hs
index 108122547..afde02884 100644
--- a/src/GF/CFGM/PrintCFGrammar.hs
+++ b/src/GF/CFGM/PrintCFGrammar.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/21 14:27:10 $ 
--- > CVS $Author: bringert $
--- > CVS $Revision: 1.11 $
+-- > CVS $Date: 2005/03/21 22:40:03 $ 
+-- > CVS $Author: peb $
+-- > CVS $Revision: 1.12 $
 --
 -- Handles printing a CFGrammar in CFGM format.
 -----------------------------------------------------------------------------
@@ -19,12 +19,12 @@ import qualified PrintCFG
 import Ident
 import GFC
 import Modules
-import qualified GF.Conversion.ConvertGrammar as Cnv
+import qualified GF.Parsing.ConvertGrammar as Cnv
 import qualified GF.Printing.PrintParser as Prt
-import qualified GF.Conversion.CFGrammar as CFGrammar
-import qualified GF.Conversion.GrammarTypes as GT
+import qualified GF.Parsing.CFGrammar as CFGrammar
+import qualified GF.Parsing.GrammarTypes as GT
 import qualified AbsCFG
-import qualified GF.Parsing.Parser as Parser
+import qualified GF.Parsing.Utilities as Parser
 import ErrM
 import qualified Option
 
diff --git a/src/GF/Compile/ShellState.hs b/src/GF/Compile/ShellState.hs
index 50625c15f..f2cf3b094 100644
--- a/src/GF/Compile/ShellState.hs
+++ b/src/GF/Compile/ShellState.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/21 13:54:24 $ 
+-- > CVS $Date: 2005/03/21 22:40:03 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.39 $
+-- > CVS $Revision: 1.40 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
@@ -36,7 +36,7 @@ import Arch (ModTime)
 
 -- peb 25/5-04
 -- import CFtoCFG
-import qualified GF.Conversion.ConvertGrammar as Cnv
+import qualified GF.Parsing.ConvertGrammar as Cnv
 
 import List (nub,nubBy)
 
diff --git a/src/GF/Parsing/ConvertGFCtoMCFG/Old.hs b/src/GF/Parsing/ConvertGFCtoMCFG/Old.hs
index 90044fa0d..bd94198c4 100644
--- a/src/GF/Parsing/ConvertGFCtoMCFG/Old.hs
+++ b/src/GF/Parsing/ConvertGFCtoMCFG/Old.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/21 22:31:53 $ 
+-- > CVS $Date: 2005/03/21 22:44:39 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.1 $
+-- > CVS $Revision: 1.2 $
 --
 -- Converting GFC grammars to MCFG grammars.
 --
@@ -39,7 +39,7 @@ import MkGFC (grammar2canon)
 import GF.Parsing.Utilities
 import GF.Parsing.GrammarTypes 
 import GF.Parsing.MCFGrammar (Rule(..), Lin(..))
-import SortedList (nubsort, groupPairs)
+import GF.Data.SortedList (nubsort, groupPairs)
 import Maybe (listToMaybe)
 import List (groupBy, transpose)
 
diff --git a/src/GF/Speech/PrGSL.hs b/src/GF/Speech/PrGSL.hs
index 024fc9f31..537bce960 100644
--- a/src/GF/Speech/PrGSL.hs
+++ b/src/GF/Speech/PrGSL.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/21 14:17:44 $ 
+-- > CVS $Date: 2005/03/21 22:40:04 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.13 $
+-- > CVS $Revision: 1.14 $
 --
 -- This module prints a CFG as a Nuance GSL 2.0 grammar.
 --
@@ -19,9 +19,9 @@ module PrGSL (gslPrinter) where
 
 import SRG
 import Ident
-import GF.Conversion.CFGrammar
-import GF.Parsing.Parser (Symbol(..))
-import GF.Conversion.GrammarTypes
+import GF.Parsing.CFGrammar
+import GF.Parsing.Utilities (Symbol(..))
+import GF.Parsing.GrammarTypes
 import GF.Printing.PrintParser
 import Option
 
diff --git a/src/GF/Speech/PrJSGF.hs b/src/GF/Speech/PrJSGF.hs
index ade23da91..f6dd7d0c3 100644
--- a/src/GF/Speech/PrJSGF.hs
+++ b/src/GF/Speech/PrJSGF.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/21 14:17:44 $ 
+-- > CVS $Date: 2005/03/21 22:40:05 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.7 $
+-- > CVS $Revision: 1.8 $
 --
 -- This module prints a CFG as a JSGF grammar.
 --
@@ -21,9 +21,9 @@ module PrJSGF (jsgfPrinter) where
 
 import SRG
 import Ident
-import GF.Conversion.CFGrammar
-import GF.Parsing.Parser (Symbol(..))
-import GF.Conversion.GrammarTypes
+import GF.Parsing.CFGrammar
+import GF.Parsing.Utilities (Symbol(..))
+import GF.Parsing.GrammarTypes
 import GF.Printing.PrintParser
 import Option
 
diff --git a/src/GF/Speech/SRG.hs b/src/GF/Speech/SRG.hs
index c2f8fc33c..1e71d983a 100644
--- a/src/GF/Speech/SRG.hs
+++ b/src/GF/Speech/SRG.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/21 14:17:44 $ 
+-- > CVS $Date: 2005/03/21 22:40:06 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.9 $
+-- > CVS $Revision: 1.10 $
 --
 -- Representation of, conversion to, and utilities for 
 -- printing of a general Speech Recognition Grammar. 
@@ -21,9 +21,9 @@
 module SRG where
 
 import Ident
-import GF.Conversion.CFGrammar
-import GF.Parsing.Parser (Symbol(..))
-import GF.Conversion.GrammarTypes
+import GF.Parsing.CFGrammar
+import GF.Parsing.Utilities (Symbol(..))
+import GF.Parsing.GrammarTypes
 import GF.Printing.PrintParser
 import TransformCFG
 import Option
diff --git a/src/GF/Speech/TransformCFG.hs b/src/GF/Speech/TransformCFG.hs
index 6c6f5091b..7c481f5c0 100644
--- a/src/GF/Speech/TransformCFG.hs
+++ b/src/GF/Speech/TransformCFG.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/21 14:17:45 $ 
+-- > CVS $Date: 2005/03/21 22:40:06 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.7 $
+-- > CVS $Revision: 1.8 $
 --
 --  This module does some useful transformations on CFGs.
 --
@@ -17,9 +17,9 @@
 module TransformCFG (makeNice, CFRule_) where
 
 import Ident
-import GF.Conversion.CFGrammar
-import GF.Parsing.Parser (Symbol(..))
-import GF.Conversion.GrammarTypes
+import GF.Parsing.CFGrammar
+import GF.Parsing.Utilities (Symbol(..))
+import GF.Parsing.GrammarTypes
 import GF.Printing.PrintParser
 
 import Data.FiniteMap
diff --git a/src/GF/UseGrammar/Custom.hs b/src/GF/UseGrammar/Custom.hs
index 9c7c9e15e..91697af93 100644
--- a/src/GF/UseGrammar/Custom.hs
+++ b/src/GF/UseGrammar/Custom.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/21 14:17:45 $ 
+-- > CVS $Date: 2005/03/21 22:40:06 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.46 $
+-- > CVS $Revision: 1.47 $
 --
 -- A database for customizable GF shell commands. 
 --
@@ -73,7 +73,7 @@ import qualified GF.Parsing.ParseCF as PCF
 
 -- grammar conversions -- peb 19/4-04
 -- see also customGrammarPrinter
-import qualified GF.Conversion.ConvertGrammar as Cnv
+import qualified GF.Parsing.ConvertGrammar as Cnv
 import qualified GF.Printing.PrintParser as Prt
 
 import GFC