diff options
| author | bringert <bringert@cs.chalmers.se> | 2007-01-21 17:10:10 +0000 |
|---|---|---|
| committer | bringert <bringert@cs.chalmers.se> | 2007-01-21 17:10:10 +0000 |
| commit | abeb18fb20386ff7f14c8a564bc5af2d5eef1432 (patch) | |
| tree | fbe98a212a90f7dbe082f203e294d16b5b4815bb | |
| parent | 71111e0a7c23c3b6b8bf99915f5e1479141cc27b (diff) | |
Use _cat category as root in SRGS ABNF and JSGF. SRGS XML already did this.
| -rw-r--r-- | src/GF/Speech/PrJSGF.hs | 4 | ||||
| -rw-r--r-- | src/GF/Speech/PrSRGS_ABNF.hs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/GF/Speech/PrJSGF.hs b/src/GF/Speech/PrJSGF.hs index f6f0b19b2..a86cd71b7 100644 --- a/src/GF/Speech/PrJSGF.hs +++ b/src/GF/Speech/PrJSGF.hs @@ -55,7 +55,9 @@ prJSGF sisr srg@(SRG{grammarName=name,grammarLanguage=ml, text ("grammar " ++ name ++ ";") lang = maybe empty text ml mainCat = comment ("Start category: " ++ origStart) $$ - rule True "MAIN" [prCat start] + case cfgCatToGFCat origStart of + Just c -> rule True "MAIN" [prCat (catFormId c)] + Nothing -> empty prRule (SRGRule cat origCat rhs) = comment origCat $$ rule False cat (map prAlt (ebnfSRGAlts rhs)) diff --git a/src/GF/Speech/PrSRGS_ABNF.hs b/src/GF/Speech/PrSRGS_ABNF.hs index d79ee7b55..9ba705926 100644 --- a/src/GF/Speech/PrSRGS_ABNF.hs +++ b/src/GF/Speech/PrSRGS_ABNF.hs @@ -60,7 +60,9 @@ prABNF sisr probs srg@(SRG{grammarName=name,grammarLanguage=ml, language = maybe empty (\l -> text "language" <+> text l <> char ';') ml tagFormat | isJust sisr = text "tag-format" <+> text "<semantics/1.0>" <> char ';' | otherwise = empty - mainCat = text "root" <+> prCat start <> char ';' + mainCat = case cfgCatToGFCat origStart of + Just c -> text "root" <+> prCat (catFormId c) <> char ';' + Nothing -> empty prRule (SRGRule cat origCat rhs) = comment origCat $$ rule False cat (map prAlt (ebnfSRGAlts rhs)) |