From 1c8e32e6415e28531604c626ce18e2d6db144393 Mon Sep 17 00:00:00 2001 From: bringert Date: Tue, 12 Dec 2006 11:59:12 +0000 Subject: Moved profile stuff to GF.Speech.SRG, to allow other SRG formats to include SISR. --- src/GF/Speech/PrJSGF.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/GF/Speech/PrJSGF.hs') diff --git a/src/GF/Speech/PrJSGF.hs b/src/GF/Speech/PrJSGF.hs index 2a4c4fd51..6183b9826 100644 --- a/src/GF/Speech/PrJSGF.hs +++ b/src/GF/Speech/PrJSGF.hs @@ -54,11 +54,11 @@ prJSGF (SRG{grammarName=name,startCat=start,origStartCat=origStart,rules=rs}) | null rhs' = showString "" | otherwise = wrap "(" (unwordsS (map prSymbol rhs')) ")" where rhs' = rmPunct rhs - prSymbol (Cat c) = prCat c + prSymbol (Cat (c,_)) = prCat c prSymbol (Tok t) = wrap "\"" (prtS t) "\"" prCat c = showChar '<' . showString c . showChar '>' -rmPunct :: [Symbol String Token] -> [Symbol String Token] +rmPunct :: [Symbol c Token] -> [Symbol c Token] rmPunct [] = [] rmPunct (Tok t:ss) | all isPunct (prt t) = rmPunct ss rmPunct (s:ss) = s : rmPunct ss -- cgit v1.2.3