Moved FA and regular grammar printers to a separate module.

3 files changed, 58 insertions, 23 deletions

diff --git a/src/GF/Speech/PrFA.hs b/src/GF/Speech/PrFA.hs
new file mode 100644
index 000000000..28745066f
--- /dev/null
+++ b/src/GF/Speech/PrFA.hs
@@ -0,0 +1,50 @@
+----------------------------------------------------------------------
+-- |
+-- Module      : PrSLF
+-- Maintainer  : BB
+-- Stability   : (stable)
+-- Portability : (portable)
+--
+-- > CVS $Date: 2005/11/10 14:19:33 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.1 $
+--
+-- This module prints finite automata and regular grammars 
+-- for a context-free grammar.
+--
+-- FIXME: remove \/ warn \/ fail if there are int \/ string literal
+-- categories in the grammar
+-----------------------------------------------------------------------------
+
+module GF.Speech.PrFA (faGraphvizPrinter,regularPrinter) where
+
+import GF.Data.Utilities
+import GF.Conversion.Types
+import GF.Formalism.CFG
+import GF.Formalism.Utilities (Symbol(..),symbol)
+import GF.Infra.Ident
+import GF.Infra.Option
+import GF.Infra.Print
+import GF.Speech.CFGToFiniteState
+import GF.Speech.FiniteState
+import GF.Speech.SRG
+import GF.Speech.TransformCFG
+
+import Data.Char (toUpper,toLower)
+import Data.List
+import Data.Maybe (fromMaybe)
+
+faGraphvizPrinter :: Ident -- ^ Grammar name
+		   -> Options -> CGrammar -> String
+faGraphvizPrinter name opts cfg = 
+    prFAGraphviz (mapStates (const "") $ mapTransitions (fromMaybe "") $ cfgToFA name opts cfg)
+
+
+-- | Convert the grammar to a regular grammar and print it in BNF
+regularPrinter :: CGrammar -> String
+regularPrinter = prCFRules . makeSimpleRegular
+  where
+  prCFRules :: CFRules -> String
+  prCFRules g = unlines [ c ++ " ::= " ++ join " | " (map (showRhs . ruleRhs) rs) | (c,rs) <- g]
+  join g = concat . intersperse g
+  showRhs = unwords . map (symbol id show)
diff --git a/src/GF/Speech/PrSLF.hs b/src/GF/Speech/PrSLF.hs
index 33ddf03ca..7a328dd1d 100644
--- a/src/GF/Speech/PrSLF.hs
+++ b/src/GF/Speech/PrSLF.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/09/14 16:08:35 $ 
+-- > CVS $Date: 2005/11/10 14:19:33 $ 
 -- > CVS $Author: bringert $
--- > CVS $Revision: 1.10 $
+-- > CVS $Revision: 1.11 $
 --
 -- This module converts a CFG to an SLF finite-state network
 -- for use with the ATK recognizer. The SLF format is described
@@ -18,8 +18,7 @@
 -- categories in the grammar
 -----------------------------------------------------------------------------
 
-module GF.Speech.PrSLF (slfPrinter,slfGraphvizPrinter,
-                        faGraphvizPrinter,regularPrinter) where
+module GF.Speech.PrSLF (slfPrinter,slfGraphvizPrinter) where
 
 import GF.Data.Utilities
 import GF.Conversion.Types
@@ -56,21 +55,6 @@ slfGraphvizPrinter :: Ident -- ^ Grammar name
 slfGraphvizPrinter name opts cfg = 
     prFAGraphviz (mapStates (fromMaybe "") $ mapTransitions (const "") $ moveLabelsToNodes $ cfgToFA name opts cfg)
 
-faGraphvizPrinter :: Ident -- ^ Grammar name
-		   -> Options -> CGrammar -> String
-faGraphvizPrinter name opts cfg = 
-    prFAGraphviz (mapStates (const "") $ mapTransitions (fromMaybe "") $ cfgToFA name opts cfg)
-
-
--- | Convert the grammar to a regular grammar and print it in BNF
-regularPrinter :: CGrammar -> String
-regularPrinter = prCFRules . makeSimpleRegular
-  where
-  prCFRules :: CFRules -> String
-  prCFRules g = unlines [ c ++ " ::= " ++ join " | " (map (showRhs . ruleRhs) rs) | (c,rs) <- g]
-  join g = concat . intersperse g
-  showRhs = unwords . map (symbol id show)
-
 automatonToSLF :: FA State (Maybe String) () -> SLF
 automatonToSLF fa = 
     SLF { slfNodes = map mkSLFNode (states fa), 
diff --git a/src/GF/UseGrammar/Custom.hs b/src/GF/UseGrammar/Custom.hs
index 2647f16f4..9a4ce997d 100644
--- a/src/GF/UseGrammar/Custom.hs
+++ b/src/GF/UseGrammar/Custom.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/11/09 15:14:30 $ 
--- > CVS $Author: aarne $
--- > CVS $Revision: 1.82 $
+-- > CVS $Date: 2005/11/10 14:19:33 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.83 $
 --
 -- A database for customizable GF shell commands. 
 --
@@ -58,7 +58,8 @@ import GF.CF.CFtoSRG
 import GF.Speech.PrGSL (gslPrinter)
 import GF.Speech.PrJSGF (jsgfPrinter)
 import GF.Speech.PrSRGS (srgsXmlPrinter)
-import GF.Speech.PrSLF (slfPrinter,slfGraphvizPrinter,faGraphvizPrinter,regularPrinter)
+import GF.Speech.PrSLF (slfPrinter,slfGraphvizPrinter)
+import GF.Speech.PrFA (faGraphvizPrinter,regularPrinter)
 
 import GF.Data.Zipper