Eliminate mutual dependencies between the GF compiler and the PGF library

+ References to modules under src/compiler have been eliminated from the PGF library (under src/runtime/haskell). Only two functions had to be moved (from GF.Data.Utilities to PGF.Utilities) to make this possible, other apparent dependencies turned out to be vacuous. + In gf.cabal, the GF executable no longer directly depends on the PGF library source directory, but only on the exposed library modules. This means that there is less duplication in gf.cabal and that the 30 modules in the PGF library will no longer be compiled twice while building GF. To make this possible, additional PGF library modules have been exposed, even though they should probably be considered for internal use only. They could be collected in a PGF.Internal module, or marked as "unstable", to make this explicit. + Also, by using the -fwarn-unused-imports flag, ~220 redundant imports were found and removed, reducing the total number of imports by ~15%.
2013-11-05 13:11:10 +00:00
parent 74357cdedf
commit 3814841d7d
97 changed files with 312 additions and 335 deletions
--- a/src/compiler/GF/Command/Abstract.hs
+++ b/src/compiler/GF/Command/Abstract.hs
@@ -1,7 +1,6 @@
 module GF.Command.Abstract where

-import PGF.CId(CId,mkCId)
-import PGF.Data(Expr)
+import PGF(CId,mkCId,Expr)

 type Ident = String

--- a/src/compiler/GF/Command/Commands.hs
+++ b/src/compiler/GF/Command/Commands.hs
@@ -14,13 +14,12 @@ import Prelude hiding (putStrLn)

 import PGF

-import PGF.VisualizeTree(getDepLabels)
 import PGF.Macros(lookStartCat,functionsToCat,lookValCat,restrictPGF,hasLin)
 import PGF.Data(abstract,funs,cats,Literal(LStr),Expr(EFun,ELit)) ----
-import PGF.Morphology(isInMorpho,morphoKnown)
+--import PGF.Morphology(isInMorpho,morphoKnown)
 import PGF.Printer(ppFun,ppCat)
-import PGF.Probabilistic(rankTreesByProbs,probTree,setProbabilities)
-import PGF.Generate (generateRandomFrom) ----
+--import PGF.Probabilistic(rankTreesByProbs,probTree,setProbabilities)
+--import PGF.Generate (generateRandomFrom) ----
 import PGF.Tree (Tree(Fun), expr2tree, tree2expr)
 import PGF.Optimize(optimizePGF)

@@ -30,7 +29,7 @@ import GF.Compile.ExampleBased
 import GF.Infra.Option (noOptions, readOutputFormat, outputFormatsExpl)
 import GF.Infra.UseIO(writeUTF8File)
 import GF.Infra.SIO
-import GF.Data.ErrM ----
+--import GF.Data.ErrM ----
 import GF.Command.Abstract
 import GF.Command.Messages
 import GF.Text.Lexing
@@ -43,13 +42,13 @@ import GF.Command.TreeOperations ---- temporary place for typecheck and compute
 import GF.Data.Operations

 import Data.Binary (encodeFile)
-import Data.List
+import Data.List(intersperse,nub)
 import Data.Maybe
 import qualified Data.Map as Map
 --import System.Cmd(system) -- use GF.Infra.UseIO.restricedSystem instead!
 import Text.PrettyPrint
 import Data.List (sort)
-import Debug.Trace
+--import Debug.Trace
 --import System.Random (newStdGen) ----


