GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-17 00:39:32 -06:00
Code Issues Packages Projects Releases Wiki 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

76
gf.cabal
View File

@@ -57,7 +57,7 @@ flag custom-binary
Description: Use a customised version of the binary package
Default: True
library
Library
build-depends: base >= 4.2 && <5,
array,
fst,
@@ -66,11 +66,11 @@ library
random,
pretty,
mtl
hs-source-dirs: src/compiler src/runtime/haskell
hs-source-dirs: src/runtime/haskell
if flag(custom-binary)
hs-source-dirs: src/binary
other-modules:
exposed-modules:
-- not really part of GF but I have changed the original binary library
-- and we have to keep the copy for now.
Data.Binary
@@ -81,40 +81,38 @@ library
else
build-depends: binary
ghc-options: -fwarn-unused-imports
extensions:
exposed-modules:
PGF
other-modules:
PGF.CId
PGF.Data
PGF.Macros
PGF.Optimize
PGF.Printer
PGF.Signature
PGF.Tree
PGF.Utilities
other-modules:
PGF.CId
PGF.Binary
PGF.Expr
PGF.Generate
PGF.Linearize
PGF.Parse
PGF.SortTop
PGF.Expr
PGF.Type
PGF.Tree
PGF.Tokenizer
PGF.Paraphrase
PGF.TypeCheck
PGF.Binary
PGF.Morphology
PGF.VisualizeTree
PGF.Printer
PGF.Paraphrase
PGF.Parse
PGF.Probabilistic
PGF.SortTop
PGF.Type
PGF.Tokenizer
PGF.TypeCheck
PGF.Forest
PGF.Optimize
PGF.Signature
GF.Data.TrieMap
GF.Data.Utilities
GF.Data.SortedList
GF.Data.ErrM
GF.Data.Relation
GF.Data.Operations
PGF.TrieMap
PGF.VisualizeTree
executable gf
build-depends: base >= 4.2 && <5,
Executable gf
build-depends: gf,
base >= 4.2 && <5,
array,
containers,
bytestring,
@@ -131,7 +129,7 @@ executable gf
haskeline,
parallel>=3,
utf8-string
ghc-options: -threaded
ghc-options: -threaded -fwarn-unused-imports
if flag(server)
build-depends: httpd-shed, network, json, cgi
-- ,silently
@@ -153,21 +151,17 @@ executable gf
if impl(ghc>=7.0)
ghc-options: -rtsopts
hs-source-dirs: src/compiler src/runtime/haskell
hs-source-dirs: src/compiler
if flag(custom-binary)
hs-source-dirs: src/binary
other-modules: Data.Binary.IEEE754
else
if !flag(custom-binary)
build-depends: binary, data-binary-ieee754
extensions:
main-is: GF.hs
other-modules:
GF.Data.BacktrackM
GF.Data.TrieMap
GF.Data.Utilities
GF.Data.SortedList
-- GF.Data.SortedList
GF.Data.ErrM
GF.Data.Operations
GF.Data.Str
@@ -227,20 +221,6 @@ executable gf
GF.Compile
GF.Index
GF.Quiz
PGF
PGF.CId
PGF.Data
PGF.Expr
PGF.Type
PGF.Tree
PGF.Macros
PGF.Generate
PGF.Linearize
PGF.Binary
PGF.Paraphrase
PGF.TypeCheck
PGF.Printer
PGF.Optimize
GFC
GFI

4
src/binary/Data/Binary/Builder.hs
View File

