diff options
Diffstat (limited to 'src/compiler/GF/Compile')
26 files changed, 82 insertions, 82 deletions
diff --git a/src/compiler/GF/Compile/CheckGrammar.hs b/src/compiler/GF/Compile/CheckGrammar.hs index 736046179..967925275 100644 --- a/src/compiler/GF/Compile/CheckGrammar.hs +++ b/src/compiler/GF/Compile/CheckGrammar.hs @@ -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 diff --git a/src/compiler/GF/Compile/Coding.hs b/src/compiler/GF/Compile/Coding.hs index 9d7022229..d635ff2e4 100644 --- a/src/compiler/GF/Compile/Coding.hs +++ b/src/compiler/GF/Compile/Coding.hs @@ -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 diff --git a/src/compiler/GF/Compile/Compute/AppPredefined.hs b/src/compiler/GF/Compile/Compute/AppPredefined.hs index 861a74a89..a597726c9 100644 --- a/src/compiler/GF/Compile/Compute/AppPredefined.hs +++ b/src/compiler/GF/Compile/Compute/AppPredefined.hs @@ -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 diff --git a/src/compiler/GF/Compile/Compute/ConcreteLazy.hs b/src/compiler/GF/Compile/Compute/ConcreteLazy.hs index 0e3a4fb45..cef4c398c 100644 --- a/src/compiler/GF/Compile/Compute/ConcreteLazy.hs +++ b/src/compiler/GF/Compile/Compute/ConcreteLazy.hs @@ -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 diff --git a/src/compiler/GF/Compile/Compute/ConcreteNew.hs b/src/compiler/GF/Compile/Compute/ConcreteNew.hs index 3e87ea43a..dd49fffed 100644 --- a/src/compiler/GF/Compile/Compute/ConcreteNew.hs +++ b/src/compiler/GF/Compile/Compute/ConcreteNew.hs @@ -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) diff --git a/src/compiler/GF/Compile/Compute/Predef.hs b/src/compiler/GF/Compile/Compute/Predef.hs index b8b7f7c77..8c793502a 100644 --- a/src/compiler/GF/Compile/Compute/Predef.hs +++ b/src/compiler/GF/Compile/Compute/Predef.hs @@ -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 diff --git a/src/compiler/GF/Compile/Compute/Value.hs b/src/compiler/GF/Compile/Compute/Value.hs index e72b06778..21a3eb20e 100644 --- a/src/compiler/GF/Compile/Compute/Value.hs +++ b/src/compiler/GF/Compile/Compute/Value.hs @@ -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 diff --git a/src/compiler/GF/Compile/ExampleBased.hs b/src/compiler/GF/Compile/ExampleBased.hs index 39d88ae49..9300fd32d 100644 --- a/src/compiler/GF/Compile/ExampleBased.hs +++ b/src/compiler/GF/Compile/ExampleBased.hs @@ -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 diff --git a/src/compiler/GF/Compile/Export.hs b/src/compiler/GF/Compile/Export.hs index b7f00677f..727a21f2d 100644 --- a/src/compiler/GF/Compile/Export.hs +++ b/src/compiler/GF/Compile/Export.hs @@ -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 diff --git a/src/compiler/GF/Compile/GeneratePMCFG.hs b/src/compiler/GF/Compile/GeneratePMCFG.hs index bf4bebdec..99df9af3e 100644 --- a/src/compiler/GF/Compile/GeneratePMCFG.hs +++ b/src/compiler/GF/Compile/GeneratePMCFG.hs @@ -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 diff --git a/src/compiler/GF/Compile/GetGrammar.hs b/src/compiler/GF/Compile/GetGrammar.hs index b8832ba64..17477f49a 100644 --- a/src/compiler/GF/Compile/GetGrammar.hs +++ b/src/compiler/GF/Compile/GetGrammar.hs @@ -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) diff --git a/src/compiler/GF/Compile/GrammarToPGF.hs b/src/compiler/GF/Compile/GrammarToPGF.hs index b8a4f36fa..ce31d5dc1 100644 --- a/src/compiler/GF/Compile/GrammarToPGF.hs +++ b/src/compiler/GF/Compile/GrammarToPGF.hs @@ -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 = diff --git a/src/compiler/GF/Compile/Instructions.hs b/src/compiler/GF/Compile/Instructions.hs index 700fe33c2..586671a4d 100644 --- a/src/compiler/GF/Compile/Instructions.hs +++ b/src/compiler/GF/Compile/Instructions.hs @@ -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 diff --git a/src/compiler/GF/Compile/Optimize.hs b/src/compiler/GF/Compile/Optimize.hs index 37fe21cc0..e5289fe7b 100644 --- a/src/compiler/GF/Compile/Optimize.hs +++ b/src/compiler/GF/Compile/Optimize.hs @@ -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 diff --git a/src/compiler/GF/Compile/PGFtoHaskell.hs b/src/compiler/GF/Compile/PGFtoHaskell.hs index d1032983d..17c9bb2f5 100644 --- a/src/compiler/GF/Compile/PGFtoHaskell.hs +++ b/src/compiler/GF/Compile/PGFtoHaskell.hs @@ -16,7 +16,7 @@ module GF.Compile.PGFtoHaskell (grammar2haskell) where -import PGF.CId +import PGF(showCId) import PGF.Data import PGF.Macros diff --git a/src/compiler/GF/Compile/PGFtoJS.hs b/src/compiler/GF/Compile/PGFtoJS.hs index 5cb01fac4..1730d62c4 100644 --- a/src/compiler/GF/Compile/PGFtoJS.hs +++ b/src/compiler/GF/Compile/PGFtoJS.hs @@ -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 diff --git a/src/compiler/GF/Compile/PGFtoLProlog.hs b/src/compiler/GF/Compile/PGFtoLProlog.hs index 670e3a952..2ab5a26d2 100644 --- a/src/compiler/GF/Compile/PGFtoLProlog.hs +++ b/src/compiler/GF/Compile/PGFtoLProlog.hs @@ -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 '.' $$ diff --git a/src/compiler/GF/Compile/PGFtoProlog.hs b/src/compiler/GF/Compile/PGFtoProlog.hs index 02993ac65..061d9e874 100644 --- a/src/compiler/GF/Compile/PGFtoProlog.hs +++ b/src/compiler/GF/Compile/PGFtoProlog.hs @@ -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 diff --git a/src/compiler/GF/Compile/PGFtoPython.hs b/src/compiler/GF/Compile/PGFtoPython.hs index 1877f8d70..608d74f96 100644 --- a/src/compiler/GF/Compile/PGFtoPython.hs +++ b/src/compiler/GF/Compile/PGFtoPython.hs @@ -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 -*-" ++++ diff --git a/src/compiler/GF/Compile/ReadFiles.hs b/src/compiler/GF/Compile/ReadFiles.hs index e5b85a0e8..de95cb30a 100644 --- a/src/compiler/GF/Compile/ReadFiles.hs +++ b/src/compiler/GF/Compile/ReadFiles.hs @@ -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 diff --git a/src/compiler/GF/Compile/Rename.hs b/src/compiler/GF/Compile/Rename.hs index 5c8b7bf20..7effded1d 100644 --- a/src/compiler/GF/Compile/Rename.hs +++ b/src/compiler/GF/Compile/Rename.hs @@ -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 diff --git a/src/compiler/GF/Compile/Tags.hs b/src/compiler/GF/Compile/Tags.hs index ccb47a219..16391c61b 100644 --- a/src/compiler/GF/Compile/Tags.hs +++ b/src/compiler/GF/Compile/Tags.hs @@ -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 diff --git a/src/compiler/GF/Compile/ToAPI.hs b/src/compiler/GF/Compile/ToAPI.hs index e118ea208..2fdbea360 100644 --- a/src/compiler/GF/Compile/ToAPI.hs +++ b/src/compiler/GF/Compile/ToAPI.hs @@ -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 diff --git a/src/compiler/GF/Compile/TypeCheck/Abstract.hs b/src/compiler/GF/Compile/TypeCheck/Abstract.hs index dfded01d2..1fa4c01c6 100644 --- a/src/compiler/GF/Compile/TypeCheck/Abstract.hs +++ b/src/compiler/GF/Compile/TypeCheck/Abstract.hs @@ -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 = diff --git a/src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs b/src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs index 583d614d3..301f1da0b 100644 --- a/src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs +++ b/src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs @@ -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 diff --git a/src/compiler/GF/Compile/TypeCheck/TC.hs b/src/compiler/GF/Compile/TypeCheck/TC.hs index 5a7fa9479..5dd276303 100644 --- a/src/compiler/GF/Compile/TypeCheck/TC.hs +++ b/src/compiler/GF/Compile/TypeCheck/TC.hs @@ -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 |