on develop help sign in
A little more specialization cleanup
commit45d06f6cdf7dba8ebb47b01c97a66d26227e5079 authorRyan Trinkle <ryan.trinkle@gmail.com> dateSun 30 Oct 2016, 23:19 (10 years ago) parenteae5179
7 files changed+8−8
reflex.cabal+3 src/Reflex.hs−1 src/Reflex/Class.hs+3−2 src/Reflex/DynamicWriter.hs−1 src/Reflex/PerformEvent/Base.hs−1 src/Reflex/PostBuild/Class.hs−1 src/Reflex/Spider/Internal.hs+2−2
reflex.cabal+3
@@ -57,6 +57,7 @@ library
5757 Reflex.DynamicWriter,
5858 Reflex.Host.Class,
5959 Reflex.Optimizer,
60+ Reflex.Patch,
6061 Reflex.PerformEvent.Base,
6162 Reflex.PerformEvent.Class,
6263 Reflex.PostBuild.Class,
@@ -89,6 +90,8 @@ test-suite semantics
8990 reflex,
9091 split,
9192 transformers >= 0.3
93+ if flag(specialize-to-spidertimeline-global)
94+ buildable: False
9295
9396--test-suite hlint
9497-- type: exitcode-stdio-1.0
src/Reflex.hs−1
@@ -7,7 +7,6 @@ import Reflex.Dynamic as X
77import Reflex.Dynamic.TH as X
88import Reflex.Dynamic.Uniq as X
99import Reflex.DynamicWriter as X
10−import Reflex.Patch as X
1110import Reflex.PerformEvent.Class as X
1211import Reflex.PostBuild.Class as X
1312import Reflex.Spider as X
src/Reflex/Class.hs+3−2
@@ -22,8 +22,9 @@
2222-- convenience functions for working with 'Event's, 'Behavior's, and other
2323-- signals.
2424module Reflex.Class
25− ( -- * Primitives
26− Reflex (..)
25+ ( module Reflex.Patch
26+ -- * Primitives
27+ , Reflex (..)
2728 , coerceBehavior
2829 , coerceEvent
2930 , coerceDynamic
src/Reflex/DynamicWriter.hs−1
@@ -29,7 +29,6 @@ import qualified Data.Some as Some
2929import Reflex.Class
3030import Reflex.Dynamic
3131import Reflex.Host.Class
32−import Reflex.Patch
3332import Reflex.PerformEvent.Class
3433import Reflex.PostBuild.Class
3534
src/Reflex/PerformEvent/Base.hs−1
@@ -17,7 +17,6 @@ module Reflex.PerformEvent.Base where
1717
1818import Reflex.Class
1919import Reflex.Host.Class
20−import Reflex.Patch
2120import Reflex.PerformEvent.Class
2221import Reflex.PostBuild.Class
2322
src/Reflex/PostBuild/Class.hs−1
@@ -19,7 +19,6 @@ import Control.Monad.Trans.Control
1919import qualified Data.Dependent.Map as DMap
2020import Reflex.Class
2121import Reflex.Host.Class
22−import Reflex.Patch
2322import Reflex.PerformEvent.Class
2423
2524class (Reflex t, Monad m) => PostBuild t m | m -> t where
src/Reflex/Spider/Internal.hs+2−2
@@ -1853,7 +1853,7 @@ invalidate toReconnectRef wis = do
18531853--------------------------------------------------------------------------------
18541854
18551855-- | The default, global Spider environment
1856−type Spider = SpiderTimelineEnv Global
1856+type Spider = SpiderTimeline Global
18571857
18581858#ifndef SPECIALIZE_TO_SPIDERTIMELINE_GLOBAL
18591859-- When we're specializing, we include this from Reflex.Class instead, because
@@ -2202,4 +2202,4 @@ instance PrimMonad (SpiderHostFrame x) where
22022202--------------------------------------------------------------------------------
22032203
22042204{-# DEPRECATED SpiderEnv "Use 'SpiderTimelineEnv' instead" #-}
2205−type SpiderEnv = SpiderTimelineEnv
2205+type SpiderEnv = SpiderTimeline