git.iko.soy/patch
on develop help sign in
More fixes for GHC 7.8 related AMP
1dba94eBenno Fünfstück
src/Reflex/Class.hs+4−2
compare with develop
unifiedsplit
@@ -1,8 +1,7 @@
1{-# LANGUAGE TypeFamilies, FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, RankNTypes, GADTs, ScopedTypeVariables, FunctionalDependencies, RecursiveDo, UndecidableInstances, GeneralizedNewtypeDeriving, StandaloneDeriving, EmptyDataDecls, NoMonomorphismRestriction, TypeOperators, DeriveDataTypeable, PackageImports, TemplateHaskell, LambdaCase #-}
1{-# LANGUAGE TypeFamilies, FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, RankNTypes, GADTs, ScopedTypeVariables, FunctionalDependencies, RecursiveDo, UndecidableInstances, GeneralizedNewtypeDeriving, StandaloneDeriving, EmptyDataDecls, NoMonomorphismRestriction, TypeOperators, DeriveDataTypeable, PackageImports, TemplateHaskell, LambdaCase #-}
2module Reflex.Class where
2module Reflex.Class where
3
3
4−import Prelude hiding (mapM, mapM_, sequence, sequence_, foldl)
4+import Control.Applicative
5−
6import Control.Monad.Identity hiding (mapM, mapM_, forM, forM_, sequence, sequence_)
5import Control.Monad.Identity hiding (mapM, mapM_, forM, forM_, sequence, sequence_)
7import Control.Monad.State.Strict hiding (mapM, mapM_, forM, forM_, sequence, sequence_)
6import Control.Monad.State.Strict hiding (mapM, mapM_, forM, forM_, sequence, sequence_)
8import Control.Monad.Reader hiding (mapM, mapM_, forM, forM_, sequence, sequence_)
7import Control.Monad.Reader hiding (mapM, mapM_, forM, forM_, sequence, sequence_)
@@ -23,6 +22,9 @@ import Data.Functor.Misc
23import Data.Semigroup
22import Data.Semigroup
24import Data.Traversable
23import Data.Traversable
25
24
25+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
26+import Prelude hiding (mapM, mapM_, sequence, sequence_, foldl)
27+
26import Debug.Trace (trace)
28import Debug.Trace (trace)
27
29
28class (MonadHold t (PushM t), MonadSample t (PullM t), Functor (Event t), Functor (Behavior t)) => Reflex t where
30class (MonadHold t (PushM t), MonadSample t (PullM t), Functor (Event t), Functor (Behavior t)) => Reflex t where
src/Reflex/Spider/Internal.hs+3−2
@@ -1,8 +1,6 @@
1{-# LANGUAGE CPP, ExistentialQuantification, GADTs, ScopedTypeVariables, TypeFamilies, FlexibleInstances, MultiParamTypeClasses, GeneralizedNewtypeDeriving, RankNTypes, BangPatterns, UndecidableInstances, EmptyDataDecls, RecursiveDo, RoleAnnotations, LambdaCase #-}
1{-# LANGUAGE CPP, ExistentialQuantification, GADTs, ScopedTypeVariables, TypeFamilies, FlexibleInstances, MultiParamTypeClasses, GeneralizedNewtypeDeriving, RankNTypes, BangPatterns, UndecidableInstances, EmptyDataDecls, RecursiveDo, RoleAnnotations, LambdaCase #-}
2module Reflex.Spider.Internal where
2module Reflex.Spider.Internal where
3
3
4−import Prelude hiding (mapM, mapM_, any, sequence, concat)
5−
6import qualified Reflex.Class as R
4import qualified Reflex.Class as R
7import qualified Reflex.Host.Class as R
5import qualified Reflex.Host.Class as R
8
6
@@ -29,6 +27,9 @@ import System.IO.Unsafe
29import Unsafe.Coerce
27import Unsafe.Coerce
30import Control.Monad.Primitive
28import Control.Monad.Primitive
31
29
30+-- Note: must come last to silence warnings due to AMP on GHC < 7.10
31+import Prelude hiding (mapM, mapM_, any, sequence, concat)
32+
32debugPropagate :: Bool
33debugPropagate :: Bool
33
34
34debugInvalidateHeight :: Bool
35debugInvalidateHeight :: Bool