From a473281c65090bd3cff36289d08bbd9ff098b048 Mon Sep 17 00:00:00 2001 From: bringert Date: Tue, 20 Mar 2007 21:15:59 +0000 Subject: [PATCH] Renamed removeEmptyCats to bottomUpFilter. --- src/GF/Speech/CFGToFiniteState.hs | 2 +- src/GF/Speech/SRG.hs | 2 +- src/GF/Speech/TransformCFG.hs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/GF/Speech/CFGToFiniteState.hs b/src/GF/Speech/CFGToFiniteState.hs index e1ee48610..872de48d0 100644 --- a/src/GF/Speech/CFGToFiniteState.hs +++ b/src/GF/Speech/CFGToFiniteState.hs @@ -63,7 +63,7 @@ cfgToFA opts s = minimize $ compileAutomaton start $ makeSimpleRegular s where start = getStartCatCF opts s makeSimpleRegular :: StateGrammar -> CFRules -makeSimpleRegular = makeRegular . removeIdenticalRules . removeEmptyCats . cfgToCFRules +makeSimpleRegular = makeRegular . removeIdenticalRules . bottomUpFilter . cfgToCFRules -- -- * Approximate context-free grammars with regular grammars. diff --git a/src/GF/Speech/SRG.hs b/src/GF/Speech/SRG.hs index 0b964e468..9dbfe4606 100644 --- a/src/GF/Speech/SRG.hs +++ b/src/GF/Speech/SRG.hs @@ -96,7 +96,7 @@ makeSimpleSRG opt s = l = fmap (replace '_' '-') $ getOptVal opts speechLanguage (cats,cfgRules) = unzip $ preprocess $ cfgToCFRules s preprocess = removeLeftRecursion origStart - . removeEmptyCats + . bottomUpFilter . topDownFilter origStart . removeIdenticalRules . removeCycles diff --git a/src/GF/Speech/TransformCFG.hs b/src/GF/Speech/TransformCFG.hs index eb63ad57a..689125ef3 100644 --- a/src/GF/Speech/TransformCFG.hs +++ b/src/GF/Speech/TransformCFG.hs @@ -87,8 +87,8 @@ stateGFCC :: StateGrammar -> GFCC stateGFCC = mkGFCC . mkCanon2gfcc . stateGrammarST -- | Remove productions which use categories which have no productions -removeEmptyCats :: CFRules -> CFRules -removeEmptyCats = fix removeEmptyCats' +bottomUpFilter :: CFRules -> CFRules +bottomUpFilter = fix removeEmptyCats' where removeEmptyCats' :: CFRules -> CFRules removeEmptyCats' rs = k'