diff options
| author | krasimir <krasimir@chalmers.se> | 2009-09-14 12:16:02 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2009-09-14 12:16:02 +0000 |
| commit | 62ef772a2c996f2d7d17529eeee845be90586a78 (patch) | |
| tree | 3d415cb7c1a10a98172fa2c1192b9ac353f5935e /src/GF/Speech | |
| parent | cc151c42790e02d60d6a0ab18c9c56da76f0ea51 (diff) | |
CheckGrammar is now using the printer in GF.Grammar.Printer. Fixed bug that was hiding the warnings
Diffstat (limited to 'src/GF/Speech')
| -rw-r--r-- | src/GF/Speech/VoiceXML.hs | 10 |
1 files changed, 5 insertions, 5 deletions
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 |