msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

Use shorter lines and paragraph-filling in SRGS, JSGF and GSL printing.

Browse Source
This commit is contained in:
bringert
2007-06-27 14:25:39 +00:00
parent 2e7f415ac8
commit 6bd9a9faaf
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,7 @@ import Text.PrettyPrint.HughesPJ
import Debug.Trace
width :: Int
width = 80
width = 75
jsgfPrinter :: Maybe SISRFormat
-> Options
@@ -92,7 +92,7 @@ prItem sisr t = f 0
| otherwise = (if p >= 1 then parens else id) (alts (map (f 1) xs))
where (es,nes) = partition isEpsilon xs
f _ (REConcat []) = text "<NULL>"
f p (REConcat xs) = (if p >= 3 then parens else id) (hsep (map (f 2) xs))
f p (REConcat xs) = (if p >= 3 then parens else id) (fsep (map (f 2) xs))
f p (RERepeat x) = f 3 x <> char '*'
f _ (RESymbol s) = prSymbol sisr t s
@@ -125,10 +125,10 @@ comment :: String -> Doc
comment s = text "//" <+> text s
alts :: [Doc] -> Doc
alts = sep . prepunctuate (text "| ")
alts = fsep . prepunctuate (text "| ")
rule :: Bool -> SRGCat -> [Doc] -> Doc
rule pub c xs = sep [p <+> prCat c <+> char '=', nest 2 (alts xs) <+> char ';']
rule pub c xs = p <+> prCat c <+> char '=' <+> nest 2 (alts xs) <+> char ';'
where p = if pub then text "public" else empty
-- Pretty-printing utilities