Fri Dec 3 19:59:31 PST 2010 John Meacham <[email protected]> * Fix a lot of compiler warnings, clean up dependencies.
New patches:
[Fix a lot of compiler warnings, clean up dependencies. John Meacham <[email protected]>**20101204035931 Ignore-this: 7524be06d3ca6cd957316e50451b7208 ] hunk ./src/C/Generate.hs 75 import Char import Control.Monad.RWS import Control.Monad.Writer -import Control.Monad import Data.List(intersperse) import Data.Maybe(isNothing) hunk ./src/C/Generate.hs 77 -import Data.Monoid import Numeric import Text.PrettyPrint.HughesPJ(Doc,render,nest,($$),($+$)) import qualified Data.Foldable as Seq hunk ./src/Cmm/OpEval.hs 11 unOp ) where -import Cmm.Number -import Cmm.Op -import Control.Monad import Maybe import qualified Data.Map as Map hunk ./src/Cmm/OpEval.hs 14 +import Cmm.Number +import Cmm.Op + class Expression t e | e -> t where toConstant :: e -> Maybe (Number,t) hunk ./src/DerivingDrift/Drift.hs 5 import Char import List -import Control.Monad.Identity +import qualified Data.Map as Map import DerivingDrift.DataP import DerivingDrift.StandardRules hunk ./src/DerivingDrift/Drift.hs 10 import FrontEnd.HsParser -import FrontEnd.ParseMonad import FrontEnd.HsSyn hunk ./src/DerivingDrift/Drift.hs 11 +import FrontEnd.ParseMonad import Name.Name import Name.Names import Options hunk ./src/DerivingDrift/Drift.hs 16 import Text.PrettyPrint.HughesPJ(render) -import qualified Data.Map as Map -import qualified FlagDump as FD import Util.Gen hunk ./src/DerivingDrift/Drift.hs 17 +import qualified FlagDump as FD driftDerive :: HsModule -> IO HsModule driftDerive hsModule = ans where hunk ./src/DerivingDrift/StandardRules.hs 4 module DerivingDrift.StandardRules (standardRules) where import DerivingDrift.RuleUtils -import List import Name.Prim import Name.Name import qualified Data.Map as Map hunk ./src/Doc/Pretty.hs 1 -{-# OPTIONS -fno-monomorphism-restriction #-} +{-# LANGUAGE NoMonomorphismRestriction #-} ----------------------------------------------------------- -- Daan Leijen (c) 2000, http://www.cs.uu.nl/~daan -- modified by John Meacham 2003 hunk ./src/E/Binary.hs 5 import Data.Binary import E.Type -import Monad import Name.Binary() import FrontEnd.HsSyn() import {-# SOURCE #-} Info.Binary(putInfo,getInfo) hunk ./src/E/E.hs 13 ) where import Char(chr) -import qualified Data.Traversable as T -import List import Maybe hunk ./src/E/E.hs 14 +import qualified Data.Traversable as T hunk ./src/E/E.hs 16 -import E.FreeVars -import C.Prims import Control.Monad.Identity hunk ./src/E/E.hs 17 +import C.Prims +import E.FreeVars import E.Type import Name.Id import Name.Name hunk ./src/E/Eta.hs 17 import Control.Monad.Identity import Control.Monad.Writer import Control.Monad.State -import Data.Monoid import Data.Typeable hunk ./src/E/Eta.hs 18 -import Maybe import DataConstructors import E.Annotate hunk ./src/E/Eta.hs 80 andArityType (AFun t1 at1) (AFun t2 at2) = AFun (t1 && t2) (andArityType at1 at2) andArityType at1 at2 = andArityType at2 at1 -lamann _ nfo = return nfo annotateArity e nfo = annotateArity' (arityType e) nfo hunk ./src/E/Eta.hs 158 -> m (Maybe (TVr,E)) etaExpandDef _ _ _ e | isAtomic e = return Nothing -- will be inlined etaExpandDef dataTable min t e = ans where - fvs = foldr insert (freeVars (b,map getType rs,(tvrType t,e))) (map tvrIdent rs) `mappend` collectIds e - (b,rs) = fromLam e + --fvs = foldr insert (freeVars (b,map getType rs,(tvrType t,e))) (map tvrIdent rs) `mappend` collectIds e + --(b,rs) = fromLam e at = arityType e zeroName = case fromAp e of (EVar v,_) -> "use.{" ++ tvrShowName v hunk ./src/E/Eval.hs 12 import Doc.DocLike import Doc.PPrint import E.E -import E.FreeVars import {-# SOURCE #-} E.Show import E.Subst import Name.Id hunk ./src/E/PrimOpt.hs 7 processPrimPrim ) where -import List -import Monad import Control.Monad.Fix() import Maybe hunk ./src/E/PrimOpt.hs 10 -import StringTable.Atom import C.Prims hunk ./src/E/PrimOpt.hs 11 +import Cmm.Op(stringToOpTy) import Cmm.OpEval hunk ./src/E/PrimOpt.hs 13 -import DataConstructors import Data.Monoid hunk ./src/E/PrimOpt.hs 14 +import DataConstructors import Doc.DocLike import Doc.PPrint import E.E hunk ./src/E/PrimOpt.hs 20 import E.Values import GenUtil -import Name.Id import Stats hunk ./src/E/PrimOpt.hs 21 +import StringTable.Atom import Support.CanType import Support.FreeVars import qualified Cmm.Op as Op hunk ./src/E/PrimOpt.hs 25 -import Cmm.Op(stringToOpTy) {...@extensions hunk ./src/E/SSimplify.hs 15 import Util.RWS import Control.Monad.Identity -import Control.Monad.Reader import Data.Typeable hunk ./src/E/SSimplify.hs 16 -import Data.Monoid import Debug.Trace import List hiding(delete,union,insert) import Data.Maybe hunk ./src/E/SSimplify.hs 57 import qualified FlagOpts as FO import qualified Info.Info as Info -import System.Random - type Bind = (TVr,E) data Occurance = hunk ./src/E/Subst.hs 42 import Control.Monad.Reader import qualified Data.Traversable as T -import List hiding(union,insert,delete) +import qualified Data.Set as Set hunk ./src/E/Subst.hs 44 -import Name.Names import E.E import E.FreeVars() hunk ./src/E/Subst.hs 46 +import GenUtil import Name.Id hunk ./src/E/Subst.hs 48 +import Name.Names import Support.FreeVars hunk ./src/E/Subst.hs 50 -import GenUtil -import Util.SetLike as S import Util.HasSize hunk ./src/E/Subst.hs 51 - -import qualified Data.Set as Set +import Util.SetLike as S --eLetRec :: [(TVr,E)] -> E -> E --eLetRec ds e = f (filter ((/= emptyId) . tvrIdent . fst) ds) where hunk ./src/E/Traverse.hs 20 import qualified Data.Traversable as T import E.E -import E.FreeVars(caseUpdate) -import E.Type import Name.Id import Util.Gen import Util.HasSize hunk ./src/E/Type.hs 5 module E.Type where -import Maybe -import Control.Monad.Identity -import Data.Traversable import Data.Foldable hiding(concat) hunk ./src/E/Type.hs 6 -import Control.Applicative +import Data.Traversable hunk ./src/E/Type.hs 9 -import StringTable.Atom +import Cmm.Number import C.Prims import Doc.DocLike hiding((<$>)) hunk ./src/E/Type.hs 12 +import Info.Types import Name.Id hunk ./src/E/Type.hs 14 -import Util.Gen import Name.Name import Name.Names hunk ./src/E/Type.hs 16 -import Cmm.Number -import Info.Types +import StringTable.Atom +import Util.Gen import qualified Info.Info as Info {- @Internals hunk ./src/E/Values.hs 3 module E.Values where -import Char import Control.Monad.Identity import Data.Monoid import List hunk ./src/E/WorkerWrapper.hs 4 module E.WorkerWrapper(performWorkWrap,workWrapProgram) where import Control.Monad.Writer.Strict hiding(Product(..)) -import Data.Monoid hiding(Product(..)) import Maybe hunk ./src/E/WorkerWrapper.hs 5 -import Monad import DataConstructors import E.CPR hunk ./src/E/WorkerWrapper.hs 9 import E.E -import E.FreeVars import E.Program import E.Traverse import E.TypeCheck() hunk ./src/FrontEnd/FrontEnd.hs 7 ) where import Monad -import Data.Monoid import qualified Data.Map as Map hunk ./src/FrontEnd/FrontEnd.hs 9 -import Name.Name import Doc.DocLike import FrontEnd.Exports hunk ./src/FrontEnd/FrontEnd.hs 11 +import FrontEnd.HsSyn import FrontEnd.Rename import FrontEnd.SrcLoc hunk ./src/FrontEnd/FrontEnd.hs 14 -import GenUtil -import Ho.Collected +import FrontEnd.Warning import Ho.Type hunk ./src/FrontEnd/FrontEnd.hs 16 -import FrontEnd.HsSyn +import Name.Name import Options hunk ./src/FrontEnd/FrontEnd.hs 18 -import FrontEnd.Warning import qualified FlagDump as FD import qualified FrontEnd.Tc.Module as Tc hunk ./src/FrontEnd/FrontEnd.hs 34 wdump FD.Progress $ do putErrLn $ "Compiling " ++ show fs compileModules fs ifunc (doModules func) --} -- Process modules found by Ho doModules :: (CollectedHo -> Ho -> Tc.TiData -> IO (CollectedHo,Ho)) -> CollectedHo -> [HsModule] -> IO (CollectedHo,Ho) hunk ./src/FrontEnd/FrontEnd.hs 46 --(ho',tiData) <- Tc.tiModules' ho ms (htc,tiData) <- Tc.tiModules (hoTcInfo (choHo ho)) ms func ho mempty { hoTcInfo = htc } tiData +-} -- Process modules found by Ho doModules' :: HoTcInfo -> [HsModule] -> IO (HoTcInfo,Tc.TiData) hunk ./src/FrontEnd/KindInfer.hs 20 getConstructorKinds ) where -import Control.Monad.Reader -import Data.List -import qualified Data.Traversable as T -import Util.Inst() -import Data.Maybe import Control.Monad.Identity hunk ./src/FrontEnd/KindInfer.hs 21 +import Control.Monad.Reader import Control.Monad.Writer import Data.Generics import Data.IORef hunk ./src/FrontEnd/KindInfer.hs 25 -import Data.Monoid -import qualified Data.Map as Map +import Data.List +import Data.Binary import System.IO.Unsafe hunk ./src/FrontEnd/KindInfer.hs 28 +import Util.Inst() +import qualified Data.Map as Map +import qualified Data.Traversable as T hunk ./src/FrontEnd/KindInfer.hs 32 -import Data.Binary import Doc.DocLike import Doc.PPrint hunk ./src/FrontEnd/KindInfer.hs 34 -import FrontEnd.Tc.Type +import FrontEnd.HsSyn import FrontEnd.Tc.Kind hunk ./src/FrontEnd/KindInfer.hs 36 +import FrontEnd.Tc.Type import FrontEnd.Utils hunk ./src/FrontEnd/KindInfer.hs 38 -import GenUtil -import Support.FreeVars -import FrontEnd.HsSyn -import Support.MapBinaryInstance import Name.Name hunk ./src/FrontEnd/KindInfer.hs 39 -import qualified Util.Seq as Seq -import qualified FlagDump as FD import Options hunk ./src/FrontEnd/KindInfer.hs 40 +import Support.FreeVars +import Support.MapBinaryInstance import Util.ContextMonad hunk ./src/FrontEnd/KindInfer.hs 43 +import Util.Gen import Util.HasSize hunk ./src/FrontEnd/KindInfer.hs 45 +import qualified FlagDump as FD +import qualified Util.Seq as Seq data KindEnv = KindEnv { hunk ./src/FrontEnd/Rename.hs 21 import qualified Data.Foldable as Seq import Util.SetLike -import Util.GMap import Doc.DocLike(tupled) import FrontEnd.Desugar (doToExp,listCompToExp) import FrontEnd.HsSyn hunk ./src/FrontEnd/Rename.hs 58 deriving(Eq) data Env = Env { - envSubTable :: Map.Map HsName HsName, - errorTable :: Map.Map HsName String, envModule :: Module, envNameMap :: Map.Map Name (Either String Name), envOptions :: Opt, hunk ./src/FrontEnd/Rename.hs 77 = let nn = hsName in (nn,nn):r -- | otherwise = error $ "strong bad: " ++ show hsName | otherwise = let nn = toUnqualified hsName in (nn,hsName):(hsName,hsName):r - f r z@(getModule -> Nothing) = let nn = qualifyName mod z in (z,nn):(nn,nn):r + f r z = let nn = qualifyName mod z in (z,nn):(nn,nn):r z ns = mapM mult (filter (\x -> length x > 1) $ groupBy (\a b -> fst a == fst b) (sort ns)) mult xs@(~((n,sl):_)) = warn sl "multiply-defined" (show n ++ " is defined multiple times: " ++ show xs) z cdefs hunk ./src/FrontEnd/Rename.hs 81 - let cn k (Right x) (Right y) | x /= y = Left $ ambig k [x,y] - cn _ _ x...@left {} = x - cn _ x _ = x +-- let cn k (Right x) (Right y) | x /= y = Left $ ambig k [x,y] +-- cn _ _ x...@left {} = x +-- cn _ x _ = x withSubTable (fromList nmap) action --local ( \e -> e { envNameMap = Map.unionWithKey cn (Map.map Right (fromList nmap)) (envNameMap e) }) action hunk ./src/FrontEnd/Representation.hs 41 import Control.Monad.Identity import Data.IORef -import Text.PrettyPrint.HughesPJ(Doc) import Data.Binary import Doc.DocLike hunk ./src/FrontEnd/Representation.hs 45 import Doc.PPrint -import FrontEnd.HsSyn import Name.Name import Name.Names import Support.CanType hunk ./src/FrontEnd/Representation.hs 49 import Name.VConsts -import qualified Doc.DocLike as D import Support.Unparse import Util.VarName import FrontEnd.Tc.Kind hunk ./src/FrontEnd/SrcLoc.hs 5 import Control.Monad.Writer import Control.Monad.Identity -import Control.Monad import Control.Applicative import Data.Traversable import Data.Foldable hunk ./src/FrontEnd/SrcLoc.hs 9 -import Data.Monoid import Data.Generics import Data.Binary hunk ./src/FrontEnd/Tc/Main.hs 3 module FrontEnd.Tc.Main (tiExpr, tiProgram, makeProgram, isTypePlaceholder ) where +import Control.Monad.Reader import Control.Monad.Writer import Data.Graph(stronglyConnComp, SCC(..)) hunk ./src/FrontEnd/Tc/Main.hs 6 -import IO(hFlush,stdout) -import List +import System.IO(hPutStr,stderr) import qualified Data.Map as Map import qualified Data.Set as Set import qualified Text.PrettyPrint.HughesPJ as P hunk ./src/FrontEnd/Tc/Main.hs 10 -import System.IO(hPutStr,stderr) hunk ./src/FrontEnd/Tc/Main.hs 11 -import Doc.PPrint -import Control.Monad.Reader -import FrontEnd.DeclsDepends(getDeclDeps) -import FrontEnd.Diagnostic import Doc.DocLike import Doc.PPrint as PPrint hunk ./src/FrontEnd/Tc/Main.hs 13 -import FrontEnd.Desugar(doToExp) +import FrontEnd.DeclsDepends(getDeclDeps) +import FrontEnd.Diagnostic +import FrontEnd.HsPretty +import FrontEnd.HsSyn import FrontEnd.KindInfer import FrontEnd.SrcLoc import FrontEnd.Tc.Class hunk ./src/FrontEnd/Tc/Main.hs 20 +import FrontEnd.Tc.Kind import FrontEnd.Tc.Monad hiding(listenPreds) import FrontEnd.Tc.Type hunk ./src/FrontEnd/Tc/Main.hs 23 -import FrontEnd.Tc.Kind import FrontEnd.Tc.Unify import FrontEnd.Utils(getDeclName) import GenUtil hunk ./src/FrontEnd/Tc/Main.hs 26 -import FrontEnd.HsPretty -import FrontEnd.HsSyn import Name.Name import Name.Names import Name.VConsts hunk ./src/FrontEnd/Tc/Main.hs 31 import Options import Support.FreeVars +import Util.Progress import qualified FlagDump as FD import qualified FlagOpts as FO hunk ./src/FrontEnd/Tc/Main.hs 34 -import Util.Progress listenPreds = listenSolvePreds hunk ./src/FrontEnd/TypeSynonyms.hs 14 import Control.Monad.Writer import Data.Binary import Data.List -import Data.Monoid import qualified Data.Map as Map import qualified Data.Set as Set hunk ./src/Grin/DeadCode.hs 7 import Control.Monad import Data.Monoid import qualified Data.Set as Set -import qualified Data.Map as Map hunk ./src/Grin/DeadCode.hs 8 -import StringTable.Atom import Fixer.Fixer import Fixer.Supply import Grin.Grin hunk ./src/Grin/DeadCode.hs 14 import Grin.Noodle import Grin.Whiz import Stats hiding(print, singleton) +import StringTable.Atom import Support.CanType import Support.FreeVars hunk ./src/Grin/DeadCode.hs 17 -import Util.SetLike hiding(Value) import Util.Gen hunk ./src/Grin/DeadCode.hs 18 +import Util.SetLike hiding(Value) implies :: Value Bool -> Value Bool -> Rule hunk ./src/Grin/Devolve.hs 11 import qualified Data.Map as Map import qualified Data.Set as Set -import Util.Gen -import Util.SetLike -import Support.Transform -import Support.CanType import Grin.Grin import Grin.Noodle hunk ./src/Grin/Devolve.hs 13 -import Support.FreeVars import Options (verbose,fopts) hunk ./src/Grin/Devolve.hs 14 +import Support.FreeVars +import Support.Transform +import Util.Gen +import Util.SetLike import qualified FlagOpts as FO {-# NOINLINE devolveTransform #-} hunk ./src/Grin/EvalInline.hs 7 import Control.Monad.Identity import List hiding(union) import qualified Data.Set as Set -import qualified Data.Map as Map import Util.SetLike hunk ./src/Grin/Grin.hs 61 import Data.Monoid import List(isPrefixOf) import Prelude -import qualified Data.Map as Map import qualified Data.Set as Set import C.FFI hunk ./src/Grin/Lint.hs 156 genAssign "assign" a (Left $ funRet fn i) f bs e = do zipWithM_ (assign "assign") bs (map ValUnknown (getType e)) - app n as | Just (0,fn) <- tagUnfunction n = do - hPrintf h "lazyfunc(%s).\n" (dshow fn) - forM_ (zip naturals as) $ \ (i,a) -> do - assign "assign" (Left $ funArg fn i) a - app _ _ = return () + --app n as | Just (0,fn) <- tagUnfunction n = do + -- hPrintf h "lazyfunc(%s).\n" (dshow fn) + -- forM_ (zip naturals as) $ \ (i,a) -> do + -- assign "assign" (Left $ funArg fn i) a + --app _ _ = return () assign op b v = genAssign op b (Right v) hunk ./src/Grin/Noodle.hs 9 import qualified Data.Set as Set import C.Prims -import Data.Functor import Debug.Trace import Grin.Grin import Options(flint) hunk ./src/Grin/Optimize.hs 77 fixupLet exp = return exp dropAny mv (exp::Exp) = do (nn,xs) <- get - let (reachable',graph) = newGraphReachable xs pexpUniq pexpDeps + let (reachable',_graph) = newGraphReachable xs pexpUniq pexpDeps deps = justDeps xs (freeVars exp) reached = reachable' deps --dropped = case prefered reached exp of hunk ./src/Grin/SSimplify.hs 3 module Grin.SSimplify(simplify,explicitRecurse) where -import qualified Data.IntSet as IS +import Control.Monad.Identity +import Control.Monad.Reader +import Control.Monad.Writer +import Control.Monad.State +import Data.Maybe import qualified Data.IntMap as IM hunk ./src/Grin/SSimplify.hs 9 +import qualified Data.IntSet as IS import qualified Data.Map as Map import qualified Data.Set as Set hunk ./src/Grin/SSimplify.hs 12 -import Control.Monad.Identity -import Data.Maybe hunk ./src/Grin/SSimplify.hs 13 -import Support.Tickle -import StringTable.Atom import Grin.Grin import Grin.Noodle hunk ./src/Grin/SSimplify.hs 15 +import Stats(mtick) +import StringTable.Atom +import Support.CanType +import Support.FreeVars +import Support.Tickle +import Util.GMap import Util.Gen hunk ./src/Grin/SSimplify.hs 22 +import Util.HasSize import Util.RWS hunk ./src/Grin/SSimplify.hs 24 -import Util.GMap import Util.SetLike hunk ./src/Grin/SSimplify.hs 25 -import Util.HasSize -import Support.CanType -import Support.FreeVars import qualified Stats hunk ./src/Grin/SSimplify.hs 26 -import Stats(mtick) -- This goes through and puts grin into a normal form, in addition, it carries out some straightforward -- simplifications. hunk ./src/Grin/Show.hs 14 import Control.Monad.Writer import Data.Maybe import IO -import Monad import qualified Data.Map as Map import qualified Data.Set as Set hunk ./src/Grin/StorageAnalysis.hs 4 module Grin.StorageAnalysis(storeAnalyze) where import Control.Monad.Identity -import Control.Monad import Control.Monad.Writer import Data.Maybe import qualified Data.Map as Map hunk ./src/Grin/StorageAnalysis.hs 11 import Options import Grin.Grin -import Grin.Lint import Grin.Noodle import Grin.Val import StringTable.Atom hunk ./src/Grin/StorageAnalysis.hs 14 -import Support.CanType import Support.FreeVars import Support.Tickle import Util.Gen hunk ./src/Ho/Build.hs 25 import System.Directory (removeFile) import System.Random (randomIO) import Text.Printf -import Version.Config(version) import qualified Data.ByteString as BS import qualified Data.ByteString.Lazy as LBS import qualified Data.ByteString.Lazy.UTF8 as LBSU hunk ./src/Ho/Build.hs 57 import Ho.Type import Name.Name import Options -import Options import PackedString(PackedString,packString,unpackPS) import RawFiles(prelude_m4) import Util.FilterInput hunk ./src/Info/Info.hs 23 ) where import Data.Dynamic -import Data.Generics import Data.Monoid hunk ./src/Info/Info.hs 24 -import Monad import qualified Data.List as List import GenUtil hunk ./src/Interactive.hs 6 import Control.Exception as CE import Control.Monad.Identity import Control.Monad.Reader -import Control.Monad.Trans import Data.Monoid import IO(stdout) import List(sort,isPrefixOf) hunk ./src/Interactive.hs 10 import Maybe -import Monad import System import Text.Regex import qualified Data.Map as Map hunk ./src/Interactive.hs 13 -import qualified Text.PrettyPrint.HughesPJ as P import DataConstructors hunk ./src/Interactive.hs 30 import FrontEnd.Desugar(desugarHsStmt) import GenUtil import Ho.Type -import Ho.Collected import FrontEnd.HsPretty() import FrontEnd.HsSyn import Support.Compat hunk ./src/Main.hs 99 progressM c = wdump FD.Progress $ (c >>= putErrLn) >> hFlush stderr - - - - - - - - hunk ./src/Name/Id.hs 39 import Control.Monad.Reader import Control.Monad.State import Data.Bits -import Data.Foldable import Data.Int import Data.Word import Data.Monoid hunk ./src/Name/Id.hs 42 -import Data.Traversable -import Data.Typeable -import System.Random import qualified Data.Binary as B import qualified Data.IntMap as IM import qualified Data.IntSet as IS hunk ./src/Name/Id.hs 54 import Util.Inst() import Util.NameMonad import Util.SetLike as S -import Util.GMap --import Debug.Trace {- hunk ./src/PackedString.hs 53 ) where import Data.Typeable -import Data.Char import Data.Int import Data.Binary import Data.List hunk ./src/PackedString.hs 60 import qualified Data.ByteString.UTF8 as BSU import Bits -import GHC.Exts -import Word import Data.Monoid instance Monoid PackedString where hunk ./src/Support/CFF.hs 2 {-# OPTIONS -funbox-strict-fields -O2 #-} +{-# LANGUAGE BangPatterns #-} -- chunked file format. -- A generalization of the PNG format for user defined file formats. hunk ./src/Support/CFF.hs 17 isPrivate, isSafeToCopy, readCFFHeader, + readCFFInfo, readCFF, bsCFF, lbsCFF, hunk ./src/Support/CFF.hs 27 writeCFF )where -import Control.Concurrent.MVar import Control.Monad import Data.Bits import Data.Char hunk ./src/Support/CFF.hs 30 -import Data.List import Data.Word hunk ./src/Support/CFF.hs 31 -import System import System.IO hunk ./src/Support/CFF.hs 32 -import System.IO.Unsafe import qualified Data.ByteString as BS import qualified Data.ByteString.Lazy as LBS hunk ./src/Support/CFF.hs 34 -import qualified Data.Map as Map type FileOffset = Word hunk ./src/Support/CFF.hs 175 readCFFInfo :: Handle -> IO (ChunkType,[(ChunkType,FileOffset,ChunkLength)]) readCFFInfo h = do cffType <- readCFFHeader h - let readChunk fo | fo `seq` True = do + let readChunk !fo = do b <- hIsEOF h if b then return [] else do len <- readWord32 h hunk ./src/Support/IniParse.hs 12 import qualified Data.Map as Map import qualified Data.Sequence as Seq import qualified Data.Foldable as Seq -import Control.Monad -- quick and dirty parser. hunk ./src/Support/MD5.hs 4 {-# OPTIONS -funbox-strict-fields -O2 #-} module Support.MD5(Hash(),emptyHash,md5,md5file,md5lazy,md5show32,md5Bytes,md5String,md5Handle,hashToBytes) where -import qualified Data.ByteString as BS -import qualified Data.ByteString.Lazy as LBS -import Data.Binary import Control.Monad hunk ./src/Support/MD5.hs 5 -import qualified Data.ByteString.Unsafe as BS +import Data.Binary +import Data.Char import Foreign import Foreign.C hunk ./src/Support/MD5.hs 9 -import Data.Bits -import Data.Word -import Data.Char import System.IO hunk ./src/Support/MD5.hs 10 +import qualified Data.ByteString as BS +import qualified Data.ByteString.Lazy as LBS +import qualified Data.ByteString.Unsafe as BS data Hash = Hash !Word32 !Word32 !Word32 !Word32 hunk ./src/Util/ContextMonad.hs 4 module Util.ContextMonad where import Control.Monad.Error -import Control.Monad class Monad m => ContextMonad c m | m -> c where hunk ./src/Util/FilterInput.hs 3 module Util.FilterInput (filterInput,readSystem) where -import Data.List import Control.Monad (when) hunk ./src/Util/FilterInput.hs 4 +import Data.List import System import System.IO import System.Posix hunk ./src/Util/FilterInput.hs 8 -import qualified Data.ByteString.Lazy as LBS -import qualified Data.ByteString.Lazy.UTF8 as LBSU -import qualified Data.ByteString as BS import Text.Printf import Util.Gen hunk ./src/Util/FilterInput.hs 10 +import qualified Data.ByteString as BS +import qualified Data.ByteString.Lazy as LBS filterInput :: String -> [String] -> Handle -> IO String hunk ./src/Util/GMap.hs 4 module Util.GMap where import Data.Monoid +import Util.HasSize import Util.SetLike import qualified Data.IntMap as IM import qualified Data.IntSet as IS hunk ./src/Util/GMap.hs 9 import qualified Data.Set as Set -import Util.HasSize -import Data.Foldable hiding(toList) -import Data.Traversable data family GMap k :: * -> * hunk ./src/Util/Gen.hs 6 module Util.Gen(module Util.Gen, module GenUtil, intercalate) where import Control.Monad.Writer -import Control.Monad.Identity -import Data.Monoid import Data.List hunk ./src/Util/Gen.hs 7 -import Directory -import System.IO import Data.Maybe hunk ./src/Util/Gen.hs 8 +import Directory import Text.ParserCombinators.ReadP import GenUtil hiding(replicateM, intercalate) hunk ./src/Util/NameMonad.hs 8 import qualified Data.Set as Set import Control.Monad.State -import Control.Monad.Trans -- | There are bound names and used names, the used names are always a superset of the bound names. -- used names will not be chosen for any new bindings, bound names should be renamed if encountered. hunk ./src/Util/Progress.hs 71 Just (k,p,t') = extract t toPercent :: Double -> Double -toPercent d = (/ 100) . fromIntegral $ round (d * 10000) +toPercent d = (/ 100) . fromInteger $ round (d * 10000) histogram :: Ord k => [k] -> (Int,[(k,Int)]) histogram ks = mapSnd toListByPriority (foldr f (0,Nil) ks) where hunk ./src/Util/UnionSolve.hs 69 instance (Show e,Show l) => Show (CL l e) where showsPrec _ (x `Clte` y) = seither x . showString " <= " . seither y showsPrec _ (x `Cset` l) = seither x . showString " := " . seither l + showsPrec _ (CLAnnotate s w) = showString s . showChar '@' . shows w -- basic constraints islte,isgte,equals :: Ord v => Either v l -> Either v l -> C l v hunk ./src/Util/UniqueMonad.hs 8 import Data.Unique import Control.Monad.State import Control.Monad.Reader -import Control.Monad.Writer import Control.Monad.Identity Context: [show text of exception when dumping core. John Meacham <[email protected]>**20100826091509 Ignore-this: 859d57d2a6184698e97f0083482b3039 ] [remove ePrettyEx John Meacham <[email protected]>**20100812102458 Ignore-this: 5ff9ed89d829f656c11012d75bab6f16 ] [clean up warnings John Meacham <[email protected]>**20100812102435 Ignore-this: 582526a443397ee875d3530d892b704d ] [clean up E showing, get rid of -dhtml mode, get rid of ANSI color coding, dump jhc_core to files on error John Meacham <[email protected]>**20100812101452 Ignore-this: ef81f8c50892ecfdda3b5a450d8fbac0 ] [when let-shrinking a tail, be sure to optimize function bodies John Meacham <[email protected]>**20100812054500 Ignore-this: eb1b56f28287a98b67bcd9c29d50ba82 ] [improve Grin Linting a little John Meacham <[email protected]>**20100812054446 Ignore-this: c7613a94c296e089a985904aa049d002 ] [add imported ghc typechecking regression tests John Meacham <[email protected]>**20100811014451 Ignore-this: 7f625abf2f8d562bc76b71396a7e03f0 ] [import ghc parsing regression tests John Meacham <[email protected]>**20100811002607 Ignore-this: 7a3676c7655fe26c52dd7eddd3c356dc ] [add 'skip' to regression options to skip certain tests John Meacham <[email protected]>**20100811002445 Ignore-this: 261b5e51fa22d7af25989ee078853590 ] [allow unicode characters in haskell source John Meacham <[email protected]>**20100810233304 Ignore-this: dd54c632455bd0660ff7b5170d81c8ed ] [add regex-compat to dependencies John Meacham <[email protected]>**20100810230216 Ignore-this: e7c03b8e187802ab75dbcc574614eabc ] [accept empty class contexts John Meacham <[email protected]>**20100810063832 Ignore-this: 9dea1ec61b874fcb3537b79b74b345df ] [add 'transformers' package to included libraries John Meacham <[email protected]>**20100810054906 Ignore-this: e27f376331b3fac2e3414145bf17a1c0 ] [fix desugaring of irrefutable lambda bindings John Meacham <[email protected]>**20100810053944 Ignore-this: 5c70934cbe42169850481562cd5b20f3 ] [add some strictness annotations John Meacham <[email protected]>**20100810053827 Ignore-this: 15ed2e2fc90656cc418a841848e43107 ] [clean ups John Meacham <[email protected]>**20100806112820 Ignore-this: 64c0ae0922073b65fc0dac4bd35ba968 ] [speed up name choosing a little John Meacham <[email protected]>**20100806111703 Ignore-this: ac159eeb0d34a7d26ad74253d00386ae ] [further seperate out concrete types to speed up checking John Meacham <[email protected]>**20100806092815 Ignore-this: f992ced583042d3c7797d4de93e3e3a8 ] [split type environment into concrete and mutable sets, to avoid retraversing the concrete imported types John Meacham <[email protected]>**20100806090349 Ignore-this: c276618b4b968d9149e6b3dfc36d162a ] [create a better relation representation, speed up export chasing signifigantly John Meacham <[email protected]>**20100806082622 Ignore-this: 9f49871e33348bbfc4e8fd2ee9fa71b8 ] [fix a few minor bugs in libraries found by better error reporting John Meacham <[email protected]>**20100806045809 Ignore-this: e7d43927c9e11b05de455a5d0ebd1017 ] [check export lists for unknown names John Meacham <[email protected]>**20100806045759 Ignore-this: 4b3ff8381117f2acae34dd6b936c8e8d ] [ret rid of seperate subtable and errortable in favor of unified namemap John Meacham <[email protected]>**20100806032455 Ignore-this: 9e8fbd31f988d77614bd49fc23cefae ] [treat () the same as tuples when renaming John Meacham <[email protected]>**20100806023948 Ignore-this: defa66a11f1081a4582a5301cff217e4 ] [move selector creation from desugar to renamer, detect multiply defined top level values and report an error properly. John Meacham <[email protected]>**20100806021241 Ignore-this: 507bce69ec8ffe0085c3a72ffc0ec571 ] [add initial version of jhc-prim John Meacham <[email protected]>**20100806000900 Ignore-this: 44a9f14db168b28d731fd750bba0fee9 ] [clean up preprocessing a little John Meacham <[email protected]>**20100803073754 Ignore-this: c1064468bed864231c2d5fb3a68bbeaf ] [utilize preprocessor rather than ./configure to handle System.Info John Meacham <[email protected]>**20100802100036 Ignore-this: 76681affa5b0269621974deeccda019b ] [fix some warnings John Meacham <[email protected]>**20100801083507 Ignore-this: fd350fd02d0ad5a611ee1811de28bce5 ] [fix build problem for tarball John Meacham <[email protected]>**20100801082137 Ignore-this: 33671b52398eef61afa670eb031ef575 ] [update strictness and UNPACK annotations John Meacham <[email protected]>**20100801080035 Ignore-this: e598a6098143c1a62373a443865b3cfb ] [add announcement for 0.7.6 John Meacham <[email protected]>**20100731111353 Ignore-this: 111c27548d94bdfe0042d61b02fe5728 ] [TAG 0.7.6 John Meacham <[email protected]>**20100731104908 Ignore-this: d5edc6edd6d300cbae451f0e056ee018 ] Patch bundle hash: d8316c7509e92ef7a75ef402ea4d1b83aa9c2ba7
_______________________________________________ jhc mailing list [email protected] http://www.haskell.org/mailman/listinfo/jhc
