From d9521d2f4c8fa0eb515beefbe07bab4d16b6a543 Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 7 Dec 2007 20:47:58 +0000 Subject: restructured some of the new GF format; modules now in place up to gfo generation --- src/GF/Devel/Grammar/GFtoSource.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/GF/Devel/Grammar/GFtoSource.hs') diff --git a/src/GF/Devel/Grammar/GFtoSource.hs b/src/GF/Devel/Grammar/GFtoSource.hs index 2866c0446..9ac65469a 100644 --- a/src/GF/Devel/Grammar/GFtoSource.hs +++ b/src/GF/Devel/Grammar/GFtoSource.hs @@ -9,11 +9,10 @@ module GF.Devel.Grammar.GFtoSource ( ) where -import GF.Devel.Grammar.Modules -import GF.Devel.Grammar.Judgements -import GF.Devel.Grammar.Terms +import GF.Devel.Grammar.Grammar +import GF.Devel.Grammar.Construct import GF.Devel.Grammar.Macros (contextOfType) -import qualified GF.Devel.Grammar.AbsGF as P +import qualified GF.Devel.Compile.AbsGF as P import GF.Infra.Ident import GF.Data.Operations @@ -43,7 +42,7 @@ trModule (i,mo) = P.MModule compl typ body where body = P.MBody (trExtends (mextends mo)) (mkOpens (map trOpen (mopens mo))) - (concatMap trAnyDef [(c,j) | (c,Left j) <- listJudgements mo] ++ + (concatMap trAnyDef [(c,j) | (c,j) <- listJudgements mo] ++ map trFlag (Map.assocs (mflags mo))) trExtends :: [(Ident,MInclude)] -> P.Extend @@ -89,6 +88,7 @@ trAnyDef (i,ju) = let JLin -> [P.DefLin [trDef i (Meta 0) (jdef ju)]] ---- ++ [P.DefPrintFun [P.DDef [mkName i] (trt pr)] | Yes pr <- [ppr]] + JLink -> [] {- ---- encoding of AnyInd without changing syntax. AR 20/9/2007 AnyInd s b -> -- cgit v1.2.3