From 3ad9d12c81004b4f281f3fa06ed219897375ce2c Mon Sep 17 00:00:00 2001 From: bjorn Date: Tue, 30 Sep 2008 09:39:09 +0000 Subject: [PATCH] Use filtering in regular printer. --- src/GF/Speech/SRG.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/GF/Speech/SRG.hs b/src/GF/Speech/SRG.hs index 64ec8f78b..b51808d9f 100644 --- a/src/GF/Speech/SRG.hs +++ b/src/GF/Speech/SRG.hs @@ -79,9 +79,12 @@ nonLeftRecursivePrinter :: Maybe SISRFormat -> PGF -> CId -> String nonLeftRecursivePrinter sisr pgf cnc = prSRG sisr $ makeNonLeftRecursiveSRG pgf cnc regularPrinter :: PGF -> CId -> String -regularPrinter pgf cnc = prSRG Nothing $ makeSRG makeRegular pgf cnc +regularPrinter pgf cnc = prSRG Nothing $ makeSRG preprocess pgf cnc where - preprocess = makeRegular + preprocess = mergeIdentical + . makeRegular + . topDownFilter + . bottomUpFilter makeSRG :: (CFG -> CFG) -> PGF -> CId -> SRG makeSRG = mkSRG cfgToSRG