@@ -940,7 +939,7 @@ allCommands = Map.fromList [
         let outp = valStrOpts "output" "dot" opts
         mlab <- case file of
           "" -> return Nothing
-           _  -> restricted (readFile file) >>= return . Just . getDepLabels . lines
+           _  -> (Just . getDepLabels . lines) `fmap` restricted (readFile file)
         let lang = optLang pgf opts
         let grphs = unlines $ map (graphvizDependencyTree outp debug mlab Nothing pgf lang) es
         if isFlag "view" opts || isFlag "format" opts then do
--- a/src/compiler/GF/Command/Importing.hs
+++ b/src/compiler/GF/Command/Importing.hs
@@ -12,7 +12,7 @@ import GF.Infra.UseIO
 import GF.Infra.Option
 import GF.Data.ErrM

-import Data.List (nubBy)
+--import Data.List (nubBy)
 import System.FilePath

 -- import a grammar in an environment where it extends an existing grammar
--- a/src/compiler/GF/Command/Interpreter.hs
+++ b/src/compiler/GF/Command/Interpreter.hs
@@ -13,10 +13,8 @@ import GF.Command.Abstract
 import GF.Command.Parse
 import PGF
 import PGF.Data
-import PGF.Morphology
-import GF.System.Signal
+--import PGF.Morphology
 import GF.Infra.SIO
-import GF.Infra.Option

 import Text.PrettyPrint
 import Control.Monad(when)
--- a/src/compiler/GF/Command/Parse.hs
+++ b/src/compiler/GF/Command/Parse.hs
@@ -1,7 +1,6 @@
 module GF.Command.Parse(readCommandLine, pCommand) where

-import PGF.CId
-import PGF.Expr
+import PGF
 import GF.Command.Abstract

 import Data.Char
--- a/src/compiler/GF/Compile.hs
+++ b/src/compiler/GF/Compile.hs
@@ -17,7 +17,6 @@ import GF.Compile.Coding
 import GF.Compile.Tags

 import GF.Grammar.Grammar
-import GF.Grammar.Lookup
 import GF.Grammar.Printer
 import GF.Grammar.Binary

@@ -34,15 +33,10 @@ import System.FilePath
 import qualified Data.Map as Map
 --import qualified Data.Set as Set
 import Data.List(nub)
-import Data.Maybe (isNothing)
 import Text.PrettyPrint

-import PGF.CId
-import PGF.Data
-import PGF.Macros
 import PGF.Optimize
-import PGF.Probabilistic
-
+import PGF

 -- | Compiles a number of source files and builds a 'PGF' structure for them.
 compileToPGF :: Options -> [FilePath] -> IOE PGF
--- a/src/compiler/GF/Compile/CheckGrammar.hs
+++ b/src/compiler/GF/Compile/CheckGrammar.hs
@@ -33,8 +33,8 @@ import qualified GF.Compile.Compute.ConcreteNew as CN
 import GF.Grammar
 import GF.Grammar.Lexer
 import GF.Grammar.Lookup
-import GF.Grammar.Predef
-import GF.Grammar.PatternMatch
+--import GF.Grammar.Predef
+--import GF.Grammar.PatternMatch

 import GF.Data.Operations
 import GF.Infra.CheckM
--- a/src/compiler/GF/Compile/Coding.hs
+++ b/src/compiler/GF/Compile/Coding.hs
@@ -3,10 +3,10 @@ module GF.Compile.Coding where
 import GF.Grammar.Grammar
 import GF.Grammar.Macros
 import GF.Text.Coding
-import GF.Infra.Option
+--import GF.Infra.Option
 import GF.Data.Operations

-import Data.Char
+--import Data.Char
 import System.IO
 import qualified Data.ByteString.Char8 as BS

--- a/src/compiler/GF/Compile/Compute/AppPredefined.hs
+++ b/src/compiler/GF/Compile/Compute/AppPredefined.hs
@@ -16,7 +16,7 @@ module GF.Compile.Compute.AppPredefined (
          isInPredefined, typPredefined, arrityPredefined, predefModInfo, appPredefined
 		  ) where

-import GF.Infra.Ident(identS)
+--import GF.Infra.Ident(identS)
 import GF.Infra.Option
 import GF.Data.Operations
 import GF.Grammar
--- a/src/compiler/GF/Compile/Compute/ConcreteLazy.hs
+++ b/src/compiler/GF/Compile/Compute/ConcreteLazy.hs
@@ -17,9 +17,9 @@ module GF.Compile.Compute.ConcreteLazy (computeConcrete, computeTerm,checkPredef
 import GF.Data.Operations
 import GF.Grammar.Grammar
 import GF.Infra.Ident
-import GF.Infra.Option
+--import GF.Infra.Option
 import GF.Data.Str
-import GF.Grammar.ShowTerm
+--import GF.Grammar.ShowTerm
 import GF.Grammar.Printer
 import GF.Grammar.Predef
 import GF.Grammar.Macros
@@ -30,8 +30,8 @@ import GF.Grammar.Lockfield (isLockLabel,unlockRecord) ----

 import GF.Compile.Compute.AppPredefined

-import Data.List (nub,intersperse)
-import Control.Monad (liftM2, liftM)
+import Data.List (nub) --intersperse
+--import Control.Monad (liftM2, liftM)
 import Control.Monad.Identity
 import Text.PrettyPrint

--- a/src/compiler/GF/Compile/Compute/ConcreteNew.hs
+++ b/src/compiler/GF/Compile/Compute/ConcreteNew.hs
@@ -9,15 +9,15 @@ import GF.Grammar hiding (Env, VGen, VApp, VRecType)
 import GF.Grammar.Lookup(lookupResDefLoc,allParamValues)
 import GF.Grammar.Predef(cPredef,cErrorType,cTok,cStr)
 import GF.Grammar.PatternMatch(matchPattern,measurePatt)
-import GF.Grammar.Lockfield(unlockRecord,lockLabel,isLockLabel,lockRecType)
+import GF.Grammar.Lockfield(lockLabel,isLockLabel,lockRecType) --unlockRecord
 import GF.Compile.Compute.Value hiding (Error)
 import GF.Compile.Compute.Predef(predef,predefName,delta)
 import GF.Data.Str(Str,glueStr,str2strings,str,sstr,plusStr,strTok)
 import GF.Data.Operations(Err,err,errIn,maybeErr,combinations,mapPairsM)
-import GF.Data.Utilities(mapFst,mapSnd,mapBoth,apBoth,apSnd)
+import GF.Data.Utilities(mapFst,mapSnd,mapBoth)
 import Control.Monad(ap,liftM,liftM2,mplus,unless)
-import Data.List (findIndex,intersect,isInfixOf,nub,elemIndex,(\\))
-import Data.Char (isUpper,toUpper,toLower)
+import Data.List (findIndex,intersect,nub,elemIndex,(\\)) --,isInfixOf
+--import Data.Char (isUpper,toUpper,toLower)
 import Text.PrettyPrint
 import qualified Data.Map as Map
 --import Debug.Trace(trace)
--- a/src/compiler/GF/Compile/Compute/Predef.hs
+++ b/src/compiler/GF/Compile/Compute/Predef.hs
@@ -9,13 +9,13 @@ import Data.List (isInfixOf)
 import Data.Char (isUpper,toLower,toUpper)
 import Control.Monad(ap)

-import GF.Data.Utilities (mapSnd,apBoth)
+import GF.Data.Utilities (apBoth) --mapSnd

 import GF.Compile.Compute.Value
-import GF.Infra.Ident (Ident,varX,showIdent)
-import GF.Data.Operations(Err,err)
+import GF.Infra.Ident (Ident,showIdent) --,varX
+import GF.Data.Operations(Err) -- ,err
 import GF.Grammar.Predef
-import PGF.Data(BindType(..))
+--import PGF.Data(BindType(..))

 --------------------------------------------------------------------------------
 class Predef a where
--- a/src/compiler/GF/Compile/Compute/Value.hs
+++ b/src/compiler/GF/Compile/Compute/Value.hs
@@ -1,8 +1,8 @@
 module GF.Compile.Compute.Value where
-import GF.Grammar.Grammar(Label,Type,TInfo,MetaId,Patt,QIdent)
+import GF.Grammar.Grammar(Label,Type,MetaId,Patt,QIdent)
 import PGF.Data(BindType)
 import GF.Infra.Ident(Ident)
-import Text.Show.Functions
+import Text.Show.Functions()
 import Data.Ix(Ix)

 -- | Self-contained (not quite) representation of values
--- a/src/compiler/GF/Compile/ExampleBased.hs
+++ b/src/compiler/GF/Compile/ExampleBased.hs
@@ -4,9 +4,9 @@ module GF.Compile.ExampleBased (
  ) where

 import PGF
-import PGF.Probabilistic
-import PGF.Morphology
-import GF.Compile.ToAPI
+--import PGF.Probabilistic
+--import PGF.Morphology
+--import GF.Compile.ToAPI

 import Data.List

--- a/src/compiler/GF/Compile/Export.hs
+++ b/src/compiler/GF/Compile/Export.hs
@@ -1,14 +1,14 @@
 module GF.Compile.Export where

 import PGF
-import PGF.Printer
+import PGF.Printer(ppPGF)
 import GF.Compile.PGFtoHaskell
 import GF.Compile.PGFtoProlog
 import GF.Compile.PGFtoLProlog
 import GF.Compile.PGFtoJS
 import GF.Compile.PGFtoPython
 import GF.Infra.Option
-import GF.Speech.CFG
+--import GF.Speech.CFG
 import GF.Speech.PGFToCFG
 import GF.Speech.SRGS_ABNF
 import GF.Speech.SRGS_XML
--- a/src/compiler/GF/Compile/GeneratePMCFG.hs
+++ b/src/compiler/GF/Compile/GeneratePMCFG.hs
@@ -13,7 +13,7 @@ module GF.Compile.GeneratePMCFG
    (generatePMCFG, pgfCncCat, addPMCFG, resourceValues
    ) where

-import PGF.CId
+--import PGF.CId
 import PGF.Data(CncCat(..),Symbol(..),fidVar)

 import GF.Infra.Option
@@ -24,23 +24,23 @@ import GF.Grammar.Lockfield (isLockLabel)
 import GF.Data.BacktrackM
 import GF.Data.Operations
 import GF.Infra.UseIO (IOE)
-import GF.Data.Utilities (updateNthM, updateNth)
+import GF.Data.Utilities (updateNthM) --updateNth
 import GF.Compile.Compute.ConcreteNew(GlobalEnv,normalForm,resourceValues,ppL)
 import System.IO(hPutStr,hPutStrLn,stderr)
 import qualified Data.Map as Map
 import qualified Data.Set as Set
 import qualified Data.List as List
-import qualified Data.IntMap as IntMap
+--import qualified Data.IntMap as IntMap
 import qualified Data.IntSet as IntSet
 import Text.PrettyPrint hiding (Str)
 import Data.Array.IArray
 import Data.Array.Unboxed
-import Data.Maybe
-import Data.Char (isDigit)
+--import Data.Maybe
+--import Data.Char (isDigit)
 import Control.Monad
 import Control.Monad.Identity
 import Control.Monad.Trans (liftIO)
-import Control.Exception
+--import Control.Exception

 ----------------------------------------------------------------------
 -- main conversion function
--- a/src/compiler/GF/Compile/GetGrammar.hs
+++ b/src/compiler/GF/Compile/GetGrammar.hs
@@ -25,9 +25,9 @@ import GF.Grammar.Lexer
 import GF.Grammar.Parser
 import GF.Grammar.Grammar

-import GF.Compile.ReadFiles
+--import GF.Compile.ReadFiles

-import Data.Char (toUpper)
+--import Data.Char (toUpper)
 import qualified Data.ByteString.Char8 as BS
 import Control.Monad (foldM)
 import System.Cmd (system)
--- a/src/compiler/GF/Compile/GrammarToPGF.hs
+++ b/src/compiler/GF/Compile/GrammarToPGF.hs
@@ -1,24 +1,23 @@
 {-# LANGUAGE BangPatterns #-}
 module GF.Compile.GrammarToPGF (mkCanon2pgf) where

-import GF.Compile.Export
+--import GF.Compile.Export
 import GF.Compile.GeneratePMCFG
 import GF.Compile.GenerateBC

-import PGF.CId
+import PGF(CId,mkCId,bsCId)
 import PGF.Data(fidInt,fidFloat,fidString,fidVar)
 import PGF.Optimize(updateProductionIndices)
-import qualified PGF.Macros as CM
+--import qualified PGF.Macros as CM
 import qualified PGF.Data as C
 import qualified PGF.Data as D
 import GF.Grammar.Predef
-import GF.Grammar.Printer
+--import GF.Grammar.Printer
 import GF.Grammar.Grammar
 import qualified GF.Grammar.Lookup as Look
 import qualified GF.Grammar as A
 import qualified GF.Grammar.Macros as GM
-import qualified GF.Infra.Option as O
-import GF.Compile.GeneratePMCFG
+--import GF.Compile.GeneratePMCFG

 import GF.Infra.Ident
 import GF.Infra.Option
@@ -26,13 +25,13 @@ import GF.Infra.UseIO (IOE)
 import GF.Data.Operations

 import Data.List
-import Data.Char (isDigit,isSpace)
+--import Data.Char (isDigit,isSpace)
 import qualified Data.Set as Set
 import qualified Data.Map as Map
 import qualified Data.IntMap as IntMap
 import Data.Array.IArray
-import Text.PrettyPrint
-import Control.Monad.Identity
+--import Text.PrettyPrint
+--import Control.Monad.Identity

 mkCanon2pgf :: Options -> SourceGrammar -> Ident -> IOE D.PGF
 mkCanon2pgf opts gr am = do
@@ -104,7 +103,7 @@ mkCanon2pgf opts gr am = do
          return (seqs, ((m,id), info) : is)

 i2i :: Ident -> CId
-i2i = CId . ident2bs
+i2i = bsCId . ident2bs

 mkType :: [Ident] -> A.Type -> C.Type
 mkType scope t =
--- a/src/compiler/GF/Compile/Instructions.hs
+++ b/src/compiler/GF/Compile/Instructions.hs
@@ -1,12 +1,13 @@
 module GF.Compile.Instructions where

-import Data.IORef
+--import Data.IORef
 import Data.Binary
 import Data.Binary.Put
 import Data.Binary.Get
 import Data.Binary.IEEE754
-import PGF.CId
-import PGF.Binary
+import PGF(CId)
+--import PGF.CId
+--import PGF.Binary

 type IntRef = Int
 type AConstant = CId
--- a/src/compiler/GF/Compile/Optimize.hs
+++ b/src/compiler/GF/Compile/Optimize.hs
@@ -23,15 +23,15 @@ import GF.Grammar.Lookup
 import GF.Grammar.Predef
 --import GF.Compile.Refresh
 import GF.Compile.Compute.Concrete
-import GF.Compile.CheckGrammar
-import GF.Compile.Update
+--import GF.Compile.CheckGrammar
+--import GF.Compile.Update

 import GF.Data.Operations
-import GF.Infra.CheckM
+--import GF.Infra.CheckM
 import GF.Infra.Option

 import Control.Monad
-import Data.List
+--import Data.List
 import qualified Data.Set as Set
 import Text.PrettyPrint
 import Debug.Trace
--- a/src/compiler/GF/Compile/PGFtoHaskell.hs
+++ b/src/compiler/GF/Compile/PGFtoHaskell.hs
@@ -16,7 +16,7 @@

 module GF.Compile.PGFtoHaskell (grammar2haskell) where

-import PGF.CId
+import PGF(showCId)
 import PGF.Data
 import PGF.Macros

--- a/src/compiler/GF/Compile/PGFtoJS.hs
+++ b/src/compiler/GF/Compile/PGFtoJS.hs
@@ -1,18 +1,18 @@
 module GF.Compile.PGFtoJS (pgf2js) where

-import PGF.CId
+import PGF(showCId)
 import PGF.Data hiding (mkStr)
 import qualified PGF.Macros as M
 import qualified GF.JavaScript.AbsJS as JS
 import qualified GF.JavaScript.PrintJS as JS

-import GF.Data.ErrM
-import GF.Infra.Option
+--import GF.Data.ErrM
+--import GF.Infra.Option

-import Control.Monad (mplus)
-import Data.Array.Unboxed (UArray)
+--import Control.Monad (mplus)
+--import Data.Array.Unboxed (UArray)
 import qualified Data.Array.IArray as Array
-import Data.Maybe (fromMaybe)
+--import Data.Maybe (fromMaybe)
 import Data.Map (Map)
 import qualified Data.Set as Set
 import qualified Data.Map as Map
--- a/src/compiler/GF/Compile/PGFtoLProlog.hs
+++ b/src/compiler/GF/Compile/PGFtoLProlog.hs
@@ -1,13 +1,13 @@
 module GF.Compile.PGFtoLProlog(grammar2lambdaprolog_mod, grammar2lambdaprolog_sig) where

-import PGF.CId
+import PGF(mkCId,ppCId,showCId,wildCId)
 import PGF.Data hiding (ppExpr, ppType, ppHypo)
-import PGF.Macros
+--import PGF.Macros
 import Data.List
 import Data.Maybe
 import Text.PrettyPrint
 import qualified Data.Map as Map
-import Debug.Trace
+--import Debug.Trace

 grammar2lambdaprolog_mod pgf = render $
  text "module" <+> ppCId (absname pgf) <> char '.' $$
--- a/src/compiler/GF/Compile/PGFtoProlog.hs
+++ b/src/compiler/GF/Compile/PGFtoProlog.hs
@@ -8,9 +8,9 @@

 module GF.Compile.PGFtoProlog (grammar2prolog) where

-import PGF.CId
+import PGF(mkCId,wildCId,showCId)
 import PGF.Data
-import PGF.Macros
+--import PGF.Macros

 import GF.Data.Operations

--- a/src/compiler/GF/Compile/PGFtoPython.hs
+++ b/src/compiler/GF/Compile/PGFtoPython.hs
@@ -8,7 +8,7 @@

 module GF.Compile.PGFtoPython (pgf2python) where

-import PGF.CId
+import PGF(showCId)
 import PGF.Data
 import qualified PGF.Macros as M

@@ -18,7 +18,7 @@ import qualified Data.Array.IArray as Array
 import qualified Data.Set as Set
 import qualified Data.Map as Map
 import qualified Data.IntMap as IntMap
-import Data.List (intersperse)
+--import Data.List (intersperse)

 pgf2python :: PGF -> String
 pgf2python pgf = ("# -*- coding: utf-8 -*-" ++++
--- a/src/compiler/GF/Compile/ReadFiles.hs
+++ b/src/compiler/GF/Compile/ReadFiles.hs
@@ -35,8 +35,8 @@ import GF.Grammar.Grammar
 import GF.Grammar.Binary

 import Control.Monad
-import Data.Char
-import Data.List
+--import Data.Char
+--import Data.List
 import Data.Maybe(isJust)
 import qualified Data.ByteString.Char8 as BS
 import qualified Data.Map as Map
--- a/src/compiler/GF/Compile/Rename.hs
+++ b/src/compiler/GF/Compile/Rename.hs
@@ -34,8 +34,8 @@ import GF.Infra.Ident
 import GF.Infra.CheckM
 import GF.Grammar.Macros
 import GF.Grammar.Printer
-import GF.Grammar.Lookup
-import GF.Grammar.Printer
+--import GF.Grammar.Lookup
+--import GF.Grammar.Printer
 import GF.Data.Operations

 import Control.Monad
--- a/src/compiler/GF/Compile/Tags.hs
+++ b/src/compiler/GF/Compile/Tags.hs
@@ -8,10 +8,10 @@ import GF.Infra.UseIO
 import GF.Data.Operations
 import GF.Grammar

-import Data.List
+--import Data.List
 import qualified Data.Map as Map
 import qualified Data.Set as Set
-import Control.Monad
+--import Control.Monad
 import Text.PrettyPrint
 import System.FilePath

--- a/src/compiler/GF/Compile/ToAPI.hs
+++ b/src/compiler/GF/Compile/ToAPI.hs
@@ -2,14 +2,14 @@ module GF.Compile.ToAPI
 (stringToAPI,exprToAPI)
  where

-import PGF.Expr
-import PGF.CId
+import PGF.Data
+import PGF(showCId)
 import Data.Maybe
-import System.IO
-import Control.Monad
-import Data.Set as Set (fromList,toList)
+--import System.IO
+--import Control.Monad
+--import Data.Set as Set (fromList,toList)
 import Data.List
-import Data.Map(Map)
+--import Data.Map(Map)
 import qualified Data.Map as Map
 import PGF.Signature

--- a/src/compiler/GF/Compile/TypeCheck/Abstract.hs
+++ b/src/compiler/GF/Compile/TypeCheck/Abstract.hs
@@ -26,11 +26,11 @@ import GF.Grammar
 import GF.Grammar.Lookup
 import GF.Grammar.Unify
 --import GF.Compile.Refresh
-import GF.Compile.Compute.Abstract
+--import GF.Compile.Compute.Abstract
 import GF.Compile.TypeCheck.TC

 import Text.PrettyPrint
-import Control.Monad (foldM, liftM, liftM2)
+--import Control.Monad (foldM, liftM, liftM2)

 -- | invariant way of creating TCEnv from context
 initTCEnv gamma = 
--- a/src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs
+++ b/src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs
@@ -7,16 +7,16 @@ import GF.Grammar.Lockfield
 import GF.Compile.Compute.ConcreteNew1
 import GF.Compile.Compute.AppPredefined
 import GF.Infra.CheckM
-import GF.Infra.UseIO
+--import GF.Infra.UseIO
 import GF.Data.Operations

 import Text.PrettyPrint
 import Data.List (nub, (\\), tails)
 import qualified Data.IntMap as IntMap

-import GF.Grammar.Parser
-import System.IO
-import Debug.Trace
+--import GF.Grammar.Parser
+--import System.IO
+--import Debug.Trace

 checkLType :: SourceGrammar -> Term -> Type -> Check (Term, Type)
 checkLType gr t ty = runTcM $ do
--- a/src/compiler/GF/Compile/TypeCheck/TC.hs
+++ b/src/compiler/GF/Compile/TypeCheck/TC.hs
@@ -26,7 +26,7 @@ import GF.Grammar
 import GF.Grammar.Predef

 import Control.Monad
-import Data.List (sortBy)
+--import Data.List (sortBy)
 import Data.Maybe
 import Text.PrettyPrint

--- a/src/compiler/GF/Data/Graph.hs
+++ b/src/compiler/GF/Data/Graph.hs
@@ -24,7 +24,7 @@ module GF.Data.Graph ( Graph(..), Node, Edge, NodeInfo
                        , reverseGraph, mergeGraphs, renameNodes
                       ) where

-import GF.Data.Utilities
+--import GF.Data.Utilities

 import Data.List
 import Data.Maybe
--- a/src/compiler/GF/Data/Operations.hs
+++ b/src/compiler/GF/Data/Operations.hs
@@ -60,10 +60,10 @@ module GF.Data.Operations (-- * misc functions
 		  ) where

 import Data.Char (isSpace, toUpper, isSpace, isDigit)
-import Data.List (nub, sortBy, sort, deleteBy, nubBy, partition, (\\))
+import Data.List (nub, partition, (\\))
 import qualified Data.Map as Map
 import Data.Map (Map)
-import Control.Monad (liftM,liftM2, MonadPlus, mzero, mplus)
+import Control.Monad (liftM,liftM2)

 import GF.Data.ErrM
 import GF.Data.Relation
--- a/src/compiler/GF/Data/Relation.hs
+++ b/src/compiler/GF/Data/Relation.hs
@@ -26,7 +26,7 @@ module GF.Data.Relation (Rel, mkRel, mkRel'
                           , topologicalSort, findCycles) where

 import Data.Foldable (toList)
-import Data.List
+--import Data.List
 import Data.Maybe
 import Data.Map (Map)
 import qualified Data.Map as Map
--- a/src/compiler/GF/Data/TrieMap.hs
+++ b/src/compiler/GF/Data/TrieMap.hs
@@ -1,99 +0,0 @@
-module GF.Data.TrieMap
-         ( TrieMap
-
-         , empty
-         , singleton
-
-         , lookup
-         
-         , null
-         , compose
-         , decompose
-         
-         , insertWith
-
-         , union,  unionWith
-         , unions, unionsWith
-         
-         , elems
-         , toList
-         , fromList, fromListWith
-
-         , map
-         , mapWithKey
-         ) where
-
-import Prelude hiding (lookup, null, map)
-import qualified Data.Map as Map
-import Data.List (foldl')
-
-data TrieMap k v = Tr (Maybe v) (Map.Map k (TrieMap k v))
-
-empty = Tr Nothing Map.empty
-
-singleton :: [k] -> a -> TrieMap k a
-singleton []     v = Tr (Just v) Map.empty
-singleton (k:ks) v = Tr Nothing  (Map.singleton k (singleton ks v))
-
-lookup :: Ord k => [k] -> TrieMap k a -> Maybe a
-lookup []     (Tr mb_v m) = mb_v
-lookup (k:ks) (Tr mb_v m) = Map.lookup k m >>= lookup ks
-
-null :: TrieMap k v -> Bool
-null (Tr Nothing m) = Map.null m
-null _              = False
-
-compose :: Maybe v -> Map.Map k (TrieMap k v) -> TrieMap k v
-compose mb_v m = Tr mb_v m
-
-decompose :: TrieMap k v -> (Maybe v, Map.Map k (TrieMap k v))
-decompose (Tr mb_v m) = (mb_v,m)
-
-insertWith :: Ord k => (v -> v -> v) -> [k] -> v -> TrieMap k v -> TrieMap k v
-insertWith f []     v0 (Tr mb_v m) = case mb_v of
-                                       Just  v -> Tr (Just (f v0 v)) m
-                                       Nothing -> Tr (Just v0      ) m
-insertWith f (k:ks) v0 (Tr mb_v m) = case Map.lookup k m of
-                                       Nothing -> Tr mb_v (Map.insert k (singleton ks v0) m)
-                                       Just tr -> Tr mb_v (Map.insert k (insertWith f ks v0 tr) m)
-
-union :: Ord k => TrieMap k v -> TrieMap k v -> TrieMap k v
-union = unionWith (\a b -> a)
-
-unionWith :: Ord k => (v -> v -> v) -> TrieMap k v -> TrieMap k v -> TrieMap k v
-unionWith f (Tr mb_v1 m1) (Tr mb_v2 m2) =
-  let mb_v = case (mb_v1,mb_v2) of
-               (Nothing,Nothing) -> Nothing
-               (Just v ,Nothing) -> Just v
-               (Nothing,Just v ) -> Just v
-               (Just v1,Just v2) -> Just (f v1 v2)
-      m    = Map.unionWith (unionWith f) m1 m2
-  in Tr mb_v m
-
-unions :: Ord k => [TrieMap k v] -> TrieMap k v
-unions = foldl union empty
-
-unionsWith :: Ord k => (v -> v -> v) -> [TrieMap k v] -> TrieMap k v
-unionsWith f = foldl (unionWith f) empty
-
-elems :: TrieMap k v -> [v]
-elems tr = collect tr []
-  where
-    collect (Tr mb_v m) xs = maybe id (:) mb_v (Map.fold collect xs m)
-
-toList :: TrieMap k v -> [([k],v)]
-toList tr = collect [] tr []
-  where
-    collect ks (Tr mb_v m) xs = maybe id (\v -> (:) (ks,v)) mb_v (Map.foldWithKey (\k -> collect (k:ks)) xs m)
-
-fromListWith :: Ord k => (v -> v -> v) -> [([k],v)] -> TrieMap k v
-fromListWith f xs = foldl' (\trie (ks,v) -> insertWith f ks v trie) empty xs
-
-fromList :: Ord k => [([k],v)] -> TrieMap k v
-fromList xs = fromListWith const xs
-
-map :: (a -> b) -> TrieMap k a -> TrieMap k b
-map f (Tr mb_v m) = Tr (fmap f mb_v) (Map.map (map f) m)
-
-mapWithKey :: ([k] -> a -> b) -> TrieMap k a -> TrieMap k b
-mapWithKey f (Tr mb_v m) = Tr (fmap (f []) mb_v) (Map.mapWithKey (\k -> mapWithKey (f . (k:))) m)
--- a/src/compiler/GF/Data/Utilities.hs
+++ b/src/compiler/GF/Data/Utilities.hs
@@ -12,12 +12,12 @@
 -----------------------------------------------------------------------------


-module GF.Data.Utilities where
+module GF.Data.Utilities(module GF.Data.Utilities, module PGF.Utilities) where

 import Data.Maybe
 import Data.List
 import Control.Monad (MonadPlus(..),liftM)
-import qualified Data.Set as Set
+import PGF.Utilities

 -- * functions on lists

@@ -68,17 +68,6 @@ safeInit :: [a] -> [a]
 safeInit [] = []
 safeInit xs = init xs

-- | Like 'nub', but O(n log n) instead of O(n^2), since it uses a set to lookup previous things.
--   The result list is stable (the elements are returned in the order they occur), and lazy.
--   Requires that the list elements can be compared by Ord.
--   Code ruthlessly taken from http://hpaste.org/54411
-nub' :: Ord a => [a] -> [a]
-nub' = loop Set.empty
-    where loop _    []            = []
-          loop seen (x : xs)
-              | Set.member x seen = loop seen xs
-              | otherwise         = x : loop (Set.insert x seen) xs
-
 -- | Sorts and then groups elements given an ordering of the 
 --   elements.
 sortGroupBy :: (a -> a -> Ordering) -> [a] -> [[a]]
@@ -108,10 +97,6 @@ buildMultiMap :: Ord a => [(a,b)] -> [(a,[b])]
 buildMultiMap = map (\g -> (fst (head g), map snd g) )
                 . sortGroupBy (compareBy fst)

-- | Replace all occurences of an element by another element.
-replace :: Eq a => a -> a -> [a] -> [a]
-replace x y = map (\z -> if z == x then y else z)
-
 -- * equality functions

 -- | Use an ordering function as an equality predicate.
--- a/src/compiler/GF/Grammar/Analyse.hs
+++ b/src/compiler/GF/Grammar/Analyse.hs
@@ -10,7 +10,7 @@ module GF.Grammar.Analyse (

 import GF.Grammar.Grammar
 import GF.Infra.Ident
-import GF.Infra.Option ---
+--import GF.Infra.Option ---
 import GF.Grammar.Macros
 import GF.Grammar.Lookup

@@ -18,7 +18,7 @@ import GF.Data.Operations

 import qualified Data.Map as Map
 import Data.List (nub)
-import Debug.Trace
+--import Debug.Trace

 stripSourceGrammar :: SourceGrammar -> SourceGrammar
 stripSourceGrammar sgr = mGrammar [(i, m{jments = Map.map stripInfo (jments m)}) | (i,m) <- modules sgr]
--- a/src/compiler/GF/Grammar/Binary.hs
+++ b/src/compiler/GF/Grammar/Binary.hs
@@ -12,9 +12,9 @@ module GF.Grammar.Binary(decodeModule,decodeModuleHeader,encodeModule) where
 import Prelude hiding (catch)
 import Control.Exception(catch,ErrorCall(..),throwIO)

-import Data.Char
+--import Data.Char
 import Data.Binary
-import Control.Monad
+--import Control.Monad
 import qualified Data.Map as Map
 import qualified Data.ByteString.Char8 as BS

@@ -23,7 +23,7 @@ import GF.Infra.Ident
 import GF.Infra.Option
 import GF.Grammar.Grammar

-import PGF.Binary
+import PGF() -- Binary instances

 -- Please change this every time when the GFO format is changed
 gfoVersion = "GF02"
@@ -346,3 +346,5 @@ decodeFile' fpath = addFPath fpath (decodeFile fpath)
 addFPath fpath m = m `catch` handle
  where
    handle (ErrorCall msg) = throwIO (ErrorCall (fpath++": "++msg))
+
+decodingError = fail "This file was compiled with different version of GF"
--- a/src/compiler/GF/Grammar/CF.hs
+++ b/src/compiler/GF/Grammar/CF.hs
@@ -25,7 +25,7 @@ import GF.Data.Utilities (nub')

 import Data.Char
 import Data.List
-import System.FilePath
+--import System.FilePath

 getCF :: FilePath -> String -> Err SourceGrammar
 getCF fpath = fmap (cf2gf fpath) . pCF
--- a/src/compiler/GF/Grammar/EBNF.hs
+++ b/src/compiler/GF/Grammar/EBNF.hs
@@ -24,7 +24,7 @@ import GF.Grammar.Grammar

 import Data.Char
 import Data.List
-import System.FilePath
+--import System.FilePath



--- a/src/compiler/GF/Grammar/Grammar.hs
+++ b/src/compiler/GF/Grammar/Grammar.hs
@@ -68,15 +68,15 @@ import GF.Data.Operations

 import PGF.Data (FId, FunId, SeqId, LIndex, Sequence, BindType(..))

-import Data.List
+--import Data.List
 import Data.Array.IArray
 import Data.Array.Unboxed
 import qualified Data.Map as Map
-import qualified Data.Set as Set
-import qualified Data.IntMap as IntMap
+--import qualified Data.Set as Set
+--import qualified Data.IntMap as IntMap
 import Text.PrettyPrint
-import System.FilePath
-import Control.Monad.Identity
+--import System.FilePath
+--import Control.Monad.Identity



--- a/src/compiler/GF/Grammar/Lexer.hs
+++ b/src/compiler/GF/Grammar/Lexer.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE CPP,MagicHash,BangPatterns #-}
-{-# LINE 3 "lexer/Lexer.x" #-}
+-- {-# LINE 3 "lexer/Lexer.x" #-}

 module GF.Grammar.Lexer
         ( Token(..), Posn(..)
@@ -8,7 +8,7 @@ module GF.Grammar.Lexer
         ) where

 import GF.Infra.Ident
-import GF.Data.Operations
+--import GF.Data.Operations
 import qualified Data.ByteString.Char8 as BS
 import qualified Data.Map as Map

--- a/src/compiler/GF/Grammar/Lookup.hs
+++ b/src/compiler/GF/Grammar/Lookup.hs
@@ -40,8 +40,8 @@ import GF.Grammar.Predef
 import GF.Grammar.Lockfield

 import Data.List (sortBy)
-import Data.Maybe (maybe)
-import Control.Monad
+--import Data.Maybe (maybe)
+--import Control.Monad
 import Text.PrettyPrint
 import qualified Data.Map as Map

--- a/src/compiler/GF/Grammar/Macros.hs
+++ b/src/compiler/GF/Grammar/Macros.hs
@@ -22,14 +22,14 @@ import GF.Data.Operations
 import GF.Data.Str
 import GF.Infra.Ident
 import GF.Grammar.Grammar
-import GF.Grammar.Values
+--import GF.Grammar.Values
 import GF.Grammar.Predef
 import GF.Grammar.Printer

 import Control.Monad.Identity(Identity(..))
 import qualified Data.Traversable as T(mapM)
 import Control.Monad (liftM, liftM2, liftM3)
-import Data.Char (isDigit)
+--import Data.Char (isDigit)
 import Data.List (sortBy,nub)
 import Text.PrettyPrint

--- a/src/compiler/GF/Grammar/PatternMatch.hs
+++ b/src/compiler/GF/Grammar/PatternMatch.hs
@@ -24,10 +24,10 @@ import GF.Infra.Ident
 import GF.Grammar.Macros
 import GF.Grammar.Printer

-import Data.List
+--import Data.List
 import Control.Monad
 import Text.PrettyPrint
-import Debug.Trace
+--import Debug.Trace

 matchPattern :: [(Patt,rhs)] -> Term -> Err (rhs, Substitution)
 matchPattern pts term = 
--- a/src/compiler/GF/Grammar/Printer.hs
+++ b/src/compiler/GF/Grammar/Printer.hs
@@ -29,15 +29,15 @@ import GF.Infra.Option
 import GF.Grammar.Values
 import GF.Grammar.Grammar

-import PGF.Expr (ppMeta)
+import PGF.Data (ppMeta)
 import PGF.Printer (ppFId, ppFunId, ppSeqId, ppSeq)

 import Text.PrettyPrint
-import Data.Maybe (maybe, isNothing)
+import Data.Maybe (isNothing)
 import Data.List  (intersperse)
 import qualified Data.Map as Map
-import qualified Data.IntMap as IntMap
-import qualified Data.Set as Set
+--import qualified Data.IntMap as IntMap
+--import qualified Data.Set as Set
 import qualified Data.Array.IArray as Array

 data TermPrintQual 
--- a/src/compiler/GF/Grammar/Values.hs
+++ b/src/compiler/GF/Grammar/Values.hs
@@ -24,7 +24,7 @@ module GF.Grammar.Values (-- * values used in TC type checking
 --Z tree2exp, loc2treeFocus
 	      ) where

-import GF.Data.Operations
+--import GF.Data.Operations
 ---Z import GF.Data.Zipper

 import GF.Infra.Ident
--- a/src/compiler/GF/Index.hs
+++ b/src/compiler/GF/Index.hs
@@ -9,13 +9,13 @@ module GF.Index (addIndex) where

 import PGF
 import PGF.Data
-import PGF.Binary
+--import PGF.Binary
 import Data.Binary
-import Data.ByteString.Lazy (readFile,length)
+import Data.ByteString.Lazy (length) -- readFile
 import qualified Data.Map as Map
 import Data.Map (toAscList)
 import Data.List (intercalate)
-import qualified Data.ByteString.Lazy as BS
+--import qualified Data.ByteString.Lazy as BS

 addIndex  :: PGF -> PGF
 addIndex pgf = pgf {gflags = flags}  
--- a/src/compiler/GF/Infra/CheckM.hs
+++ b/src/compiler/GF/Infra/CheckM.hs
@@ -20,9 +20,9 @@ module GF.Infra.CheckM
 	  ) where

 import GF.Data.Operations
-import GF.Infra.Ident
+--import GF.Infra.Ident
 --import GF.Grammar.Grammar(Context)
-import GF.Grammar.Printer
+--import GF.Grammar.Printer

 import qualified Data.Map as Map
 import Text.PrettyPrint
--- a/src/compiler/GF/Infra/GetOpt.hs
+++ b/src/compiler/GF/Infra/GetOpt.hs
@@ -69,7 +69,7 @@ module GF.Infra.GetOpt (

 import Prelude -- necessary to get dependencies right

-import Data.List ( isPrefixOf, find )
+--import Data.List ( isPrefixOf, find )

 -- |What to do with options following non-options
 data ArgOrder a
--- a/src/compiler/GF/Infra/Option.hs
+++ b/src/compiler/GF/Infra/Option.hs
@@ -36,7 +36,7 @@ import GF.Infra.GetOpt
 import GF.Grammar.Predef
 --import System.Console.GetOpt
 import System.FilePath
-import System.IO
+--import System.IO

 import GF.Data.ErrM

--- a/src/compiler/GF/Infra/SIO.hs
+++ b/src/compiler/GF/Infra/SIO.hs
@@ -20,7 +20,7 @@ module GF.Infra.SIO(
  ) where
 import Prelude hiding (putStrLn,print)
 import Control.Monad(liftM)
-import System.IO(Handle,hPutStrLn,hFlush,stdout)
+import System.IO(hPutStrLn,hFlush,stdout)
 import GF.System.Catch(try)
 import System.Cmd(system)
 import System.Environment(getEnv)
--- a/src/compiler/GF/Infra/UseIO.hs
+++ b/src/compiler/GF/Infra/UseIO.hs
@@ -29,7 +29,7 @@ import System.IO.Error(isUserError,ioeGetErrorString)
 import System.Environment
 import System.Exit
 import System.CPUTime
-import System.Cmd
+--import System.Cmd
 import Text.Printf
 import Control.Monad
 import Control.Monad.Trans(MonadIO(..))
--- a/src/compiler/GF/Quiz.hs
+++ b/src/compiler/GF/Quiz.hs
@@ -19,11 +19,11 @@ module GF.Quiz (
  ) where

 import PGF
-import PGF.Linearize
+--import PGF.Linearize
 import GF.Data.Operations
-import GF.Infra.UseIO
-import GF.Infra.Option
-import PGF.Probabilistic
+--import GF.Infra.UseIO
+--import GF.Infra.Option
+--import PGF.Probabilistic

 import System.Random
 import Data.List (nub)
--- a/src/compiler/GF/Speech/CFG.hs
+++ b/src/compiler/GF/Speech/CFG.hs
@@ -8,16 +8,16 @@ module GF.Speech.CFG where

 import GF.Data.Utilities
 import PGF
-import GF.Infra.Option
+--import GF.Infra.Option
 import GF.Data.Relation

-import Control.Monad
-import Control.Monad.State (State, get, put, evalState)
+--import Control.Monad
+--import Control.Monad.State (State, get, put, evalState)
 import Data.Map (Map)
 import qualified Data.Map as Map
 import Data.List
-import Data.Maybe (fromMaybe)
-import Data.Monoid (mconcat)
+--import Data.Maybe (fromMaybe)
+--import Data.Monoid (mconcat)
 import Data.Set (Set)
 import qualified Data.Set as Set

--- a/src/compiler/GF/Speech/CFGToFA.hs
+++ b/src/compiler/GF/Speech/CFGToFA.hs
@@ -14,17 +14,17 @@ import qualified Data.Map as Map
 import Data.Set (Set)
 import qualified Data.Set as Set

-import PGF.CId
+--import PGF.CId
 import PGF.Data
 import GF.Data.Utilities
 import GF.Speech.CFG
-import GF.Speech.PGFToCFG
-import GF.Infra.Ident (Ident)
+--import GF.Speech.PGFToCFG
+--import GF.Infra.Ident (Ident)

 import GF.Data.Graph
-import GF.Data.Relation
+--import GF.Data.Relation
 import GF.Speech.FiniteState
-import GF.Speech.CFG
+--import GF.Speech.CFG

 data Recursivity = RightR | LeftR | NotR

--- a/src/compiler/GF/Speech/FiniteState.hs
+++ b/src/compiler/GF/Speech/FiniteState.hs
@@ -41,7 +41,7 @@ import qualified Data.Map as Map
 import Data.Set (Set)
 import qualified Data.Set as Set

-import GF.Data.Utilities
+--import GF.Data.Utilities
 import GF.Data.Graph
 import qualified GF.Data.Graphviz as Dot

--- a/src/compiler/GF/Speech/GSL.hs
+++ b/src/compiler/GF/Speech/GSL.hs
@@ -8,12 +8,12 @@

 module GF.Speech.GSL (gslPrinter) where

-import GF.Data.Utilities
+--import GF.Data.Utilities
 import GF.Speech.CFG
 import GF.Speech.SRG
 import GF.Speech.RegExp
 import GF.Infra.Option
-import GF.Infra.Ident
+--import GF.Infra.Ident
 import PGF

 import Data.Char (toUpper,toLower)
--- a/src/compiler/GF/Speech/JSGF.hs
+++ b/src/compiler/GF/Speech/JSGF.hs
@@ -12,20 +12,20 @@

 module GF.Speech.JSGF (jsgfPrinter) where

-import GF.Data.Utilities
+--import GF.Data.Utilities
 import GF.Infra.Option
 import GF.Speech.CFG
 import GF.Speech.RegExp
 import GF.Speech.SISR
 import GF.Speech.SRG
-import PGF.CId
+--import PGF.CId
 import PGF.Data

 import Data.Char
 import Data.List
-import Data.Maybe
+--import Data.Maybe
 import Text.PrettyPrint.HughesPJ
-import Debug.Trace
+--import Debug.Trace

 width :: Int
 width = 75
--- a/src/compiler/GF/Speech/PGFToCFG.hs
+++ b/src/compiler/GF/Speech/PGFToCFG.hs
@@ -6,18 +6,18 @@
 ----------------------------------------------------------------------
 module GF.Speech.PGFToCFG (bnfPrinter, pgfToCFG) where

-import PGF.CId
+import PGF(showCId)
 import PGF.Data as PGF
 import PGF.Macros
-import GF.Infra.Ident
+--import GF.Infra.Ident
 import GF.Speech.CFG hiding (Symbol)

 import Data.Array.IArray as Array
-import Data.List
+--import Data.List
 import Data.Map (Map)
 import qualified Data.Map as Map
 import qualified Data.IntMap as IntMap
-import Data.Maybe
+--import Data.Maybe
 import Data.Set (Set)
 import qualified Data.Set as Set

--- a/src/compiler/GF/Speech/SISR.hs
+++ b/src/compiler/GF/Speech/SISR.hs
@@ -10,12 +10,12 @@ module GF.Speech.SISR (SISRFormat(..), SISRTag, prSISR,

 import Data.List

-import GF.Data.Utilities
-import GF.Infra.Ident
+--import GF.Data.Utilities
+--import GF.Infra.Ident
 import GF.Infra.Option (SISRFormat(..))
 import GF.Speech.CFG
 import GF.Speech.SRG (SRGNT)
-import PGF.CId
+import PGF(showCId)

 import qualified GF.JavaScript.AbsJS   as JS
 import qualified GF.JavaScript.PrintJS as JS
--- a/src/compiler/GF/Speech/SLF.hs
+++ b/src/compiler/GF/Speech/SLF.hs
@@ -15,17 +15,17 @@ module GF.Speech.SLF (slfPrinter,slfGraphvizPrinter,
 import GF.Data.Utilities
 import GF.Speech.CFG
 import GF.Speech.FiniteState
-import GF.Speech.CFG
+--import GF.Speech.CFG
 import GF.Speech.CFGToFA
 import GF.Speech.PGFToCFG
 import qualified GF.Data.Graphviz as Dot
 import PGF
-import PGF.CId
+--import PGF.CId

 import Control.Monad
 import qualified Control.Monad.State as STM
 import Data.Char (toUpper)
-import Data.List
+--import Data.List
 import Data.Maybe

 data SLFs = SLFs [(String,SLF)] SLF
--- a/src/compiler/GF/Speech/SRG.hs
+++ b/src/compiler/GF/Speech/SRG.hs
@@ -17,21 +17,21 @@ module GF.Speech.SRG (SRG(..), SRGRule(..), SRGAlt(..), SRGItem, SRGSymbol
                     , lookupFM_
                     ) where

-import GF.Data.Operations
+--import GF.Data.Operations
 import GF.Data.Utilities
-import GF.Infra.Ident
+--import GF.Infra.Ident
 import GF.Infra.Option
 import GF.Speech.CFG
 import GF.Speech.PGFToCFG
-import GF.Data.Relation
-import GF.Speech.FiniteState
+--import GF.Data.Relation
+--import GF.Speech.FiniteState
 import GF.Speech.RegExp
 import GF.Speech.CFGToFA
-import GF.Infra.Option
+--import GF.Infra.Option
 import PGF

 import Data.List
-import Data.Maybe (fromMaybe, maybeToList)
+--import Data.Maybe (fromMaybe, maybeToList)
 import Data.Map (Map)
 import qualified Data.Map as Map
 import Data.Set (Set)
--- a/src/compiler/GF/Speech/SRGS_ABNF.hs
+++ b/src/compiler/GF/Speech/SRGS_ABNF.hs
@@ -19,7 +19,7 @@

 module GF.Speech.SRGS_ABNF (srgsAbnfPrinter, srgsAbnfNonRecursivePrinter) where

-import GF.Data.Utilities
+--import GF.Data.Utilities
 import GF.Infra.Option
 import GF.Speech.CFG
 import GF.Speech.SISR as SISR
@@ -27,11 +27,11 @@ import GF.Speech.SRG
 import GF.Speech.RegExp
 import PGF (PGF, CId)

-import Data.Char
+--import Data.Char
 import Data.List
 import Data.Maybe
 import Text.PrettyPrint.HughesPJ
-import Debug.Trace
+--import Debug.Trace

 width :: Int
 width = 75
--- a/src/compiler/GF/Speech/SRGS_XML.hs
+++ b/src/compiler/GF/Speech/SRGS_XML.hs
@@ -6,7 +6,7 @@
 ----------------------------------------------------------------------
 module GF.Speech.SRGS_XML (srgsXmlPrinter, srgsXmlNonRecursivePrinter) where

-import GF.Data.Utilities
+--import GF.Data.Utilities
 import GF.Data.XML
 import GF.Infra.Option
 import GF.Speech.CFG
@@ -15,11 +15,11 @@ import GF.Speech.SISR as SISR
 import GF.Speech.SRG
 import PGF (PGF, CId, Token)

-import Control.Monad
-import Data.Char (toUpper,toLower)
+--import Control.Monad
+--import Data.Char (toUpper,toLower)
 import Data.List
 import Data.Maybe
-import qualified Data.Map as Map
+--import qualified Data.Map as Map

 srgsXmlPrinter :: Options
               -> PGF -> CId -> String
--- a/src/compiler/GF/Speech/VoiceXML.hs
+++ b/src/compiler/GF/Speech/VoiceXML.hs
@@ -6,21 +6,21 @@
 -----------------------------------------------------------------------------
 module GF.Speech.VoiceXML (grammar2vxml) where

-import GF.Data.Operations
-import GF.Data.Str (sstrV)
-import GF.Data.Utilities
+--import GF.Data.Operations
+--import GF.Data.Str (sstrV)
+--import GF.Data.Utilities
 import GF.Data.XML
-import GF.Infra.Ident
+--import GF.Infra.Ident
 import PGF
 import PGF.Data
 import PGF.Macros

-import Control.Monad (liftM)
-import Data.List (isPrefixOf, find, intersperse)
+--import Control.Monad (liftM)
+import Data.List (intersperse) -- isPrefixOf, find
 import qualified Data.Map as Map
 import Data.Maybe (fromMaybe)

-import Debug.Trace
+--import Debug.Trace

 -- | the main function
 grammar2vxml :: PGF -> CId -> String
--- a/src/compiler/GF/System/UseSignal.hs
+++ b/src/compiler/GF/System/UseSignal.hs
@@ -18,7 +18,7 @@ module GF.System.UseSignal where
 import Control.Concurrent (myThreadId, killThread)
 import Control.Exception (SomeException,catch)
 import Prelude hiding (catch)
-import System.IO
+--import System.IO

 #ifdef mingw32_HOST_OS
 import GHC.ConsoleHandler