From 8195c36f6fc9035d3e2c5ec01681d9048055a873 Mon Sep 17 00:00:00 2001 From: hallgren Date: Mon, 26 Mar 2012 23:56:56 +0000 Subject: [PATCH] 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.) --- src/compiler/GF/Command/Abstract.hs | 4 ++-- src/compiler/GF/Compile/GeneratePMCFG.hs | 2 +- 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)