msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

Eliminate mutual dependencies between the GF compiler and the PGF library

Browse Source 
+ References to modules under src/compiler have been eliminated from the PGF
  library (under src/runtime/haskell). Only two functions had to be moved (from
  GF.Data.Utilities to PGF.Utilities) to make this possible, other apparent
  dependencies turned out to be vacuous.

+ In gf.cabal, the GF executable no longer directly depends on the PGF library
  source directory, but only on the exposed library modules. This means that
  there is less duplication in gf.cabal and that the 30 modules in the
  PGF library will no longer be compiled twice while building GF.

  To make this possible, additional PGF library modules have been exposed, even
  though they should probably be considered for internal use only. They could
  be collected in a PGF.Internal module, or marked as "unstable", to make
  this explicit.

+ Also, by using the -fwarn-unused-imports flag, ~220 redundant imports were
  found and removed, reducing the total number of imports by ~15%.
This commit is contained in:
hallgren
2013-11-05 13:11:10 +00:00
parent 74357cdedf
commit 3814841d7d
97 changed files with 312 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/GF/Speech/CFG.hs
View File

@@ -8,16 +8,16 @@ module GF.Speech.CFG where
import GF.Data.Utilities
import PGF
import GF.Infra.Option
--import GF.Infra.Option
import GF.Data.Relation
import Control.Monad
import Control.Monad.State (State, get, put, evalState)
--import Control.Monad
--import Control.Monad.State (State, get, put, evalState)
import Data.Map (Map)
import qualified Data.Map as Map
import Data.List
import Data.Maybe (fromMaybe)
import Data.Monoid (mconcat)
--import Data.Maybe (fromMaybe)
--import Data.Monoid (mconcat)
import Data.Set (Set)
import qualified Data.Set as Set

10
src/compiler/GF/Speech/CFGToFA.hs
View File

@@ -14,17 +14,17 @@ import qualified Data.Map as Map
import Data.Set (Set)
import qualified Data.Set as Set
import PGF.CId
--import PGF.CId
import PGF.Data
import GF.Data.Utilities
import GF.Speech.CFG
import GF.Speech.PGFToCFG
import GF.Infra.Ident (Ident)
--import GF.Speech.PGFToCFG
--import GF.Infra.Ident (Ident)
import GF.Data.Graph
import GF.Data.Relation
--import GF.Data.Relation
import GF.Speech.FiniteState
import GF.Speech.CFG
--import GF.Speech.CFG
data Recursivity = RightR | LeftR | NotR

2
src/compiler/GF/Speech/FiniteState.hs
View File

@@ -41,7 +41,7 @@ import qualified Data.Map as Map
import Data.Set (Set)
import qualified Data.Set as Set
import GF.Data.Utilities
--import GF.Data.Utilities
import GF.Data.Graph
import qualified GF.Data.Graphviz as Dot

4
src/compiler/GF/Speech/GSL.hs
View File

@@ -8,12 +8,12 @@
module GF.Speech.GSL (gslPrinter) where
import GF.Data.Utilities
--import GF.Data.Utilities
import GF.Speech.CFG
import GF.Speech.SRG
import GF.Speech.RegExp
import GF.Infra.Option
import GF.Infra.Ident
--import GF.Infra.Ident
import PGF
import Data.Char (toUpper,toLower)

8
src/compiler/GF/Speech/JSGF.hs
View File

@@ -12,20 +12,20 @@
module GF.Speech.JSGF (jsgfPrinter) where
import GF.Data.Utilities
--import GF.Data.Utilities
import GF.Infra.Option
import GF.Speech.CFG
import GF.Speech.RegExp
import GF.Speech.SISR
import GF.Speech.SRG
import PGF.CId
--import PGF.CId
import PGF.Data
import Data.Char
import Data.List
import Data.Maybe
--import Data.Maybe
import Text.PrettyPrint.HughesPJ
import Debug.Trace
--import Debug.Trace
width :: Int
width = 75

8
src/compiler/GF/Speech/PGFToCFG.hs
View File

@@ -6,18 +6,18 @@
----------------------------------------------------------------------
module GF.Speech.PGFToCFG (bnfPrinter, pgfToCFG) where
import PGF.CId
import PGF(showCId)
import PGF.Data as PGF
import PGF.Macros
import GF.Infra.Ident
--import GF.Infra.Ident
import GF.Speech.CFG hiding (Symbol)
import Data.Array.IArray as Array
import Data.List
--import Data.List
import Data.Map (Map)
import qualified Data.Map as Map
import qualified Data.IntMap as IntMap
import Data.Maybe
--import Data.Maybe
import Data.Set (Set)
import qualified Data.Set as Set

6
src/compiler/GF/Speech/SISR.hs
View File

