Fixed module names and imports after giant file move.

4 files changed, 24 insertions, 24 deletions

diff --git a/src/GF/Speech/PrGSL.hs b/src/GF/Speech/PrGSL.hs
index 0455e3653..14fb4c58e 100644
--- a/src/GF/Speech/PrGSL.hs
+++ b/src/GF/Speech/PrGSL.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/15 09:45:32 $ 
+-- > CVS $Date: 2005/04/21 16:23:31 $ 
 -- > CVS $Author: bringert $
--- > CVS $Revision: 1.17 $
+-- > CVS $Revision: 1.18 $
 --
 -- This module prints a CFG as a Nuance GSL 2.0 grammar.
 --
@@ -15,16 +15,16 @@
 -- categories in the grammar
 -----------------------------------------------------------------------------
 
-module PrGSL (gslPrinter) where
+module GF.Speech.PrGSL (gslPrinter) where
 
-import SRG
-import Ident
+import GF.Speech.SRG
+import GF.Infra.Ident
 
 import GF.Formalism.CFG
 import GF.Formalism.Utilities (Symbol(..))
 import GF.Conversion.Types
 import GF.Infra.Print
-import Option
+import GF.Infra.Option
 
 import Data.Char (toUpper,toLower)
 
diff --git a/src/GF/Speech/PrJSGF.hs b/src/GF/Speech/PrJSGF.hs
index 178365bac..58a33a324 100644
--- a/src/GF/Speech/PrJSGF.hs
+++ b/src/GF/Speech/PrJSGF.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/15 09:45:32 $ 
+-- > CVS $Date: 2005/04/21 16:23:31 $ 
 -- > CVS $Author: bringert $
--- > CVS $Revision: 1.11 $
+-- > CVS $Revision: 1.12 $
 --
 -- This module prints a CFG as a JSGF grammar.
 --
@@ -17,15 +17,15 @@
 -- FIXME: convert to UTF-8
 -----------------------------------------------------------------------------
 
-module PrJSGF (jsgfPrinter) where
+module GF.Speech.PrJSGF (jsgfPrinter) where
 
-import SRG
-import Ident
+import GF.Speech.SRG
+import GF.Infra.Ident
 import GF.Formalism.CFG
 import GF.Formalism.Utilities (Symbol(..))
 import GF.Conversion.Types
 import GF.Infra.Print
-import Option
+import GF.Infra.Option
 
 jsgfPrinter :: Ident -- ^ Grammar name
 	   -> Options -> CGrammar -> String
diff --git a/src/GF/Speech/SRG.hs b/src/GF/Speech/SRG.hs
index e1ac0efc4..d59a391a1 100644
--- a/src/GF/Speech/SRG.hs
+++ b/src/GF/Speech/SRG.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/14 18:38:36 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.12 $
+-- > CVS $Date: 2005/04/21 16:23:32 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.13 $
 --
 -- Representation of, conversion to, and utilities for 
 -- printing of a general Speech Recognition Grammar. 
@@ -18,9 +18,9 @@
 -- FIXME: figure out name prefix from grammar name
 -----------------------------------------------------------------------------
 
-module SRG where
+module GF.Speech.SRG where
 
-import Ident
+import GF.Infra.Ident
 -- import GF.OldParsing.CFGrammar
 -- import GF.OldParsing.Utilities (Symbol(..))
 -- import GF.OldParsing.GrammarTypes
@@ -29,8 +29,8 @@ import GF.Formalism.CFG
 import GF.Formalism.Utilities (Symbol(..))
 import GF.Conversion.Types
 import GF.Infra.Print
-import TransformCFG
-import Option
+import GF.Speech.TransformCFG
+import GF.Infra.Option
 
 import Data.List
 import Data.Maybe (fromMaybe)
diff --git a/src/GF/Speech/TransformCFG.hs b/src/GF/Speech/TransformCFG.hs
index 8e2673a9f..71b3ca296 100644
--- a/src/GF/Speech/TransformCFG.hs
+++ b/src/GF/Speech/TransformCFG.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/15 09:45:32 $ 
+-- > CVS $Date: 2005/04/21 16:23:33 $ 
 -- > CVS $Author: bringert $
--- > CVS $Revision: 1.11 $
+-- > CVS $Revision: 1.12 $
 --
 --  This module does some useful transformations on CFGs.
 --
@@ -16,9 +16,9 @@
 -- peb thinks: most of this module should be moved to GF.Conversion...
 -----------------------------------------------------------------------------
 
-module TransformCFG (makeNice, CFRule_) where
+module GF.Speech.TransformCFG (makeNice, CFRule_) where
 
-import Ident
+import GF.Infra.Ident
 import GF.Formalism.CFG 
 import GF.Formalism.Utilities (Symbol(..), mapSymbol)
 import GF.Conversion.Types
@@ -100,4 +100,4 @@ fix f x = let x' = f x in if x' == x then x else fix f x'
 
 nothingOrNull :: Maybe [a] -> Bool
 nothingOrNull Nothing = True
-nothingOrNull (Just xs) = null xs
\ No newline at end of file
+nothingOrNull (Just xs) = null xs