From d7f81f9f5194966337d15b06c67929ba17b81284 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Thu, 22 May 2008 14:58:44 +0000 Subject: [PATCH] move GF.Devel.UseIO to GF.Infra.UseIO --- src-3.0/GF/Command/Importing.hs | 2 +- src-3.0/GF/Compile.hs | 9 +++++---- src-3.0/GF/Compile/GetGrammar.hs | 4 ++-- src-3.0/GF/Compile/ReadFiles.hs | 2 +- src-3.0/GF/GFCC/API.hs | 2 -- src-3.0/GF/{Devel => Infra}/UseIO.hs | 2 +- src-3.0/GFC.hs | 2 +- src-3.0/GFI.hs | 4 ++-- 8 files changed, 13 insertions(+), 14 deletions(-) rename src-3.0/GF/{Devel => Infra}/UseIO.hs (99%) diff --git a/src-3.0/GF/Command/Importing.hs b/src-3.0/GF/Command/Importing.hs index bca59048f..868ca02b6 100644 --- a/src-3.0/GF/Command/Importing.hs +++ b/src-3.0/GF/Command/Importing.hs @@ -4,7 +4,7 @@ import GF.Compile import GF.GFCC.DataGFCC import GF.GFCC.API -import GF.Devel.UseIO +import GF.Infra.UseIO import GF.Infra.Option import GF.Data.ErrM diff --git a/src-3.0/GF/Compile.hs b/src-3.0/GF/Compile.hs index 17220e3a7..8836273b3 100644 --- a/src-3.0/GF/Compile.hs +++ b/src-3.0/GF/Compile.hs @@ -10,23 +10,24 @@ import GF.Compile.Optimize import GF.Devel.OptimizeGF import GF.Compile.GrammarToGFCC import GF.Compile.ReadFiles +import GF.Compile.Update import GF.Grammar.Grammar import GF.Grammar.Refresh +import GF.Grammar.Lookup + import GF.Infra.Ident import GF.Infra.Option import GF.Infra.CompactPrint -import GF.Devel.PrGrammar -import GF.Compile.Update -import GF.Grammar.Lookup import GF.Infra.Modules +import GF.Infra.UseIO +import GF.Devel.PrGrammar import GF.Source.GrammarToSource import qualified GF.Source.AbsGF as A import qualified GF.Source.PrintGF as P import GF.Data.Operations -import GF.Devel.UseIO import Control.Monad import System.Directory diff --git a/src-3.0/GF/Compile/GetGrammar.hs b/src-3.0/GF/Compile/GetGrammar.hs index 7e15c8614..220e58665 100644 --- a/src-3.0/GF/Compile/GetGrammar.hs +++ b/src-3.0/GF/Compile/GetGrammar.hs @@ -17,9 +17,9 @@ module GF.Compile.GetGrammar where import GF.Data.Operations import qualified GF.Source.ErrM as E -import GF.Devel.UseIO -import GF.Grammar.Grammar +import GF.Infra.UseIO import GF.Infra.Modules +import GF.Grammar.Grammar import GF.Devel.PrGrammar import qualified GF.Source.AbsGF as A import GF.Source.SourceToGrammar diff --git a/src-3.0/GF/Compile/ReadFiles.hs b/src-3.0/GF/Compile/ReadFiles.hs index 7df587db3..2f485224c 100644 --- a/src-3.0/GF/Compile/ReadFiles.hs +++ b/src-3.0/GF/Compile/ReadFiles.hs @@ -22,9 +22,9 @@ module GF.Compile.ReadFiles ( getAllFiles,ModName,ModEnv,getOptionsFromFile,importsOfModule, gfoFile,gfFile,isGFO ) where +import GF.Infra.UseIO import GF.Infra.Option import GF.Data.Operations -import GF.Devel.UseIO import GF.Source.AbsGF hiding (FileName) import GF.Source.LexGF import GF.Source.ParGF diff --git a/src-3.0/GF/GFCC/API.hs b/src-3.0/GF/GFCC/API.hs index 7c5c6da77..af0f9c138 100644 --- a/src-3.0/GF/GFCC/API.hs +++ b/src-3.0/GF/GFCC/API.hs @@ -28,8 +28,6 @@ import GF.Data.ErrM import GF.Parsing.FCFG ---import GF.Data.Operations ---import GF.Infra.UseIO import qualified Data.Map as Map import System.Random (newStdGen) import System.Directory (doesFileExist) diff --git a/src-3.0/GF/Devel/UseIO.hs b/src-3.0/GF/Infra/UseIO.hs similarity index 99% rename from src-3.0/GF/Devel/UseIO.hs rename to src-3.0/GF/Infra/UseIO.hs index afbf00efd..95e4b428b 100644 --- a/src-3.0/GF/Devel/UseIO.hs +++ b/src-3.0/GF/Infra/UseIO.hs @@ -13,7 +13,7 @@ -- (Description of the module) ----------------------------------------------------------------------------- -module GF.Devel.UseIO where +module GF.Infra.UseIO where import GF.Data.Operations import GF.Infra.Option diff --git a/src-3.0/GFC.hs b/src-3.0/GFC.hs index 9273117b7..0fe0169d2 100644 --- a/src-3.0/GFC.hs +++ b/src-3.0/GFC.hs @@ -7,7 +7,7 @@ import GF.GFCC.CId import GF.GFCC.DataGFCC import GF.GFCC.Raw.ParGFCCRaw import GF.GFCC.Raw.ConvertGFCC -import GF.Devel.UseIO +import GF.Infra.UseIO import GF.Infra.Option import GF.GFCC.API import GF.Data.ErrM diff --git a/src-3.0/GFI.hs b/src-3.0/GFI.hs index 0efbd420e..b85d38a61 100644 --- a/src-3.0/GFI.hs +++ b/src-3.0/GFI.hs @@ -5,9 +5,9 @@ import GF.Command.Importing import GF.Command.Commands import GF.GFCC.API -import GF.Devel.UseIO -import GF.System.Readline (fetchCommand) +import GF.Infra.UseIO import GF.Infra.Option ---- Haskell's option lib +import GF.System.Readline (fetchCommand) import System.CPUTime