@@ -10,12 +10,12 @@ module GF.Speech.SISR (SISRFormat(..), SISRTag, prSISR,
import Data.List
import GF.Data.Utilities
import GF.Infra.Ident
--import GF.Data.Utilities
--import GF.Infra.Ident
import GF.Infra.Option (SISRFormat(..))
import GF.Speech.CFG
import GF.Speech.SRG (SRGNT)
import PGF.CId
import PGF(showCId)
import qualified GF.JavaScript.AbsJS as JS
import qualified GF.JavaScript.PrintJS as JS

6
src/compiler/GF/Speech/SLF.hs
View File

@@ -15,17 +15,17 @@ module GF.Speech.SLF (slfPrinter,slfGraphvizPrinter,
import GF.Data.Utilities
import GF.Speech.CFG
import GF.Speech.FiniteState
import GF.Speech.CFG
--import GF.Speech.CFG
import GF.Speech.CFGToFA
import GF.Speech.PGFToCFG
import qualified GF.Data.Graphviz as Dot
import PGF
import PGF.CId
--import PGF.CId
import Control.Monad
import qualified Control.Monad.State as STM
import Data.Char (toUpper)
import Data.List
--import Data.List
import Data.Maybe
data SLFs = SLFs [(String,SLF)] SLF

12
src/compiler/GF/Speech/SRG.hs
View File

@@ -17,21 +17,21 @@ module GF.Speech.SRG (SRG(..), SRGRule(..), SRGAlt(..), SRGItem, SRGSymbol
, lookupFM_
) where
import GF.Data.Operations
--import GF.Data.Operations
import GF.Data.Utilities
import GF.Infra.Ident
--import GF.Infra.Ident
import GF.Infra.Option
import GF.Speech.CFG
import GF.Speech.PGFToCFG
import GF.Data.Relation
import GF.Speech.FiniteState
--import GF.Data.Relation
--import GF.Speech.FiniteState
import GF.Speech.RegExp
import GF.Speech.CFGToFA
import GF.Infra.Option
--import GF.Infra.Option
import PGF
import Data.List
import Data.Maybe (fromMaybe, maybeToList)
--import Data.Maybe (fromMaybe, maybeToList)
import Data.Map (Map)
import qualified Data.Map as Map
import Data.Set (Set)

6
src/compiler/GF/Speech/SRGS_ABNF.hs
View File

@@ -19,7 +19,7 @@
module GF.Speech.SRGS_ABNF (srgsAbnfPrinter, srgsAbnfNonRecursivePrinter) where
import GF.Data.Utilities
--import GF.Data.Utilities
import GF.Infra.Option
import GF.Speech.CFG
import GF.Speech.SISR as SISR
@@ -27,11 +27,11 @@ import GF.Speech.SRG
import GF.Speech.RegExp
import PGF (PGF, CId)
import Data.Char
--import Data.Char
import Data.List
import Data.Maybe
import Text.PrettyPrint.HughesPJ
import Debug.Trace
--import Debug.Trace
width :: Int
width = 75

8
src/compiler/GF/Speech/SRGS_XML.hs
View File

@@ -6,7 +6,7 @@
----------------------------------------------------------------------
module GF.Speech.SRGS_XML (srgsXmlPrinter, srgsXmlNonRecursivePrinter) where
import GF.Data.Utilities
--import GF.Data.Utilities
import GF.Data.XML
import GF.Infra.Option
import GF.Speech.CFG
@@ -15,11 +15,11 @@ import GF.Speech.SISR as SISR
import GF.Speech.SRG
import PGF (PGF, CId, Token)
import Control.Monad
import Data.Char (toUpper,toLower)
--import Control.Monad
--import Data.Char (toUpper,toLower)
import Data.List
import Data.Maybe
import qualified Data.Map as Map
--import qualified Data.Map as Map
srgsXmlPrinter :: Options
-> PGF -> CId -> String

14
src/compiler/GF/Speech/VoiceXML.hs
View File

@@ -6,21 +6,21 @@
-----------------------------------------------------------------------------
module GF.Speech.VoiceXML (grammar2vxml) where
import GF.Data.Operations
import GF.Data.Str (sstrV)
import GF.Data.Utilities
--import GF.Data.Operations
--import GF.Data.Str (sstrV)
--import GF.Data.Utilities
import GF.Data.XML
import GF.Infra.Ident
--import GF.Infra.Ident
import PGF
import PGF.Data
import PGF.Macros
import Control.Monad (liftM)
import Data.List (isPrefixOf, find, intersperse)
--import Control.Monad (liftM)
import Data.List (intersperse) -- isPrefixOf, find
import qualified Data.Map as Map
import Data.Maybe (fromMaybe)
import Debug.Trace
--import Debug.Trace
-- | the main function
grammar2vxml :: PGF -> CId -> String