1dba94e · reflex · git.iko.soy

git.iko.soy/reflex

More fixes for GHC 7.8 related AMP

commit1dba94e50c3a80844eadd9031761849c91daab9d authorBenno Fünfstück <benno.fuenfstueck@gmail.com> dateMon 13 Jul 2015, 01:21 (11 years ago) parent9c6fc50

2 files changed+7−4

compare with develop

unifiedsplit

src/Reflex/Class.hs+4−2 src/Reflex/Spider/Internal.hs+3−2

src/Reflex/Class.hs+4−2

@@ -1,8 +1,7 @@

11{-# LANGUAGE TypeFamilies, FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, RankNTypes, GADTs, ScopedTypeVariables, FunctionalDependencies, RecursiveDo, UndecidableInstances, GeneralizedNewtypeDeriving, StandaloneDeriving, EmptyDataDecls, NoMonomorphismRestriction, TypeOperators, DeriveDataTypeable, PackageImports, TemplateHaskell, LambdaCase #-}

22module Reflex.Class where

4−import Prelude hiding (mapM, mapM_, sequence, sequence_, foldl)

5−

4+import Control.Applicative

65import Control.Monad.Identity hiding (mapM, mapM_, forM, forM_, sequence, sequence_)

76import Control.Monad.State.Strict hiding (mapM, mapM_, forM, forM_, sequence, sequence_)

87import Control.Monad.Reader hiding (mapM, mapM_, forM, forM_, sequence, sequence_)

@@ -23,6 +22,9 @@ import Data.Functor.Misc

2322import Data.Semigroup

2423import Data.Traversable

2524

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+

2628import Debug.Trace (trace)

2729

2830class (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 @@

11{-# LANGUAGE CPP, ExistentialQuantification, GADTs, ScopedTypeVariables, TypeFamilies, FlexibleInstances, MultiParamTypeClasses, GeneralizedNewtypeDeriving, RankNTypes, BangPatterns, UndecidableInstances, EmptyDataDecls, RecursiveDo, RoleAnnotations, LambdaCase #-}

22module Reflex.Spider.Internal where

4−import Prelude hiding (mapM, mapM_, any, sequence, concat)

5−

64import qualified Reflex.Class as R

75import qualified Reflex.Host.Class as R

@@ -29,6 +27,9 @@ import System.IO.Unsafe

2927import Unsafe.Coerce

3028import Control.Monad.Primitive

3129

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+

3233debugPropagate :: Bool

3334

3435debugInvalidateHeight :: Bool