@@ -56,7 +56,7 @@ module Data.Binary.Builder (
import Foreign
import Data.Monoid
import Data.Word
--import Data.Word
import qualified Data.ByteString as S
import qualified Data.ByteString.Lazy as L
@@ -66,7 +66,7 @@ import qualified Data.ByteString.Base as S
#else
import Data.ByteString.Internal (inlinePerformIO)
import qualified Data.ByteString.Internal as S
import qualified Data.ByteString.Lazy.Internal as L
--import qualified Data.ByteString.Lazy.Internal as L
#endif
#if defined(__GLASGOW_HASKELL__) && !defined(__HADDOCK__)

4
src/binary/Data/Binary/Get.hs
View File

@@ -68,7 +68,7 @@ module Data.Binary.Get (
) where
import Control.Monad (when,liftM,ap)
import Control.Monad (when,liftM) -- ap
import Control.Monad.Fix
import Data.Maybe (isNothing)
@@ -95,7 +95,7 @@ import Data.STRef
#if defined(__GLASGOW_HASKELL__) && !defined(__HADDOCK__)
import GHC.Base
import GHC.Word
import GHC.Int
--import GHC.Int
#endif
-- | The parse state

3
src/compiler/GF/Command/Abstract.hs
View File

@@ -1,7 +1,6 @@
module GF.Command.Abstract where
import PGF.CId(CId,mkCId)
import PGF.Data(Expr)
import PGF(CId,mkCId,Expr)
type Ident = String

15
src/compiler/GF/Command/Commands.hs
View File

@@ -14,13 +14,12 @@ import Prelude hiding (putStrLn)
import PGF
import PGF.VisualizeTree(getDepLabels)
import PGF.Macros(lookStartCat,functionsToCat,lookValCat,restrictPGF,hasLin)
import PGF.Data(abstract,funs,cats,Literal(LStr),Expr(EFun,ELit)) ----
import PGF.Morphology(isInMorpho,morphoKnown)
--import PGF.Morphology(isInMorpho,morphoKnown)
import PGF.Printer(ppFun,ppCat)
import PGF.Probabilistic(rankTreesByProbs,probTree,setProbabilities)
import PGF.Generate (generateRandomFrom) ----
--import PGF.Probabilistic(rankTreesByProbs,probTree,setProbabilities)
--import PGF.Generate (generateRandomFrom) ----
import PGF.Tree (Tree(Fun), expr2tree, tree2expr)
import PGF.Optimize(optimizePGF)
@@ -30,7 +29,7 @@ import GF.Compile.ExampleBased
import GF.Infra.Option (noOptions, readOutputFormat, outputFormatsExpl)
import GF.Infra.UseIO(writeUTF8File)
import GF.Infra.SIO
import GF.Data.ErrM ----
--import GF.Data.ErrM ----
import GF.Command.Abstract
import GF.Command.Messages
import GF.Text.Lexing
@@ -43,13 +42,13 @@ import GF.Command.TreeOperations ---- temporary place for typecheck and compute
import GF.Data.Operations
import Data.Binary (encodeFile)
import Data.List
import Data.List(intersperse,nub)
import Data.Maybe
import qualified Data.Map as Map
--import System.Cmd(system) -- use GF.Infra.UseIO.restricedSystem instead!
import Text.PrettyPrint
import Data.List (sort)
import Debug.Trace
--import Debug.Trace
--import System.Random (newStdGen) ----
@@ -940,7 +939,7 @@ allCommands = Map.fromList [
let outp = valStrOpts "output" "dot" opts
mlab <- case file of
"" -> return Nothing
_ -> restricted (readFile file) >>= return . Just . getDepLabels . lines
_ -> (Just . getDepLabels . lines) `fmap` restricted (readFile file)
let lang = optLang pgf opts
let grphs = unlines $ map (graphvizDependencyTree outp debug mlab Nothing pgf lang) es
if isFlag "view" opts || isFlag "format" opts then do

2
src/compiler/GF/Command/Importing.hs
View File

@@ -12,7 +12,7 @@ import GF.Infra.UseIO
import GF.Infra.Option
import GF.Data.ErrM
import Data.List (nubBy)
--import Data.List (nubBy)
import System.FilePath
-- import a grammar in an environment where it extends an existing grammar

4
src/compiler/GF/Command/Interpreter.hs
View File

@@ -13,10 +13,8 @@ import GF.Command.Abstract
import GF.Command.Parse
import PGF
import PGF.Data
import PGF.Morphology
import GF.System.Signal
--import PGF.Morphology
import GF.Infra.SIO
import GF.Infra.Option
import Text.PrettyPrint
import Control.Monad(when)

3
src/compiler/GF/Command/Parse.hs
View File

@@ -1,7 +1,6 @@
module GF.Command.Parse(readCommandLine, pCommand) where
import PGF.CId
import PGF.Expr
import PGF
import GF.Command.Abstract
import Data.Char

8
src/compiler/GF/Compile.hs
View File

@@ -17,7 +17,6 @@ import GF.Compile.Coding
import GF.Compile.Tags
import GF.Grammar.Grammar
import GF.Grammar.Lookup
import GF.Grammar.Printer
import GF.Grammar.Binary
@@ -34,15 +33,10 @@ import System.FilePath
import qualified Data.Map as Map
--import qualified Data.Set as Set
import Data.List(nub)
import Data.Maybe (isNothing)
import Text.PrettyPrint
import PGF.CId
import PGF.Data
import PGF.Macros
import PGF.Optimize
import PGF.Probabilistic
import PGF
-- | Compiles a number of source files and builds a 'PGF' structure for them.
compileToPGF :: Options -> [FilePath] -> IOE PGF

4
src/compiler/GF/Compile/CheckGrammar.hs
View File

@@ -33,8 +33,8 @@ import qualified GF.Compile.Compute.ConcreteNew as CN
import GF.Grammar
import GF.Grammar.Lexer
import GF.Grammar.Lookup
import GF.Grammar.Predef
import GF.Grammar.PatternMatch
--import GF.Grammar.Predef
--import GF.Grammar.PatternMatch
import GF.Data.Operations
import GF.Infra.CheckM

4
src/compiler/GF/Compile/Coding.hs
View File

@@ -3,10 +3,10 @@ module GF.Compile.Coding where
import GF.Grammar.Grammar
import GF.Grammar.Macros
import GF.Text.Coding
import GF.Infra.Option
--import GF.Infra.Option
import GF.Data.Operations
import Data.Char
--import Data.Char
import System.IO
import qualified Data.ByteString.Char8 as BS

2
src/compiler/GF/Compile/Compute/AppPredefined.hs
View File

@@ -16,7 +16,7 @@ module GF.Compile.Compute.AppPredefined (
isInPredefined, typPredefined, arrityPredefined, predefModInfo, appPredefined
) where
import GF.Infra.Ident(identS)
--import GF.Infra.Ident(identS)
import GF.Infra.Option
import GF.Data.Operations
import GF.Grammar

8
src/compiler/GF/Compile/Compute/ConcreteLazy.hs
View File

@@ -17,9 +17,9 @@ module GF.Compile.Compute.ConcreteLazy (computeConcrete, computeTerm,checkPredef
import GF.Data.Operations
import GF.Grammar.Grammar
import GF.Infra.Ident
import GF.Infra.Option
--import GF.Infra.Option
import GF.Data.Str
import GF.Grammar.ShowTerm
--import GF.Grammar.ShowTerm
import GF.Grammar.Printer
import GF.Grammar.Predef
import GF.Grammar.Macros
@@ -30,8 +30,8 @@ import GF.Grammar.Lockfield (isLockLabel,unlockRecord) ----
import GF.Compile.Compute.AppPredefined
import Data.List (nub,intersperse)
import Control.Monad (liftM2, liftM)
import Data.List (nub) --intersperse
--import Control.Monad (liftM2, liftM)
import Control.Monad.Identity
import Text.PrettyPrint

8
src/compiler/GF/Compile/Compute/ConcreteNew.hs
View File

@@ -9,15 +9,15 @@ import GF.Grammar hiding (Env, VGen, VApp, VRecType)
import GF.Grammar.Lookup(lookupResDefLoc,allParamValues)
import GF.Grammar.Predef(cPredef,cErrorType,cTok,cStr)
import GF.Grammar.PatternMatch(matchPattern,measurePatt)
import GF.Grammar.Lockfield(unlockRecord,lockLabel,isLockLabel,lockRecType)
import GF.Grammar.Lockfield(lockLabel,isLockLabel,lockRecType) --unlockRecord
import GF.Compile.Compute.Value hiding (Error)
import GF.Compile.Compute.Predef(predef,predefName,delta)
import GF.Data.Str(Str,glueStr,str2strings,str,sstr,plusStr,strTok)
import GF.Data.Operations(Err,err,errIn,maybeErr,combinations,mapPairsM)
import GF.Data.Utilities(mapFst,mapSnd,mapBoth,apBoth,apSnd)
import GF.Data.Utilities(mapFst,mapSnd,mapBoth)
import Control.Monad(ap,liftM,liftM2,mplus,unless)
import Data.List (findIndex,intersect,isInfixOf,nub,elemIndex,(\\))
import Data.Char (isUpper,toUpper,toLower)
import Data.List (findIndex,intersect,nub,elemIndex,(\\)) --,isInfixOf
--import Data.Char (isUpper,toUpper,toLower)
import Text.PrettyPrint
import qualified Data.Map as Map
--import Debug.Trace(trace)

8
src/compiler/GF/Compile/Compute/Predef.hs
View File

@@ -9,13 +9,13 @@ import Data.List (isInfixOf)
import Data.Char (isUpper,toLower,toUpper)
import Control.Monad(ap)
import GF.Data.Utilities (mapSnd,apBoth)
import GF.Data.Utilities (apBoth) --mapSnd
import GF.Compile.Compute.Value
import GF.Infra.Ident (Ident,varX,showIdent)
import GF.Data.Operations(Err,err)
import GF.Infra.Ident (Ident,showIdent) --,varX
import GF.Data.Operations(Err) -- ,err
import GF.Grammar.Predef
import PGF.Data(BindType(..))
--import PGF.Data(BindType(..))
--------------------------------------------------------------------------------
class Predef a where

4
src/compiler/GF/Compile/Compute/Value.hs
View File

@@ -1,8 +1,8 @@
module GF.Compile.Compute.Value where
import GF.Grammar.Grammar(Label,Type,TInfo,MetaId,Patt,QIdent)
import GF.Grammar.Grammar(Label,Type,MetaId,Patt,QIdent)
import PGF.Data(BindType)
import GF.Infra.Ident(Ident)
import Text.Show.Functions
import Text.Show.Functions()
import Data.Ix(Ix)
-- | Self-contained (not quite) representation of values

6
src/compiler/GF/Compile/ExampleBased.hs
View File

@@ -4,9 +4,9 @@ module GF.Compile.ExampleBased (
) where
import PGF
import PGF.Probabilistic
import PGF.Morphology
import GF.Compile.ToAPI
--import PGF.Probabilistic
--import PGF.Morphology
--import GF.Compile.ToAPI
import Data.List

4
src/compiler/GF/Compile/Export.hs
View File

@@ -1,14 +1,14 @@
module GF.Compile.Export where
import PGF
import PGF.Printer
import PGF.Printer(ppPGF)
import GF.Compile.PGFtoHaskell
import GF.Compile.PGFtoProlog
import GF.Compile.PGFtoLProlog
import GF.Compile.PGFtoJS
import GF.Compile.PGFtoPython
import GF.Infra.Option
import GF.Speech.CFG
--import GF.Speech.CFG
import GF.Speech.PGFToCFG
import GF.Speech.SRGS_ABNF
import GF.Speech.SRGS_XML

12
src/compiler/GF/Compile/GeneratePMCFG.hs
View File

@@ -13,7 +13,7 @@ module GF.Compile.GeneratePMCFG
(generatePMCFG, pgfCncCat, addPMCFG, resourceValues
) where
import PGF.CId
--import PGF.CId
import PGF.Data(CncCat(..),Symbol(..),fidVar)
import GF.Infra.Option
@@ -24,23 +24,23 @@ import GF.Grammar.Lockfield (isLockLabel)
import GF.Data.BacktrackM
import GF.Data.Operations
import GF.Infra.UseIO (IOE)
import GF.Data.Utilities (updateNthM, updateNth)
import GF.Data.Utilities (updateNthM) --updateNth
import GF.Compile.Compute.ConcreteNew(GlobalEnv,normalForm,resourceValues,ppL)
import System.IO(hPutStr,hPutStrLn,stderr)
import qualified Data.Map as Map
import qualified Data.Set as Set
import qualified Data.List as List
import qualified Data.IntMap as IntMap
--import qualified Data.IntMap as IntMap
import qualified Data.IntSet as IntSet
import Text.PrettyPrint hiding (Str)
import Data.Array.IArray
import Data.Array.Unboxed
import Data.Maybe
import Data.Char (isDigit)
--import Data.Maybe
--import Data.Char (isDigit)
import Control.Monad
import Control.Monad.Identity
import Control.Monad.Trans (liftIO)
import Control.Exception
--import Control.Exception
----------------------------------------------------------------------
-- main conversion function

4
src/compiler/GF/Compile/GetGrammar.hs
View File

@@ -25,9 +25,9 @@ import GF.Grammar.Lexer
import GF.Grammar.Parser
import GF.Grammar.Grammar
import GF.Compile.ReadFiles
--import GF.Compile.ReadFiles
import Data.Char (toUpper)
--import Data.Char (toUpper)
import qualified Data.ByteString.Char8 as BS
import Control.Monad (foldM)
import System.Cmd (system)

19
src/compiler/GF/Compile/GrammarToPGF.hs
View File

@@ -1,24 +1,23 @@
{-# LANGUAGE BangPatterns #-}
module GF.Compile.GrammarToPGF (mkCanon2pgf) where
import GF.Compile.Export
--import GF.Compile.Export
import GF.Compile.GeneratePMCFG
import GF.Compile.GenerateBC
import PGF.CId
import PGF(CId,mkCId,bsCId)
import PGF.Data(fidInt,fidFloat,fidString,fidVar)
import PGF.Optimize(updateProductionIndices)
import qualified PGF.Macros as CM
--import qualified PGF.Macros as CM
import qualified PGF.Data as C
import qualified PGF.Data as D
import GF.Grammar.Predef
import GF.Grammar.Printer
--import GF.Grammar.Printer
import GF.Grammar.Grammar
import qualified GF.Grammar.Lookup as Look
import qualified GF.Grammar as A
import qualified GF.Grammar.Macros as GM
import qualified GF.Infra.Option as O
import GF.Compile.GeneratePMCFG
--import GF.Compile.GeneratePMCFG
import GF.Infra.Ident
import GF.Infra.Option
@@ -26,13 +25,13 @@ import GF.Infra.UseIO (IOE)
import GF.Data.Operations
import Data.List
import Data.Char (isDigit,isSpace)
--import Data.Char (isDigit,isSpace)
import qualified Data.Set as Set
import qualified Data.Map as Map
import qualified Data.IntMap as IntMap
import Data.Array.IArray
import Text.PrettyPrint
import Control.Monad.Identity
--import Text.PrettyPrint
--import Control.Monad.Identity
mkCanon2pgf :: Options -> SourceGrammar -> Ident -> IOE D.PGF
mkCanon2pgf opts gr am = do
@@ -104,7 +103,7 @@ mkCanon2pgf opts gr am = do
return (seqs, ((m,id), info) : is)
i2i :: Ident -> CId
i2i = CId . ident2bs
i2i = bsCId . ident2bs
mkType :: [Ident] -> A.Type -> C.Type
mkType scope t =

7
src/compiler/GF/Compile/Instructions.hs
View File

@@ -1,12 +1,13 @@
module GF.Compile.Instructions where
import Data.IORef
--import Data.IORef
import Data.Binary
import Data.Binary.Put
import Data.Binary.Get
import Data.Binary.IEEE754
import PGF.CId
import PGF.Binary
import PGF(CId)
--import PGF.CId
--import PGF.Binary
type IntRef = Int
type AConstant = CId

8
src/compiler/GF/Compile/Optimize.hs
View File

@@ -23,15 +23,15 @@ import GF.Grammar.Lookup
import GF.Grammar.Predef
--import GF.Compile.Refresh
import GF.Compile.Compute.Concrete
import GF.Compile.CheckGrammar
import GF.Compile.Update
--import GF.Compile.CheckGrammar
--import GF.Compile.Update
import GF.Data.Operations
import GF.Infra.CheckM
--import GF.Infra.CheckM
import GF.Infra.Option
import Control.Monad
import Data.List
--import Data.List
import qualified Data.Set as Set
import Text.PrettyPrint
import Debug.Trace

2
src/compiler/GF/Compile/PGFtoHaskell.hs
View File

@@ -16,7 +16,7 @@
module GF.Compile.PGFtoHaskell (grammar2haskell) where
import PGF.CId
import PGF(showCId)
import PGF.Data
import PGF.Macros

12
src/compiler/GF/Compile/PGFtoJS.hs
View File

@@ -1,18 +1,18 @@
module GF.Compile.PGFtoJS (pgf2js) where
import PGF.CId
import PGF(showCId)
import PGF.Data hiding (mkStr)
import qualified PGF.Macros as M
import qualified GF.JavaScript.AbsJS as JS
import qualified GF.JavaScript.PrintJS as JS
import GF.Data.ErrM
import GF.Infra.Option
--import GF.Data.ErrM
--import GF.Infra.Option
import Control.Monad (mplus)
import Data.Array.Unboxed (UArray)
--import Control.Monad (mplus)
--import Data.Array.Unboxed (UArray)
import qualified Data.Array.IArray as Array
import Data.Maybe (fromMaybe)
--import Data.Maybe (fromMaybe)
import Data.Map (Map)
import qualified Data.Set as Set
import qualified Data.Map as Map

6
src/compiler/GF/Compile/PGFtoLProlog.hs
View File

@@ -1,13 +1,13 @@
module GF.Compile.PGFtoLProlog(grammar2lambdaprolog_mod, grammar2lambdaprolog_sig) where
import PGF.CId
import PGF(mkCId,ppCId,showCId,wildCId)
import PGF.Data hiding (ppExpr, ppType, ppHypo)
import PGF.Macros
--import PGF.Macros
import Data.List
import Data.Maybe
import Text.PrettyPrint
import qualified Data.Map as Map
import Debug.Trace
--import Debug.Trace
grammar2lambdaprolog_mod pgf = render $
text "module" <+> ppCId (absname pgf) <> char '.' $$

4
src/compiler/GF/Compile/PGFtoProlog.hs
View File

@@ -8,9 +8,9 @@
module GF.Compile.PGFtoProlog (grammar2prolog) where
import PGF.CId
import PGF(mkCId,wildCId,showCId)
import PGF.Data
import PGF.Macros
--import PGF.Macros
import GF.Data.Operations

4
src/compiler/GF/Compile/PGFtoPython.hs
View File

@@ -8,7 +8,7 @@
module GF.Compile.PGFtoPython (pgf2python) where
import PGF.CId
import PGF(showCId)
import PGF.Data
import qualified PGF.Macros as M
@@ -18,7 +18,7 @@ import qualified Data.Array.IArray as Array
import qualified Data.Set as Set
import qualified Data.Map as Map
import qualified Data.IntMap as IntMap
import Data.List (intersperse)
--import Data.List (intersperse)
pgf2python :: PGF -> String
pgf2python pgf = ("# -*- coding: utf-8 -*-" ++++

4
src/compiler/GF/Compile/ReadFiles.hs
View File

@@ -35,8 +35,8 @@ import GF.Grammar.Grammar
import GF.Grammar.Binary
import Control.Monad
import Data.Char
import Data.List
--import Data.Char
--import Data.List
import Data.Maybe(isJust)
import qualified Data.ByteString.Char8 as BS
import qualified Data.Map as Map

4
src/compiler/GF/Compile/Rename.hs
View File

@@ -34,8 +34,8 @@ import GF.Infra.Ident
import GF.Infra.CheckM
import GF.Grammar.Macros
import GF.Grammar.Printer
import GF.Grammar.Lookup
import GF.Grammar.Printer
--import GF.Grammar.Lookup
--import GF.Grammar.Printer
import GF.Data.Operations
import Control.Monad

4
src/compiler/GF/Compile/Tags.hs
View File

@@ -8,10 +8,10 @@ import GF.Infra.UseIO
import GF.Data.Operations
import GF.Grammar
import Data.List
--import Data.List
import qualified Data.Map as Map
import qualified Data.Set as Set
import Control.Monad
--import Control.Monad
import Text.PrettyPrint
import System.FilePath

12
src/compiler/GF/Compile/ToAPI.hs
View File

@@ -2,14 +2,14 @@ module GF.Compile.ToAPI
(stringToAPI,exprToAPI)
where
import PGF.Expr
import PGF.CId
import PGF.Data
import PGF(showCId)
import Data.Maybe
import System.IO
import Control.Monad
import Data.Set as Set (fromList,toList)
--import System.IO
--import Control.Monad
--import Data.Set as Set (fromList,toList)
import Data.List
import Data.Map(Map)
--import Data.Map(Map)
import qualified Data.Map as Map
import PGF.Signature

4
src/compiler/GF/Compile/TypeCheck/Abstract.hs
View File

@@ -26,11 +26,11 @@ import GF.Grammar
import GF.Grammar.Lookup
import GF.Grammar.Unify
--import GF.Compile.Refresh
import GF.Compile.Compute.Abstract
--import GF.Compile.Compute.Abstract
import GF.Compile.TypeCheck.TC
import Text.PrettyPrint
import Control.Monad (foldM, liftM, liftM2)
--import Control.Monad (foldM, liftM, liftM2)
-- | invariant way of creating TCEnv from context
initTCEnv gamma =

8
src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs
View File

@@ -7,16 +7,16 @@ import GF.Grammar.Lockfield
import GF.Compile.Compute.ConcreteNew1
import GF.Compile.Compute.AppPredefined
import GF.Infra.CheckM
import GF.Infra.UseIO
--import GF.Infra.UseIO
import GF.Data.Operations
import Text.PrettyPrint
import Data.List (nub, (\\), tails)
import qualified Data.IntMap as IntMap
import GF.Grammar.Parser
import System.IO
import Debug.Trace
--import GF.Grammar.Parser
--import System.IO
--import Debug.Trace
checkLType :: SourceGrammar -> Term -> Type -> Check (Term, Type)
checkLType gr t ty = runTcM $ do

2
src/compiler/GF/Compile/TypeCheck/TC.hs
View File

@@ -26,7 +26,7 @@ import GF.Grammar
import GF.Grammar.Predef
import Control.Monad
import Data.List (sortBy)
--import Data.List (sortBy)
import Data.Maybe
import Text.PrettyPrint

2
src/compiler/GF/Data/Graph.hs
View File

@@ -24,7 +24,7 @@ module GF.Data.Graph ( Graph(..), Node, Edge, NodeInfo
, reverseGraph, mergeGraphs, renameNodes
) where
import GF.Data.Utilities
--import GF.Data.Utilities
import Data.List
import Data.Maybe

4
src/compiler/GF/Data/Operations.hs
View File

@@ -60,10 +60,10 @@ module GF.Data.Operations (-- * misc functions
) where
import Data.Char (isSpace, toUpper, isSpace, isDigit)
import Data.List (nub, sortBy, sort, deleteBy, nubBy, partition, (\\))
import Data.List (nub, partition, (\\))
import qualified Data.Map as Map
import Data.Map (Map)
import Control.Monad (liftM,liftM2, MonadPlus, mzero, mplus)
import Control.Monad (liftM,liftM2)
import GF.Data.ErrM
import GF.Data.Relation

2
src/compiler/GF/Data/Relation.hs
View File

@@ -26,7 +26,7 @@ module GF.Data.Relation (Rel, mkRel, mkRel'
, topologicalSort, findCycles) where
import Data.Foldable (toList)
import Data.List
--import Data.List
import Data.Maybe
import Data.Map (Map)
import qualified Data.Map as Map

19
src/compiler/GF/Data/Utilities.hs
View File

@@ -12,12 +12,12 @@
-----------------------------------------------------------------------------
module GF.Data.Utilities where
module GF.Data.Utilities(module GF.Data.Utilities, module PGF.Utilities) where
import Data.Maybe
import Data.List
import Control.Monad (MonadPlus(..),liftM)
import qualified Data.Set as Set
import PGF.Utilities
-- * functions on lists
@@ -68,17 +68,6 @@ safeInit :: [a] -> [a]
safeInit [] = []
safeInit xs = init xs
-- | Like 'nub', but O(n log n) instead of O(n^2), since it uses a set to lookup previous things.
-- The result list is stable (the elements are returned in the order they occur), and lazy.
-- Requires that the list elements can be compared by Ord.
-- Code ruthlessly taken from http://hpaste.org/54411
nub' :: Ord a => [a] -> [a]
nub' = loop Set.empty
where loop _ [] = []
loop seen (x : xs)
| Set.member x seen = loop seen xs
| otherwise = x : loop (Set.insert x seen) xs
-- | Sorts and then groups elements given an ordering of the
-- elements.
sortGroupBy :: (a -> a -> Ordering) -> [a] -> [[a]]
@@ -108,10 +97,6 @@ buildMultiMap :: Ord a => [(a,b)] -> [(a,[b])]
buildMultiMap = map (\g -> (fst (head g), map snd g) )
. sortGroupBy (compareBy fst)
-- | Replace all occurences of an element by another element.
replace :: Eq a => a -> a -> [a] -> [a]
replace x y = map (\z -> if z == x then y else z)
-- * equality functions
-- | Use an ordering function as an equality predicate.

4
src/compiler/GF/Grammar/Analyse.hs
View File

@@ -10,7 +10,7 @@ module GF.Grammar.Analyse (
import GF.Grammar.Grammar
import GF.Infra.Ident
import GF.Infra.Option ---
--import GF.Infra.Option ---
import GF.Grammar.Macros
import GF.Grammar.Lookup
@@ -18,7 +18,7 @@ import GF.Data.Operations
import qualified Data.Map as Map
import Data.List (nub)
import Debug.Trace
--import Debug.Trace
stripSourceGrammar :: SourceGrammar -> SourceGrammar
stripSourceGrammar sgr = mGrammar [(i, m{jments = Map.map stripInfo (jments m)}) | (i,m) <- modules sgr]

8
src/compiler/GF/Grammar/Binary.hs
View File

@@ -12,9 +12,9 @@ module GF.Grammar.Binary(decodeModule,decodeModuleHeader,encodeModule) where
import Prelude hiding (catch)
import Control.Exception(catch,ErrorCall(..),throwIO)
import Data.Char
--import Data.Char
import Data.Binary
import Control.Monad
--import Control.Monad
import qualified Data.Map as Map
import qualified Data.ByteString.Char8 as BS
@@ -23,7 +23,7 @@ import GF.Infra.Ident
import GF.Infra.Option
import GF.Grammar.Grammar
import PGF.Binary
import PGF() -- Binary instances
-- Please change this every time when the GFO format is changed
gfoVersion = "GF02"
@@ -346,3 +346,5 @@ decodeFile' fpath = addFPath fpath (decodeFile fpath)
addFPath fpath m = m `catch` handle
where
handle (ErrorCall msg) = throwIO (ErrorCall (fpath++": "++msg))
decodingError = fail "This file was compiled with different version of GF"

2
src/compiler/GF/Grammar/CF.hs
View File

@@ -25,7 +25,7 @@ import GF.Data.Utilities (nub')
import Data.Char
import Data.List
import System.FilePath
--import System.FilePath
getCF :: FilePath -> String -> Err SourceGrammar
getCF fpath = fmap (cf2gf fpath) . pCF

2
src/compiler/GF/Grammar/EBNF.hs
View File

@@ -24,7 +24,7 @@ import GF.Grammar.Grammar
import Data.Char
import Data.List
import System.FilePath
--import System.FilePath

10
src/compiler/GF/Grammar/Grammar.hs
View File

@@ -68,15 +68,15 @@ import GF.Data.Operations
import PGF.Data (FId, FunId, SeqId, LIndex, Sequence, BindType(..))
import Data.List
--import Data.List
import Data.Array.IArray
import Data.Array.Unboxed
import qualified Data.Map as Map
import qualified Data.Set as Set
import qualified Data.IntMap as IntMap
--import qualified Data.Set as Set
--import qualified Data.IntMap as IntMap
import Text.PrettyPrint
import System.FilePath
import Control.Monad.Identity
--import System.FilePath
--import Control.Monad.Identity

4
src/compiler/GF/Grammar/Lexer.hs
View File

@@ -1,5 +1,5 @@
{-# LANGUAGE CPP,MagicHash,BangPatterns #-}
{-# LINE 3 "lexer/Lexer.x" #-}
-- {-# LINE 3 "lexer/Lexer.x" #-}
module GF.Grammar.Lexer
( Token(..), Posn(..)
@@ -8,7 +8,7 @@ module GF.Grammar.Lexer
) where
import GF.Infra.Ident
import GF.Data.Operations
--import GF.Data.Operations
import qualified Data.ByteString.Char8 as BS
import qualified Data.Map as Map

4
src/compiler/GF/Grammar/Lookup.hs
View File

@@ -40,8 +40,8 @@ import GF.Grammar.Predef
import GF.Grammar.Lockfield
import Data.List (sortBy)
import Data.Maybe (maybe)
import Control.Monad
--import Data.Maybe (maybe)
--import Control.Monad
import Text.PrettyPrint
import qualified Data.Map as Map

4
src/compiler/GF/Grammar/Macros.hs
View File

@@ -22,14 +22,14 @@ import GF.Data.Operations
import GF.Data.Str
import GF.Infra.Ident
import GF.Grammar.Grammar
import GF.Grammar.Values
--import GF.Grammar.Values
import GF.Grammar.Predef
import GF.Grammar.Printer
import Control.Monad.Identity(Identity(..))
import qualified Data.Traversable as T(mapM)
import Control.Monad (liftM, liftM2, liftM3)
import Data.Char (isDigit)
--import Data.Char (isDigit)
import Data.List (sortBy,nub)
import Text.PrettyPrint

4
src/compiler/GF/Grammar/PatternMatch.hs
View File

@@ -24,10 +24,10 @@ import GF.Infra.Ident
import GF.Grammar.Macros
import GF.Grammar.Printer
import Data.List
--import Data.List
import Control.Monad
import Text.PrettyPrint
import Debug.Trace
--import Debug.Trace
matchPattern :: [(Patt,rhs)] -> Term -> Err (rhs, Substitution)
matchPattern pts term =

8
src/compiler/GF/Grammar/Printer.hs
View File

@@ -29,15 +29,15 @@ import GF.Infra.Option
import GF.Grammar.Values
import GF.Grammar.Grammar
import PGF.Expr (ppMeta)
import PGF.Data (ppMeta)
import PGF.Printer (ppFId, ppFunId, ppSeqId, ppSeq)
import Text.PrettyPrint
import Data.Maybe (maybe, isNothing)
import Data.Maybe (isNothing)
import Data.List (intersperse)
import qualified Data.Map as Map
import qualified Data.IntMap as IntMap
import qualified Data.Set as Set
--import qualified Data.IntMap as IntMap
--import qualified Data.Set as Set
import qualified Data.Array.IArray as Array
data TermPrintQual

2
src/compiler/GF/Grammar/Values.hs
View File

@@ -24,7 +24,7 @@ module GF.Grammar.Values (-- * values used in TC type checking
--Z tree2exp, loc2treeFocus
) where
import GF.Data.Operations
--import GF.Data.Operations
---Z import GF.Data.Zipper
import GF.Infra.Ident

6
src/compiler/GF/Index.hs
View File

@@ -9,13 +9,13 @@ module GF.Index (addIndex) where
import PGF
import PGF.Data
import PGF.Binary
--import PGF.Binary
import Data.Binary
import Data.ByteString.Lazy (readFile,length)
import Data.ByteString.Lazy (length) -- readFile
import qualified Data.Map as Map
import Data.Map (toAscList)
import Data.List (intercalate)
import qualified Data.ByteString.Lazy as BS
--import qualified Data.ByteString.Lazy as BS
addIndex :: PGF -> PGF
addIndex pgf = pgf {gflags = flags}

4
src/compiler/GF/Infra/CheckM.hs
View File

@@ -20,9 +20,9 @@ module GF.Infra.CheckM
) where
import GF.Data.Operations
import GF.Infra.Ident
--import GF.Infra.Ident
--import GF.Grammar.Grammar(Context)
import GF.Grammar.Printer
--import GF.Grammar.Printer
import qualified Data.Map as Map
import Text.PrettyPrint

2
src/compiler/GF/Infra/GetOpt.hs
View File

@@ -69,7 +69,7 @@ module GF.Infra.GetOpt (
import Prelude -- necessary to get dependencies right
import Data.List ( isPrefixOf, find )
--import Data.List ( isPrefixOf, find )
-- |What to do with options following non-options
data ArgOrder a

2
src/compiler/GF/Infra/Option.hs
View File

@@ -36,7 +36,7 @@ import GF.Infra.GetOpt
import GF.Grammar.Predef
--import System.Console.GetOpt
import System.FilePath
import System.IO
--import System.IO
import GF.Data.ErrM

2
src/compiler/GF/Infra/SIO.hs
View File

@@ -20,7 +20,7 @@ module GF.Infra.SIO(
) where
import Prelude hiding (putStrLn,print)
import Control.Monad(liftM)
import System.IO(Handle,hPutStrLn,hFlush,stdout)
import System.IO(hPutStrLn,hFlush,stdout)
import GF.System.Catch(try)
import System.Cmd(system)
import System.Environment(getEnv)

2
src/compiler/GF/Infra/UseIO.hs
View File

@@ -29,7 +29,7 @@ import System.IO.Error(isUserError,ioeGetErrorString)
import System.Environment
import System.Exit
import System.CPUTime
import System.Cmd
--import System.Cmd
import Text.Printf
import Control.Monad
import Control.Monad.Trans(MonadIO(..))

8
src/compiler/GF/Quiz.hs
View File

@@ -19,11 +19,11 @@ module GF.Quiz (
) where
import PGF
import PGF.Linearize
--import PGF.Linearize
import GF.Data.Operations
import GF.Infra.UseIO
import GF.Infra.Option
import PGF.Probabilistic
--import GF.Infra.UseIO
--import GF.Infra.Option
--import PGF.Probabilistic
import System.Random
import Data.List (nub)

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

2
src/compiler/GF/System/UseSignal.hs
View File

@@ -18,7 +18,7 @@ module GF.System.UseSignal where
import Control.Concurrent (myThreadId, killThread)
import Control.Exception (SomeException,catch)
import Prelude hiding (catch)
import System.IO
--import System.IO
#ifdef mingw32_HOST_OS
import GHC.ConsoleHandler

2
src/compiler/GFC.hs
View File

@@ -2,7 +2,7 @@ module GFC (mainGFC, writePGF) where
-- module Main where
import PGF
import PGF.CId
--import PGF.CId
import PGF.Data
import PGF.Optimize
import GF.Index

3
src/compiler/GFI.hs
View File

@@ -13,7 +13,6 @@ import GF.Data.Operations (chunks,err)
import GF.Grammar hiding (Ident,isPrefixOf)
import GF.Grammar.Analyse
import GF.Grammar.Parser (runP, pExp)
import GF.Grammar.Printer (ppGrammar, ppModule)
import GF.Grammar.ShowTerm
import GF.Grammar.Lookup (allOpers,allOpersTo)
import GF.Compile.Rename(renameSourceTerm)
@@ -25,7 +24,6 @@ import GF.Infra.CheckM
import GF.Infra.UseIO(ioErrorText)
import GF.Infra.SIO
import GF.Infra.Option
import GF.Infra.Ident (showIdent)
import qualified System.Console.Haskeline as Haskeline
import GF.Text.Coding(decodeUnicode,encodeUnicode)
@@ -36,7 +34,6 @@ import PGF.Data
import PGF.Macros
import Data.Char
import Data.Maybe
import Data.List(nub,isPrefixOf,isInfixOf,partition)
import qualified Data.Map as Map
import qualified Data.ByteString.Char8 as BS

2
src/compiler/SimpleEditor/Convert.hs
View File

@@ -5,7 +5,7 @@ import Control.Monad(unless,foldM,ap,mplus)
import Data.List(sortBy)
import Data.Function(on)
import qualified Data.Map as Map
import Text.JSON(encode,makeObj)
import Text.JSON(makeObj) --encode
import Text.PrettyPrint(render,text,(<+>))
-- 4 extra imports just to deal with the ByteString mess...

8
src/example-based/ExampleDemo.hs
View File

@@ -2,14 +2,14 @@ module ExampleDemo (Environ,initial,getNext, provideExample, testThis,mkFuncWith
where
import PGF
import System.IO
--import System.IO
import Data.List
import Control.Monad
--import Control.Monad
import qualified Data.Map as Map
import qualified Data.IntMap as IntMap
--import qualified Data.IntMap as IntMap
import qualified Data.Set as Set
import Data.Maybe
import System.Environment (getArgs)
--import System.Environment (getArgs)
import System.Random (RandomGen) --newStdGen

25
src/runtime/haskell/PGF.hs
View File

@@ -21,6 +21,8 @@ module PGF(
-- * Identifiers
CId, mkCId, wildCId,
showCId, readCId,
-- extra
ppCId, pIdent, bsCId,
-- * Languages
Language,
@@ -50,6 +52,8 @@ module PGF(
mkInt, unInt,
mkDouble, unDouble,
mkMeta, unMeta,
-- extra
pExpr,
-- * Operations
-- ** Linearization
@@ -111,6 +115,8 @@ module PGF(
Lemma, Analysis, Morpho,
lookupMorpho, buildMorpho, fullFormLexicon,
morphoMissing,
-- extra:
morphoKnown, isInMorpho,
-- ** Tokenizing
mkTokenizer,
@@ -124,6 +130,8 @@ module PGF(
gizaAlignment,
GraphvizOptions(..),
graphvizDefaults,
-- extra:
getDepLabels,
-- * Probabilities
Probabilities,
@@ -131,6 +139,8 @@ module PGF(
defaultProbabilities,
showProbabilities,
readProbabilitiesFromFile,
-- extra:
probTree, setProbabilities, rankTreesByProbs,
-- -- ** SortTop
-- forExample,
@@ -153,21 +163,20 @@ import PGF.Macros
import PGF.Expr (Tree)
import PGF.Morphology
import PGF.Data
import PGF.Binary
import PGF.Binary()
import PGF.Tokenizer
import qualified PGF.Forest as Forest
import qualified PGF.Parse as Parse
import PGF.Utilities(replace)
import GF.Data.Utilities (replace)
import Data.Char
--import Data.Char
import qualified Data.Map as Map
import qualified Data.IntMap as IntMap
import Data.Maybe
--import qualified Data.IntMap as IntMap
--import Data.Maybe
import Data.Binary
import Data.List(mapAccumL)
import System.Random (newStdGen)
import Control.Monad
--import System.Random (newStdGen)
--import Control.Monad
import Text.PrettyPrint
---------------------------------------------------

2
src/runtime/haskell/PGF/Binary.hs
View File

@@ -10,7 +10,7 @@ import Data.Array.IArray
import qualified Data.ByteString as BS
import qualified Data.Map as Map
import qualified Data.IntMap as IntMap
import qualified Data.Set as Set
--import qualified Data.Set as Set
import Control.Monad
pgfMajorVersion, pgfMinorVersion :: Word16

4
src/runtime/haskell/PGF/CId.hs
View File

@@ -3,7 +3,7 @@ module PGF.CId (CId(..),
readCId, showCId,
-- utils
pCId, pIdent, ppCId) where
bsCId, pCId, pIdent, ppCId) where
import Control.Monad
import qualified Data.ByteString.Char8 as BS
@@ -23,6 +23,8 @@ wildCId = CId (BS.singleton '_')
mkCId :: String -> CId
mkCId s = CId (BS.pack s)
bsCId = CId
-- | Reads an identifier from 'String'. The function returns 'Nothing' if the string is not valid identifier.
readCId :: String -> Maybe CId
readCId s = case [x | (x,cs) <- RP.readP_to_S pCId s, all isSpace cs] of

4
src/runtime/haskell/PGF/Data.hs
View File

@@ -8,11 +8,11 @@ import qualified Data.Map as Map
import qualified Data.Set as Set
import qualified Data.IntMap as IntMap
import qualified Data.IntSet as IntSet
import qualified GF.Data.TrieMap as TMap
import qualified PGF.TrieMap as TMap
import qualified Data.ByteString as BS
import Data.Array.IArray
import Data.Array.Unboxed
import Data.List
--import Data.List
-- internal datatypes for PGF

2
src/runtime/haskell/PGF/Expr.hs
View File

@@ -23,7 +23,7 @@ import PGF.CId
import PGF.Type
import Data.Char
import Data.Maybe
--import Data.Maybe
import Data.List as List
import qualified Data.Map as Map hiding (showTree)
import Control.Monad

2
src/runtime/haskell/PGF/Forest.hs
View File

@@ -32,7 +32,7 @@ import qualified Data.IntSet as IntSet
import qualified Data.IntMap as IntMap
import Control.Monad
import Control.Monad.State
import GF.Data.Utilities (nub')
import PGF.Utilities (nub')
data Forest
= Forest

11
src/runtime/haskell/PGF/Generate.hs
View File

@@ -8,14 +8,13 @@ module PGF.Generate
import PGF.CId
import PGF.Data
import PGF.Expr
import PGF.Macros
--import PGF.Macros
import PGF.TypeCheck
import PGF.Probabilistic
--import PGF.Probabilistic
import Data.Maybe (fromMaybe)
import qualified Data.Map as Map
import qualified Data.IntMap as IntMap
--import Data.Maybe (fromMaybe)
--import qualified Data.Map as Map
--import qualified Data.IntMap as IntMap
import Control.Monad
import Control.Monad.Identity
import System.Random

2
src/runtime/haskell/PGF/Linearize.hs
View File

@@ -12,7 +12,7 @@ import PGF.Macros
import PGF.Expr
import Data.Array.IArray
import Data.List
import Control.Monad
--import Control.Monad
import qualified Data.Map as Map
import qualified Data.IntMap as IntMap
import qualified Data.Set as Set

8
src/runtime/haskell/PGF/Macros.hs
View File

@@ -4,11 +4,11 @@ import PGF.CId
import PGF.Data
import Control.Monad
import qualified Data.Map as Map
import qualified Data.Set as Set
import qualified Data.IntMap as IntMap
import qualified Data.IntSet as IntSet
--import qualified Data.Set as Set
--import qualified Data.IntMap as IntMap
--import qualified Data.IntSet as IntSet
import qualified Data.Array as Array
import Data.Maybe
--import Data.Maybe
import Data.List
import Data.Array.IArray
import Text.PrettyPrint

2
src/runtime/haskell/PGF/Morphology.hs
View File

@@ -11,7 +11,7 @@ import qualified Data.Map as Map
import qualified Data.Set as Set
import qualified Data.IntMap as IntMap
import Data.Array.IArray
import Data.List (intersperse)
--import Data.List (intersperse)
import Data.Char (isDigit) ----
-- these 4 definitions depend on the datastructure used

4
src/runtime/haskell/PGF/Optimize.hs
View File

@@ -7,7 +7,7 @@ module PGF.Optimize
import PGF.CId
import PGF.Data
import PGF.Macros
import Data.Maybe
--import Data.Maybe
import Data.List (mapAccumL)
import Data.Array.IArray
import Data.Array.MArray
@@ -17,7 +17,7 @@ import qualified Data.Map as Map
import qualified Data.Set as Set
import qualified Data.IntSet as IntSet
import qualified Data.IntMap as IntMap
import qualified GF.Data.TrieMap as TrieMap
import qualified PGF.TrieMap as TrieMap
import qualified Data.List as List
import Control.Monad.ST

6
src/runtime/haskell/PGF/Paraphrase.hs
View File

@@ -15,13 +15,13 @@ module PGF.Paraphrase (
import PGF.Data
import PGF.Tree
import PGF.Macros (lookDef,isData)
import PGF.CId
--import PGF.Macros (lookDef,isData)
--import PGF.CId
import Data.List (nub,sort,group)
import qualified Data.Map as Map
import Debug.Trace ----
--import Debug.Trace ----
paraphrase :: PGF -> Expr -> [Expr]
paraphrase pgf t = nub (paraphraseN 2 pgf t)

5
src/runtime/haskell/PGF/Parse.hs
View File

@@ -15,15 +15,14 @@ module PGF.Parse
import Data.Array.IArray
import Data.Array.Base (unsafeAt)
import Data.List (isPrefixOf, foldl')
import Data.Maybe (fromMaybe, maybe, maybeToList)
import Data.Maybe (fromMaybe, maybeToList)
import qualified Data.Map as Map
import qualified GF.Data.TrieMap as TrieMap
import qualified PGF.TrieMap as TrieMap
import qualified Data.IntMap as IntMap
import qualified Data.IntSet as IntSet
import qualified Data.Set as Set
import Control.Monad
import GF.Data.SortedList
import PGF.CId
import PGF.Data
import PGF.Expr(Tree)

6
src/runtime/haskell/PGF/Printer.hs
View File

@@ -2,16 +2,14 @@ module PGF.Printer (ppPGF,ppCat,ppFId,ppFunId,ppSeqId,ppSeq,ppFun) where
import PGF.CId
import PGF.Data
import PGF.Macros
import GF.Data.Operations
--import PGF.Macros
import qualified Data.Map as Map
import qualified Data.Set as Set
import qualified Data.IntMap as IntMap
import Data.List
import Data.Array.IArray
import Data.Array.Unboxed
--import Data.Array.Unboxed
import Text.PrettyPrint

4
src/runtime/haskell/PGF/Probabilistic.hs
View File

@@ -15,12 +15,10 @@ module PGF.Probabilistic
import PGF.CId
import PGF.Data
import PGF.Macros
import PGF.Type
import PGF.Expr
import qualified Data.Map as Map
import Data.List (sortBy,partition,nub,mapAccumL)
import Data.Maybe (fromMaybe, fromJust)
import Data.Maybe (fromMaybe) --, fromJust
-- | An abstract data structure which represents
-- the probabilities for the different functions in a grammar.

1
src/runtime/haskell/PGF/SortTop.hs
View File

@@ -4,7 +4,6 @@ module PGF.SortTop
import PGF.CId
import PGF.Data
import PGF.Expr
import qualified Data.Map as Map
import qualified Data.Set as Set
import Data.Maybe

2
src/runtime/haskell/PGF/Tokenizer.hs
View File

@@ -9,7 +9,7 @@ module PGF.Tokenizer
( mkTokenizer
) where
import Data.List (intercalate)
--import Data.List (intercalate)
--import Test.QuickCheck
import FST.TransducerInterface
import PGF.Morphology (fullFormLexicon, buildMorpho)

8
src/runtime/haskell/PGF/Tree.hs
View File

@@ -7,11 +7,11 @@ module PGF.Tree
import PGF.CId
import PGF.Expr hiding (Tree)
import Data.Char
--import Data.Char
import Data.List as List
import Control.Monad
import qualified Text.PrettyPrint as PP
import qualified Text.ParserCombinators.ReadP as RP
--import Control.Monad
--import qualified Text.PrettyPrint as PP
--import qualified Text.ParserCombinators.ReadP as RP
-- | The tree is an evaluated expression in the abstract syntax
-- of the grammar. The type is especially restricted to not

2
src/compiler/GF/Data/TrieMap.hs → src/runtime/haskell/PGF/TrieMap.hs
View File

@@ -1,4 +1,4 @@
module GF.Data.TrieMap
module PGF.TrieMap
( TrieMap
, empty

4
src/runtime/haskell/PGF/Type.hs
View File

@@ -1,4 +1,4 @@
module PGF.Type ( Type(..), Hypo,
module PGF.Type ( Type(..), Hypo, CId,
readType, showType,
mkType, mkHypo, mkDepHypo, mkImplHypo,
unType,
@@ -10,7 +10,7 @@ import Data.Char
import Data.List
import qualified Text.PrettyPrint as PP
import qualified Text.ParserCombinators.ReadP as RP
import Control.Monad
--import Control.Monad
-- | To read a type from a 'String', use 'readType'.
data Type =

4
src/runtime/haskell/PGF/TypeCheck.hs
View File

@@ -30,7 +30,7 @@ module PGF.TypeCheck ( checkType, checkExpr, inferExpr
import PGF.Data
import PGF.Expr hiding (eval, apply, applyValue, value2expr)
import qualified PGF.Expr as Expr
import PGF.Macros (typeOfHypo, cidInt, cidFloat, cidString)
import PGF.Macros (cidInt, cidFloat, cidString) -- typeOfHypo
import PGF.CId
import Data.Map as Map
@@ -38,7 +38,7 @@ import Data.IntMap as IntMap
import Data.Maybe as Maybe
import Data.List as List
import Control.Monad
import Control.Monad.Identity
--import Control.Monad.Identity
import Control.Monad.State
import Control.Monad.Error
import Text.PrettyPrint

20
src/runtime/haskell/PGF/Utilities.hs Normal file
View File

@@ -0,0 +1,20 @@
-- | Basic utilities
module PGF.Utilities where
import Data.Set(empty,member,insert)
-- | Like 'nub', but O(n log n) instead of O(n^2), since it uses a set to lookup previous things.
-- The result list is stable (the elements are returned in the order they occur), and lazy.
-- Requires that the list elements can be compared by Ord.
-- Code ruthlessly taken from http://hpaste.org/54411
nub' :: Ord a => [a] -> [a]
nub' = loop empty
where loop _ [] = []
loop seen (x : xs)
| member x seen = loop seen xs
| otherwise = x : loop (insert x seen) xs
-- | Replace all occurences of an element by another element.
replace :: Eq a => a -> a -> [a] -> [a]
replace x y = map (\z -> if z == x then y else z)

20
src/runtime/haskell/PGF/VisualizeTree.hs
View File

@@ -21,24 +21,24 @@ module PGF.VisualizeTree
, getDepLabels
) where
import PGF.CId (CId,wildCId,showCId,ppCId,pCId,mkCId)
import PGF.CId (wildCId,showCId,ppCId,mkCId) --CId,pCId,
import PGF.Data
import PGF.Expr (showExpr, Tree)
import PGF.Expr (Tree) -- showExpr
import PGF.Linearize
import PGF.Macros (lookValCat, lookMap,
BracketedString(..), BracketedTokn(..), flattenBracketedString)
import PGF.Macros (lookValCat, BracketedString(..))
--lookMap, BracketedTokn(..), flattenBracketedString
import qualified Data.Map as Map
import qualified Data.IntMap as IntMap
--import qualified Data.IntMap as IntMap
import Data.List (intersperse,nub,mapAccumL,find)
import Data.Char (isDigit)
--import Data.Char (isDigit)
import Data.Maybe (fromMaybe)
import Text.PrettyPrint
import Data.Array.IArray
import Control.Monad
import qualified Data.Set as Set
import qualified Text.ParserCombinators.ReadP as RP
--import Data.Array.IArray
--import Control.Monad
--import qualified Data.Set as Set
--import qualified Text.ParserCombinators.ReadP as RP
data GraphvizOptions = GraphvizOptions {noLeaves :: Bool,