From d6252d1c16d59ad26db0d08a531cddf39864d9db Mon Sep 17 00:00:00 2001 From: hallgren Date: Thu, 12 Jun 2014 14:43:18 +0000 Subject: 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. --- src/compiler/GF/Speech/CFGToFA.hs | 3 +-- src/compiler/GF/Speech/JSGF.hs | 3 +-- src/compiler/GF/Speech/PGFToCFG.hs | 3 +-- src/compiler/GF/Speech/VoiceXML.hs | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src/compiler/GF/Speech') diff --git a/src/compiler/GF/Speech/CFGToFA.hs b/src/compiler/GF/Speech/CFGToFA.hs index 330c763e5..5319c0bbe 100644 --- a/src/compiler/GF/Speech/CFGToFA.hs +++ b/src/compiler/GF/Speech/CFGToFA.hs @@ -14,8 +14,7 @@ import qualified Data.Map as Map import Data.Set (Set) import qualified Data.Set as Set ---import PGF.CId -import PGF.Data +import PGF.Internal import GF.Data.Utilities import GF.Grammar.CFG --import GF.Speech.PGFToCFG diff --git a/src/compiler/GF/Speech/JSGF.hs b/src/compiler/GF/Speech/JSGF.hs index 6a4935a7f..2f4b4d96d 100644 --- a/src/compiler/GF/Speech/JSGF.hs +++ b/src/compiler/GF/Speech/JSGF.hs @@ -18,8 +18,7 @@ import GF.Grammar.CFG import GF.Speech.RegExp import GF.Speech.SISR import GF.Speech.SRG ---import PGF.CId -import PGF.Data +import PGF import Data.Char import Data.List diff --git a/src/compiler/GF/Speech/PGFToCFG.hs b/src/compiler/GF/Speech/PGFToCFG.hs index d70a74fe7..49744f22e 100644 --- a/src/compiler/GF/Speech/PGFToCFG.hs +++ b/src/compiler/GF/Speech/PGFToCFG.hs @@ -7,8 +7,7 @@ module GF.Speech.PGFToCFG (bnfPrinter, pgfToCFG) where import PGF(showCId) -import PGF.Data as PGF -import PGF.Macros +import PGF.Internal as PGF --import GF.Infra.Ident import GF.Grammar.CFG hiding (Symbol) diff --git a/src/compiler/GF/Speech/VoiceXML.hs b/src/compiler/GF/Speech/VoiceXML.hs index 3703fe7a2..764278694 100644 --- a/src/compiler/GF/Speech/VoiceXML.hs +++ b/src/compiler/GF/Speech/VoiceXML.hs @@ -12,8 +12,7 @@ module GF.Speech.VoiceXML (grammar2vxml) where import GF.Data.XML --import GF.Infra.Ident import PGF -import PGF.Data -import PGF.Macros +import PGF.Internal --import Control.Monad (liftM) import Data.List (intersperse) -- isPrefixOf, find -- cgit v1.2.3