PGF library: expose only PGF and PGF.Internal instead of all modules

PGF exports the public, stable API.
PGF.Internal exports additional things needed in the GF compiler & shell,
including the nonstardard version of Data.Binary.

4 files changed, 8 insertions, 9 deletions

diff --git a/src/compiler/GF/Command/Commands.hs b/src/compiler/GF/Command/Commands.hs
index cf08499be..b6a992232 100644
--- a/src/compiler/GF/Command/Commands.hs
+++ b/src/compiler/GF/Command/Commands.hs
@@ -14,14 +14,14 @@ import Prelude hiding (putStrLn)
 
 import PGF
 
-import PGF.Macros(lookStartCat,functionsToCat,lookValCat,restrictPGF,hasLin)
-import PGF.Data(abstract,funs,cats,Literal(LStr),Expr(EFun,ELit)) ----
+import PGF.Internal(lookStartCat,functionsToCat,lookValCat,restrictPGF,hasLin)
+import PGF.Internal(abstract,funs,cats,Literal(LStr),Expr(EFun,ELit)) ----
 --import PGF.Morphology(isInMorpho,morphoKnown)
-import PGF.Printer(ppFun,ppCat)
+import PGF.Internal(ppFun,ppCat)
 --import PGF.Probabilistic(rankTreesByProbs,probTree,setProbabilities)
 --import PGF.Generate (generateRandomFrom) ----
 --import PGF.Tree (Tree(Fun), expr2tree, tree2expr)
-import PGF.Optimize(optimizePGF)
+import PGF.Internal(optimizePGF)
 
 import GF.Compile.Export
 import GF.Compile.ToAPI
@@ -41,7 +41,7 @@ import GF.Command.TreeOperations ---- temporary place for typecheck and compute
 
 import GF.Data.Operations
 
-import Data.Binary (encodeFile)
+import PGF.Internal (encodeFile)
 import Data.List(intersperse,nub)
 import Data.Maybe
 import qualified Data.Map as Map
diff --git a/src/compiler/GF/Command/Importing.hs b/src/compiler/GF/Command/Importing.hs
index 3cf7674a0..4c5d796c5 100644
--- a/src/compiler/GF/Command/Importing.hs
+++ b/src/compiler/GF/Command/Importing.hs
@@ -1,8 +1,7 @@
 module GF.Command.Importing (importGrammar, importSource) where
 
 import PGF
-import PGF.Data
-import PGF.Optimize
+import PGF.Internal(optimizePGF,unionPGF,msgUnionPGF)
 
 import GF.Compile
 import GF.Compile.Multi (readMulti)
diff --git a/src/compiler/GF/Command/Interpreter.hs b/src/compiler/GF/Command/Interpreter.hs
index f27ba47da..001c18554 100644
--- a/src/compiler/GF/Command/Interpreter.hs
+++ b/src/compiler/GF/Command/Interpreter.hs
@@ -12,7 +12,7 @@ import GF.Command.Commands
 import GF.Command.Abstract
 import GF.Command.Parse
 import PGF
-import PGF.Data
+import PGF.Internal
 --import PGF.Morphology
 import GF.Infra.SIO
 
diff --git a/src/compiler/GF/Command/TreeOperations.hs b/src/compiler/GF/Command/TreeOperations.hs
index 220c8f561..b06da6cff 100644
--- a/src/compiler/GF/Command/TreeOperations.hs
+++ b/src/compiler/GF/Command/TreeOperations.hs
@@ -5,7 +5,7 @@ module GF.Command.TreeOperations (
   ) where
 
 import PGF
-import PGF.Data
+import PGF.Internal(Expr(..),unAppForm)
 import Data.List
 
 type TreeOp = [Expr] -> [Expr]