From 6d179267de8f988ab2ee52a5fef99b3b05576222 Mon Sep 17 00:00:00 2001
From: aarne <unknown>
Date: Tue, 20 Sep 2005 08:32:55 +0000
Subject: CSEE now works fine

---
 src/GF/Conversion/GFCtoSimple.hs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/GF/Conversion')

diff --git a/src/GF/Conversion/GFCtoSimple.hs b/src/GF/Conversion/GFCtoSimple.hs
index c6c7a2125..3aa9adb6d 100644
--- a/src/GF/Conversion/GFCtoSimple.hs
+++ b/src/GF/Conversion/GFCtoSimple.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/08/08 08:09:49 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.13 $
+-- > CVS $Date: 2005/09/20 09:32:56 $ 
+-- > CVS $Author: aarne $
+-- > CVS $Revision: 1.14 $
 --
 -- Converting GFC to SimpleGFC
 --
@@ -30,6 +30,7 @@ import GF.Conversion.Types
 import GF.UseGrammar.Linear (expandLinTables)
 import GF.Canon.GFC (CanonGrammar)
 import GF.Canon.MkGFC (grammar2canon)
+import GF.Canon.Subexpressions (unSubelimCanon)
 import qualified GF.Canon.Look as Look (lookupLin, allParamValues, lookupLincat)
 import qualified GF.Canon.CMacros as CMacros (defLinType)
 import GF.Data.Operations (err, errVal)
@@ -43,12 +44,13 @@ import GF.Infra.Print
 type Env = (CanonGrammar, I.Ident)
 
 convertGrammar :: Env -> SGrammar
-convertGrammar gram = trace2 "GFCtoSimple - concrete language" (prt (snd gram)) $
-		      tracePrt "GFCtoSimple - simpleGFC rules" (prt . length) $
-		      [ convertAbsFun gram fun typing |
-			A.Mod (A.MTAbs modname) _ _ _ defs <- modules,
-			A.AbsDFun fun typing _ <- defs ]
+convertGrammar (g,i) = trace2 "GFCtoSimple - concrete language" (prt (snd gram)) $
+		        tracePrt "GFCtoSimple - simpleGFC rules" (prt . length) $
+		         [ convertAbsFun gram fun typing |
+			  A.Mod (A.MTAbs modname) _ _ _ defs <- modules,
+			  A.AbsDFun fun typing _ <- defs ]
     where A.Gr modules = grammar2canon (fst gram)
+          gram = (unSubelimCanon g,i)
 
 convertAbsFun :: Env -> I.Ident -> A.Exp -> SRule
 convertAbsFun gram fun typing = Rule abs cnc
-- 
cgit v1.2.3