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/GFI.hs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/compiler/GFI.hs') diff --git a/src/compiler/GFI.hs b/src/compiler/GFI.hs index 7017c920e..5b807eb7a 100644 --- a/src/compiler/GFI.hs +++ b/src/compiler/GFI.hs @@ -21,7 +21,6 @@ import GF.Infra.Dependencies import GF.Infra.CheckM import GF.Infra.UseIO import GF.Infra.Option -import GF.Infra.Modules (greatestResource, modules, emptyModInfo, mGrammar) import GF.Infra.Ident (showIdent) import GF.Infra.BuildInfo (buildInfo) import qualified System.Console.Haskeline as Haskeline @@ -402,13 +401,12 @@ prompt env data GFEnv = GFEnv { sourcegrammar :: SourceGrammar, -- gfo grammar -retain commandenv :: CommandEnv, - history :: [String]--, ---cputime :: Integer + history :: [String] } emptyGFEnv :: GFEnv emptyGFEnv = - GFEnv (mGrammar [(identW,emptyModInfo)]) (mkCommandEnv emptyPGF) [] {-0-} + GFEnv emptySourceGrammar (mkCommandEnv emptyPGF) [] {-0-} wordCompletion gfenv (left,right) = do case wc_type (reverse left) of -- cgit v1.2.3