diff options
| author | aarne <unknown> | 2005-09-20 08:32:55 +0000 |
|---|---|---|
| committer | aarne <unknown> | 2005-09-20 08:32:55 +0000 |
| commit | 6d179267de8f988ab2ee52a5fef99b3b05576222 (patch) | |
| tree | a543ed396c364bd63987517b8ead00fb9d193213 /src/GF/Conversion | |
| parent | 263beccd56f5a6242ea97e696a9843cd0f597e16 (diff) | |
CSEE now works fine
Diffstat (limited to 'src/GF/Conversion')
| -rw-r--r-- | src/GF/Conversion/GFCtoSimple.hs | 18 |
1 files changed, 10 insertions, 8 deletions
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 |