moved PGF.ToApi to GF.Compile.ToAPI

8 files changed, 12 insertions, 10 deletions

diff --git a/examples/phrasebook/Compile.hs b/examples/phrasebook/Compile.hs
index 0797b5ded..5945e62e6 100644
--- a/examples/phrasebook/Compile.hs
+++ b/examples/phrasebook/Compile.hs
@@ -36,7 +36,9 @@ main = do
     _ -> return ()
 
 compileOne modu = do
-  let comm = "gf -make -s -optimize-pgf -name=" ++ modu ++ " " ++ modu ++ ".gf"
+  let comm = "gf -make -s -optimize-pgf -name=" ++ 
+             modu ++ " " ++ modu ++ ".gf" ++
+             " +RTS -K32M"
   putStrLn comm
   system comm
 
diff --git a/examples/phrasebook/SentencesFin.gf b/examples/phrasebook/SentencesFin.gf
index 1b1febf6a..68644d1bf 100644
--- a/examples/phrasebook/SentencesFin.gf
+++ b/examples/phrasebook/SentencesFin.gf
@@ -8,6 +8,8 @@ concrete SentencesFin of Sentences = NumeralFin ** SentencesI -
   (Lexicon = LexiconFin) ** 
     open SyntaxFin, ExtraFin, (P = ParadigmsFin), (V = VerbFin), Prelude in {
 
+  flags optimize = noexpand ;
+
   lin 
     Is item prop = mkCl item (V.UseComp (CompPartAP prop)) ; -- tämä pizza on herkullista
     IsMass mass prop = mkCl (mkNP a_Det mass) (V.UseComp (CompPartAP prop)) ; -- pizza on herkullista
diff --git a/examples/phrasebook/WordsFin.gf b/examples/phrasebook/WordsFin.gf
index 7f7407edb..9f6fe16e3 100644
--- a/examples/phrasebook/WordsFin.gf
+++ b/examples/phrasebook/WordsFin.gf
@@ -5,6 +5,8 @@ concrete WordsFin of Words = SentencesFin **
     SyntaxFin, ParadigmsFin, (L = LexiconFin), 
     Prelude, (E = ExtraFin) in {
 
+  flags optimize = noexpand ;
+
   lin
 
 -- kinds
diff --git a/gf.cabal b/gf.cabal
index 0a6952e4c..23f4c5279 100644
--- a/gf.cabal
+++ b/gf.cabal
@@ -47,7 +47,6 @@ library
     PGF.Forest
     PGF.Optimize
     PGF.Signature
-    PGF.ToAPI
     GF.Data.TrieMap
     GF.Data.Utilities
     GF.Data.SortedList
@@ -124,6 +123,7 @@ executable gf
     GF.Compile.Rename
     GF.Compile.ReadFiles
     GF.Compile.GrammarToPGF
+    GF.Compile.ToAPI
     GF.Compile.TypeCheck.Abstract
     GF.Compile.TypeCheck.Concrete
     GF.Compile.TypeCheck.TC
diff --git a/src/compiler/GF/Command/Commands.hs b/src/compiler/GF/Command/Commands.hs
index 17099be68..530dc236f 100644
--- a/src/compiler/GF/Command/Commands.hs
+++ b/src/compiler/GF/Command/Commands.hs
@@ -20,11 +20,11 @@ import PGF.Macros
 import PGF.Data ----
 import PGF.Morphology
 import PGF.Printer
-import PGF.ToAPI
 import PGF.Probabilistic -- (getProbsFromFile,prProbabilities,defaultProbabilities)
 import PGF.Generate (generateRandomFrom) ----
 import PGF.Tree (Tree(Fun), expr2tree, tree2expr)
 import GF.Compile.Export
+import GF.Compile.ToAPI
 import GF.Compile.ExampleBased
 import GF.Infra.Option (noOptions, readOutputFormat)
 import GF.Infra.UseIO
diff --git a/src/compiler/GF/Compile/ExampleBased.hs b/src/compiler/GF/Compile/ExampleBased.hs
index b4c0caf75..39d88ae49 100644
--- a/src/compiler/GF/Compile/ExampleBased.hs
+++ b/src/compiler/GF/Compile/ExampleBased.hs
@@ -6,7 +6,7 @@ module GF.Compile.ExampleBased (
 import PGF
 import PGF.Probabilistic
 import PGF.Morphology
-import PGF.ToAPI
+import GF.Compile.ToAPI
 
 import Data.List
 
diff --git a/src/runtime/haskell/PGF/ToApi.hs b/src/compiler/GF/Compile/ToAPI.hs
index c11aa7341..e118ea208 100644
--- a/src/runtime/haskell/PGF/ToApi.hs
+++ b/src/compiler/GF/Compile/ToAPI.hs
@@ -1,4 +1,4 @@
-module PGF.ToAPI 
+module GF.Compile.ToAPI 
  (stringToAPI,exprToAPI)
   where
 
diff --git a/src/runtime/haskell/PGF.hs b/src/runtime/haskell/PGF.hs
index 197f10ab9..42ef8aaff 100644
--- a/src/runtime/haskell/PGF.hs
+++ b/src/runtime/haskell/PGF.hs
@@ -126,10 +126,7 @@ module PGF(
            readProbabilitiesFromFile,
            
            -- * Browsing
-           browse,
-           -- * ToAPI 
-           exprToAPI, 
-           stringToAPI 
+           browse
           ) where
 
 import PGF.CId
@@ -144,7 +141,6 @@ import PGF.Expr (Tree)
 import PGF.Morphology
 import PGF.Data
 import PGF.Binary
-import PGF.ToAPI
 import qualified PGF.Forest as Forest
 import qualified PGF.Parse as Parse