summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoraarne <aarne@chalmers.se>2010-12-07 18:05:13 +0000
committeraarne <aarne@chalmers.se>2010-12-07 18:05:13 +0000
commitdd6e0b17307475a614b3d36d7f0f0816968bfa40 (patch)
treefb7c8801e043e3faeab20f693ae7f049415cbb2c /src
parent978e2e4241c02ef015e7cca274bebb0a19966191 (diff)
moved PGF.ToApi to GF.Compile.ToAPI
Diffstat (limited to 'src')
-rw-r--r--src/compiler/GF/Command/Commands.hs2
-rw-r--r--src/compiler/GF/Compile/ExampleBased.hs2
-rw-r--r--src/compiler/GF/Compile/ToAPI.hs (renamed from src/runtime/haskell/PGF/ToApi.hs)2
-rw-r--r--src/runtime/haskell/PGF.hs6
4 files changed, 4 insertions, 8 deletions
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