From 734c66710e9bffa986c094e8c584295b33cd2f63 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Wed, 2 Nov 2011 13:57:11 +0000 Subject: merge GF.Infra.Modules and GF.Grammar.Grammar. This is a preparation for the separate PGF building --- src/compiler/GF/Grammar/Binary.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/compiler/GF/Grammar/Binary.hs') diff --git a/src/compiler/GF/Grammar/Binary.hs b/src/compiler/GF/Grammar/Binary.hs index 7c79be361..2298ed018 100644 --- a/src/compiler/GF/Grammar/Binary.hs +++ b/src/compiler/GF/Grammar/Binary.hs @@ -16,7 +16,6 @@ import qualified Data.ByteString.Char8 as BS import GF.Data.Operations import GF.Infra.Ident import GF.Infra.Option -import GF.Infra.Modules import GF.Grammar.Grammar instance Binary Ident where @@ -26,12 +25,12 @@ instance Binary Ident where then return identW else return (identC bs) -instance Binary a => Binary (MGrammar a) where +instance Binary SourceGrammar where put = put . modules get = fmap mGrammar get -instance Binary a => Binary (ModInfo a) where - put mi = do put (mtype mi,mstatus mi,flags mi,extend mi,mwith mi,opens mi,mexdeps mi,msrc mi,jments mi) +instance Binary SourceModInfo where + put mi = do put (mtype mi,mstatus mi,mflags mi,mextend mi,mwith mi,mopens mi,mexdeps mi,msrc mi,jments mi) get = do (mtype,mstatus,flags,extend,mwith,opens,med,src,jments) <- get return (ModInfo mtype mstatus flags extend mwith opens med src jments) -- cgit v1.2.3