GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 19:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fewer redundant parantheses in JSGF and SRGS ABNF.

Browse Source
This commit is contained in:
bringert
2007-06-26 16:51:09 +00:00
parent 99ac3f8d73
commit 3b93e0ffe2
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/GF/Speech/PrJSGF.hs
View File

@@ -63,12 +63,13 @@ prJSGF sisr srg@(SRG{grammarName=name,grammarLanguage=ml,
rule False cat (map prAlt rhs) rule False cat (map prAlt rhs)
-- rule False cat (map prAlt rhs) -- rule False cat (map prAlt rhs)
-- FIXME: use the probability -- FIXME: use the probability
prAlt (SRGAlt mp n rhs) = sep [initTag, parens (prItem sisr n rhs), finalTag] prAlt (SRGAlt mp n rhs) = sep [initTag, p (prItem sisr n rhs), finalTag]
-- prAlt (SRGAlt mp n rhs) = initTag <+> prItem sisr n rhs <+> finalTag -- prAlt (SRGAlt mp n rhs) = initTag <+> prItem sisr n rhs <+> finalTag
where initTag | isEmpty t = empty where initTag | isEmpty t = empty
| otherwise = text "<NULL>" <+> t | otherwise = text "<NULL>" <+> t
where t = tag sisr (profileInitSISR n) where t = tag sisr (profileInitSISR n)
finalTag = tag sisr (profileFinalSISR n) finalTag = tag sisr (profileFinalSISR n)
p = if isEmpty initTag && isEmpty finalTag then id else parens
topCatRules = [rule True (catFormId tc) (map (it tc) cs) | (tc,cs) <- srgTopCats srg] topCatRules = [rule True (catFormId tc) (map (it tc) cs) | (tc,cs) <- srgTopCats srg]
where it i c = prCat c <+> tag sisr (topCatSISR c) where it i c = prCat c <+> tag sisr (topCatSISR c)
@@ -80,7 +81,7 @@ prCat :: SRGCat -> Doc
prCat c = char '<' <> text c <> char '>' prCat c = char '<' <> text c <> char '>'
prItem :: Maybe SISRFormat -> CFTerm -> SRGItem -> Doc prItem :: Maybe SISRFormat -> CFTerm -> SRGItem -> Doc
prItem sisr t = f 1 prItem sisr t = f 0
where where
f _ (REUnion []) = text "<VOID>" f _ (REUnion []) = text "<VOID>"
f p (REUnion xs) f p (REUnion xs)

5
src/GF/Speech/PrSRGS_ABNF.hs
View File

@@ -70,9 +70,10 @@ prABNF sisr probs srg@(SRG{grammarName=name,grammarLanguage=ml,
comment origCat $$ comment origCat $$
rule False cat (map prAlt rhs) rule False cat (map prAlt rhs)
-- FIXME: use the probability -- FIXME: use the probability
prAlt (SRGAlt mp n rhs) = sep [initTag, parens (prItem sisr n rhs), finalTag] prAlt (SRGAlt mp n rhs) = sep [initTag, p (prItem sisr n rhs), finalTag]
where initTag = tag sisr (profileInitSISR n) where initTag = tag sisr (profileInitSISR n)
finalTag = tag sisr (profileFinalSISR n) finalTag = tag sisr (profileFinalSISR n)
p = if isEmpty initTag && isEmpty finalTag then id else parens
topCatRules = [rule True (catFormId tc) (map (it tc) cs) | (tc,cs) <- srgTopCats srg] topCatRules = [rule True (catFormId tc) (map (it tc) cs) | (tc,cs) <- srgTopCats srg]
where it i c = prCat c <+> tag sisr (topCatSISR c) where it i c = prCat c <+> tag sisr (topCatSISR c)
@@ -84,7 +85,7 @@ prCat :: SRGCat -> Doc
prCat c = char '$' <> text c prCat c = char '$' <> text c
prItem :: Maybe SISRFormat -> CFTerm -> SRGItem -> Doc prItem :: Maybe SISRFormat -> CFTerm -> SRGItem -> Doc
prItem sisr t = f 1 prItem sisr t = f 0
where where
f _ (REUnion []) = text "$VOID" f _ (REUnion []) = text "$VOID"
f p (REUnion xs) f p (REUnion xs)