Renamed removeEmptyCats to bottomUpFilter.

2007-03-20 21:15:59 +00:00
parent e31ccc4567
commit a473281c65
3 changed files with 4 additions and 4 deletions
--- 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.
--- 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
--- 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'