From e04956a42d488cdff6209a392211b89c6ef64b3e Mon Sep 17 00:00:00 2001
From: peb <unknown>
Date: Mon, 30 May 2005 07:11:32 +0000
Subject: "Committed_by_peb"

---
 src/GF/Conversion/RemoveEpsilon.hs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'src/GF/Conversion/RemoveEpsilon.hs')

diff --git a/src/GF/Conversion/RemoveEpsilon.hs b/src/GF/Conversion/RemoveEpsilon.hs
index bdfdfb41e..0e5dafb38 100644
--- a/src/GF/Conversion/RemoveEpsilon.hs
+++ b/src/GF/Conversion/RemoveEpsilon.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/21 16:21:52 $ 
--- > CVS $Author: bringert $
--- > CVS $Revision: 1.2 $
+-- > CVS $Date: 2005/05/30 08:11:32 $ 
+-- > CVS $Author: peb $
+-- > CVS $Revision: 1.3 $
 --
 -- Removing epsilon linearizations from MCF grammars
 -----------------------------------------------------------------------------
@@ -30,7 +30,17 @@ import GF.Data.SortedList
 import GF.Data.GeneralDeduction
 
 convertGrammar :: EGrammar -> EGrammar
-convertGrammar grammar = undefined
+convertGrammar grammar = trace2 "RemoveEpsilon: initialEmpties" (prt initialEmpties) $
+			 trace2 "RemoveEpsilon: emptyCats" (prt emptyCats) $
+			 grammar 
+    where initialEmpties  = nubsort [ (cat, lbl)  | 
+				      Rule (Abs cat _ _) (Cnc _ _ lins) <- grammar,
+				      Lin lbl [] <- lins ]
+	  emptyCats       = limitEmpties initialEmpties
+	  limitEmpties es = if es==es' then es else limitEmpties es'
+	      where es'   = nubsort [ (cat, lbl) | Rule (Abs cat _ _) (Cnc _ _ lins) <- grammar, 
+				      Lin lbl rhs <- lins,
+				      all (symbol (\(c,l,n) -> (c,l) `elem` es) (const False)) rhs ]
 
 
 
-- 
cgit v1.2.3