diff options
| author | bringert <bringert@cs.chalmers.se> | 2006-12-12 10:37:45 +0000 |
|---|---|---|
| committer | bringert <bringert@cs.chalmers.se> | 2006-12-12 10:37:45 +0000 |
| commit | 87b66d52057cca6c002c8ce9da2e93030fba1443 (patch) | |
| tree | 079a6a00fb834e1844bd398b8226f66fd939de37 | |
| parent | c07300b86be9aa84cf68c3fc510e8af5812cee13 (diff) | |
SRGS generation: don't include debug script stuff if debugging is disabled. Place category comments better.
| -rw-r--r-- | src/GF/Speech/GrammarToVoiceXML.hs | 2 | ||||
| -rw-r--r-- | src/GF/Speech/PrSRGS.hs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/GF/Speech/GrammarToVoiceXML.hs b/src/GF/Speech/GrammarToVoiceXML.hs index c2bf32b58..b2142b50c 100644 --- a/src/GF/Speech/GrammarToVoiceXML.hs +++ b/src/GF/Speech/GrammarToVoiceXML.hs @@ -110,7 +110,7 @@ skel2vxml name language start skel qs = vxml language (prelude ++ [startForm] ++ concatMap (uncurry (catForms gr qs)) skel) where gr = grammarURI name - prelude = (if debug then [var "debug" (Just "0")] else []) ++ scriptLib + prelude = if debug then [var "debug" (Just "0")] ++ scriptLib else [] startForm = Tag "form" [] [subdialog "sub" [("src", "#"++start)] []] grammarURI :: String -> String diff --git a/src/GF/Speech/PrSRGS.hs b/src/GF/Speech/PrSRGS.hs index 175b97366..2d401bb4a 100644 --- a/src/GF/Speech/PrSRGS.hs +++ b/src/GF/Speech/PrSRGS.hs @@ -56,9 +56,9 @@ prSrgsXml sisr (SRG{grammarName=name,startCat=start, meta "generator" ("Grammatical Framework " ++ version ++ " (compiled " ++ today ++ ")")] ++ topCatRules - ++ map ruleToXML rs + ++ concatMap ruleToXML rs ruleToXML (SRGRule cat origCat alts) = - rule (prCat cat) (comments ["Category " ++ origCat] ++ prRhs isList alts) + comments ["Category " ++ origCat] ++ [rule (prCat cat) (prRhs isList alts)] where isList = False -- Disabled list build since OptimTalk can't handle it ATM {- "List" `isPrefixOf` origCat && length cs == 2 |