summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhallgren <hallgren@chalmers.se>2012-03-26 23:56:56 +0000
committerhallgren <hallgren@chalmers.se>2012-03-26 23:56:56 +0000
commit47c116b5a6b9ba99523c4beff6222b712c3922e9 (patch)
tree4365435019bb9a8e4b1166cde77489931bc1f67b /src
parentc015ac77bdda7ba4d957c61a6b861f14a69cccc6 (diff)
Workaround for bug in ghc-7.2.2
An apparent bug in ghc-7.2.2 causes the type Value to be exported from PGF.Data. Workaround: restrict the imports from PGF.Data in GF.Command.Abstract and GF.Compile.GeneratePMCFG to avoid the clash with locally defined type Value. (ghc-7.0.4 and ghc-7.4.1 appear to be free from this bug.)
Diffstat (limited to 'src')
-rw-r--r--src/compiler/GF/Command/Abstract.hs4
-rw-r--r--src/compiler/GF/Compile/GeneratePMCFG.hs2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/GF/Command/Abstract.hs b/src/compiler/GF/Command/Abstract.hs
index 1f7c4014e..5469f12ac 100644
--- a/src/compiler/GF/Command/Abstract.hs
+++ b/src/compiler/GF/Command/Abstract.hs
@@ -1,7 +1,7 @@
module GF.Command.Abstract where
-import PGF.CId
-import PGF.Data
+import PGF.CId(CId,mkCId)
+import PGF.Data(Expr)
type Ident = String
diff --git a/src/compiler/GF/Compile/GeneratePMCFG.hs b/src/compiler/GF/Compile/GeneratePMCFG.hs
index 175246a52..0dcb8c8cd 100644
--- a/src/compiler/GF/Compile/GeneratePMCFG.hs
+++ b/src/compiler/GF/Compile/GeneratePMCFG.hs
@@ -14,7 +14,7 @@ module GF.Compile.GeneratePMCFG
) where
import PGF.CId
-import PGF.Data hiding (Type, Production)
+import PGF.Data(Alternative(..),CncCat(..),Symbol(..),fidVar)
import GF.Infra.Option
import GF.Grammar hiding (Env, mkRecord, mkTable)