From 336273c5344a22f225e54d36b874c6307127b281 Mon Sep 17 00:00:00 2001
From: bringert <bringert@cs.chalmers.se>
Date: Thu, 21 Jun 2007 13:11:26 +0000
Subject: SRG always has RE rhs.

---
 src/GF/Speech/PrJSGF.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/GF/Speech/PrJSGF.hs')

diff --git a/src/GF/Speech/PrJSGF.hs b/src/GF/Speech/PrJSGF.hs
index a86cd71b7..efdce4d75 100644
--- a/src/GF/Speech/PrJSGF.hs
+++ b/src/GF/Speech/PrJSGF.hs
@@ -60,10 +60,10 @@ prJSGF sisr srg@(SRG{grammarName=name,grammarLanguage=ml,
                 Nothing -> empty
     prRule (SRGRule cat origCat rhs) = 
 	comment origCat $$
-        rule False cat (map prAlt (ebnfSRGAlts rhs))
+        rule False cat (map prAlt rhs)
 --        rule False cat (map prAlt rhs)
     -- FIXME: use the probability
-    prAlt (EBnfSRGAlt mp n rhs) = sep [initTag, parens (prItem sisr n rhs), finalTag]
+    prAlt (SRGAlt mp n rhs) = sep [initTag, parens (prItem sisr n rhs), finalTag]
 --    prAlt (SRGAlt mp n rhs) = initTag <+> prItem sisr n rhs <+> finalTag
       where initTag | isEmpty t = empty
                     | otherwise = text "<NULL>" <+>  t
@@ -79,7 +79,7 @@ catFormId = (++ "_cat")
 prCat :: SRGCat -> Doc
 prCat c = char '<' <> text c <> char '>'
 
-prItem :: Maybe SISRFormat -> CFTerm -> EBnfSRGItem -> Doc
+prItem :: Maybe SISRFormat -> CFTerm -> SRGItem -> Doc
 prItem sisr t = f 1
   where
     f _ (REUnion [])  = text "<VOID>"
-- 
cgit v1.2.3