diff options
Diffstat (limited to 'src/compiler/GF/Grammar/ShowTerm.hs')
| -rw-r--r-- | src/compiler/GF/Grammar/ShowTerm.hs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/compiler/GF/Grammar/ShowTerm.hs b/src/compiler/GF/Grammar/ShowTerm.hs index 8f64fbc5a..d97ad9fe3 100644 --- a/src/compiler/GF/Grammar/ShowTerm.hs +++ b/src/compiler/GF/Grammar/ShowTerm.hs @@ -5,7 +5,7 @@ import GF.Grammar.Printer import GF.Grammar.Lookup import GF.Data.Operations -import Text.PrettyPrint +import GF.Text.Pretty import Data.List (intersperse) showTerm :: SourceGrammar -> TermPrintStyle -> TermPrintQual -> Term -> String @@ -13,7 +13,7 @@ showTerm gr sty q t = case sty of TermPrintTable -> render $ vcat [p <+> s | (p,s) <- ppTermTabular gr q t] TermPrintAll -> render $ vcat [ s | (p,s) <- ppTermTabular gr q t] TermPrintList -> renderStyle (style{mode = OneLineMode}) $ - vcat (punctuate comma [s | (p,s) <- ppTermTabular gr q t]) + vcat (punctuate ',' [s | (p,s) <- ppTermTabular gr q t]) TermPrintOne -> render $ vcat [ s | (p,s) <- take 1 (ppTermTabular gr q t)] TermPrintDefault -> render $ ppTerm q 0 t @@ -21,19 +21,19 @@ ppTermTabular :: SourceGrammar -> TermPrintQual -> Term -> [(Doc,Doc)] ppTermTabular gr q = pr where pr t = case t of R rs -> - [(ppLabel lab <+> char '.' <+> path, str) | (lab,(_,val)) <- rs, (path,str) <- pr val] + [(lab <+> '.' <+> path, str) | (lab,(_,val)) <- rs, (path,str) <- pr val] T _ cs -> - [(ppPatt q 0 patt <+> text "=>" <+> path, str) | (patt, val ) <- cs, (path,str) <- pr val] + [(ppPatt q 0 patt <+> "=>" <+> path, str) | (patt, val ) <- cs, (path,str) <- pr val] V ty cs -> let pvals = case allParamValues gr ty of Ok pvals -> pvals Bad _ -> map Meta [1..] - in [(ppTerm q 0 pval <+> text "=>" <+> path, str) | (pval, val) <- zip pvals cs, (path,str) <- pr val] + in [(ppTerm q 0 pval <+> "=>" <+> path, str) | (pval, val) <- zip pvals cs, (path,str) <- pr val] _ -> [(empty,ps t)] ps t = case t of - K s -> text s + K s -> pp s C s u -> ps s <+> ps u - FV ts -> hsep (intersperse (char '/') (map ps ts)) + FV ts -> hsep (intersperse (pp '/') (map ps ts)) _ -> ppTerm q 0 t data TermPrintStyle |