From 62ef772a2c996f2d7d17529eeee845be90586a78 Mon Sep 17 00:00:00 2001 From: krasimir Date: Mon, 14 Sep 2009 12:16:02 +0000 Subject: CheckGrammar is now using the printer in GF.Grammar.Printer. Fixed bug that was hiding the warnings --- src/GF/Speech/VoiceXML.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/GF/Speech') diff --git a/src/GF/Speech/VoiceXML.hs b/src/GF/Speech/VoiceXML.hs index cf6f7120f..134964062 100644 --- a/src/GF/Speech/VoiceXML.hs +++ b/src/GF/Speech/VoiceXML.hs @@ -226,16 +226,16 @@ string s = "'" ++ concatMap esc s ++ "'" -- isListCat :: (CId, [(CId, [CId])]) -> Bool -isListCat (cat,rules) = "List" `isPrefixOf` prIdent cat && length rules == 2 +isListCat (cat,rules) = "List" `isPrefixOf` showIdent cat && length rules == 2 && ("Base"++c) `elem` fs && ("Cons"++c) `elem` fs - where c = drop 4 (prIdent cat) - fs = map (prIdent . fst) rules + where c = drop 4 (showIdent cat) + fs = map (showIdent . fst) rules isBaseFun :: CId -> Bool -isBaseFun f = "Base" `isPrefixOf` prIdent f +isBaseFun f = "Base" `isPrefixOf` showIdent f isConsFun :: CId -> Bool -isConsFun f = "Cons" `isPrefixOf` prIdent f +isConsFun f = "Cons" `isPrefixOf` showIdent f baseSize :: (CId, [(CId, [CId])]) -> Int baseSize (_,rules) = length bs -- cgit v1.2.3