"Committed_by_peb"

4 files changed, 15 insertions, 15 deletions

diff --git a/src/GF/Speech/PrGSL.hs b/src/GF/Speech/PrGSL.hs
index 3c2d5b479..ce55960ee 100644
--- a/src/GF/Speech/PrGSL.hs
+++ b/src/GF/Speech/PrGSL.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:21 $ 
+-- > CVS $Date: 2005/03/18 10:17:10 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.10 $
+-- > CVS $Revision: 1.11 $
 --
 -- This module prints a CFG as a Nuance GSL 2.0 grammar.
 --
@@ -55,13 +55,13 @@ firstToUpper :: String -> String
 firstToUpper [] = []
 firstToUpper (x:xs) = toUpper x : xs
 
-rmPunct :: [Symbol String Token] -> [Symbol String Token] 
+rmPunct :: [Symbol String Tokn] -> [Symbol String Tokn] 
 rmPunct [] = []
 rmPunct (Tok t:ss) | all isPunct (prt t) = rmPunct ss
 rmPunct (s:ss) = s : rmPunct ss
 
 -- Nuance does not like upper case characters in tokens
-showToken :: Token -> String
+showToken :: Tokn -> String
 showToken t = map toLower (prt t)
 
 isPunct :: Char -> Bool
diff --git a/src/GF/Speech/PrJSGF.hs b/src/GF/Speech/PrJSGF.hs
index 6f2b51988..a5b81cfea 100644
--- a/src/GF/Speech/PrJSGF.hs
+++ b/src/GF/Speech/PrJSGF.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/22 13:35:19 $ 
--- > CVS $Author: bringert $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/03/18 10:17:11 $ 
+-- > CVS $Author: peb $
+-- > CVS $Revision: 1.5 $
 --
 -- This module prints a CFG as a JSGF grammar.
 --
@@ -53,7 +53,7 @@ prJSGF (SRG{grammarName=name,startCat=start,origStartCat=origStart,rules=rs})
     prSymbol (Tok t) = wrap "\"" (prtS t) "\""
     prCat c = showChar '<' . showString c . showChar '>'
 
-rmPunct :: [Symbol String Token] -> [Symbol String Token] 
+rmPunct :: [Symbol String Tokn] -> [Symbol String Tokn] 
 rmPunct [] = []
 rmPunct (Tok t:ss) | all isPunct (prt t) = rmPunct ss
 rmPunct (s:ss) = s : rmPunct ss
diff --git a/src/GF/Speech/SRG.hs b/src/GF/Speech/SRG.hs
index 40240651e..cf474f6a1 100644
--- a/src/GF/Speech/SRG.hs
+++ b/src/GF/Speech/SRG.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/24 11:46:38 $ 
+-- > CVS $Date: 2005/03/18 10:17:11 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.6 $
+-- > CVS $Revision: 1.7 $
 --
 -- Representation of, conversion to, and utilities for 
 -- printing of a general Speech Recognition Grammar. 
@@ -40,7 +40,7 @@ data SRG = SRG { grammarName :: String    -- ^ grammar name
 	       }
 data SRGRule = SRGRule String String [SRGAlt] -- ^ SRG category name, original category name
 	                                      --   and productions
-type SRGAlt = [Symbol String Token]
+type SRGAlt = [Symbol String Tokn]
 
 -- | SRG category name and original name
 type CatName = (String,String) 
diff --git a/src/GF/Speech/TransformCFG.hs b/src/GF/Speech/TransformCFG.hs
index 870325b9e..560687faf 100644
--- a/src/GF/Speech/TransformCFG.hs
+++ b/src/GF/Speech/TransformCFG.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/22 13:35:19 $ 
--- > CVS $Author: bringert $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/03/18 10:17:11 $ 
+-- > CVS $Author: peb $
+-- > CVS $Revision: 1.5 $
 --
 --  This module does some useful transformations on CFGs.
 --
@@ -30,7 +30,7 @@ import Debug.Trace
 
 
 -- | not very nice to get replace the structured CFCat type with a simple string
-type CFRule_ = Rule CFName String Token
+type CFRule_ = Rule CFName String Tokn
 
 type CFRules = FiniteMap String [CFRule_]