git.iko.soy/patch
on develop help sign in
Clean up commented out code.
8c8bce9Luigy Leon
src/Reflex/Query/Base.hs−35
compare with develop
unifiedsplit
@@ -46,8 +46,6 @@ import qualified Reflex.Patch.MapWithMove as MapWithMove
46newtype QueryT t q m a = QueryT { unQueryT :: StateT [Behavior t q] (EventWriterT t q (ReaderT (Dynamic t (QueryResult q)) m)) a }
46newtype QueryT t q m a = QueryT { unQueryT :: StateT [Behavior t q] (EventWriterT t q (ReaderT (Dynamic t (QueryResult q)) m)) a }
47 deriving (Functor, Applicative, Monad, MonadException, MonadFix, MonadIO, MonadHold t, MonadSample t, MonadAtomicRef)
47 deriving (Functor, Applicative, Monad, MonadException, MonadFix, MonadIO, MonadHold t, MonadSample t, MonadAtomicRef)
48
48
49−-- deriving instance DomRenderHook t m => DomRenderHook t (QueryT t q m)
50−
51runQueryT :: (MonadFix m, Additive q, Group q, Reflex t) => QueryT t q m a -> Dynamic t (QueryResult q) -> m (a, Incremental t (AdditivePatch q))
49runQueryT :: (MonadFix m, Additive q, Group q, Reflex t) => QueryT t q m a -> Dynamic t (QueryResult q) -> m (a, Incremental t (AdditivePatch q))
52runQueryT (QueryT a) qr = do
50runQueryT (QueryT a) qr = do
53 ((r, bs), es) <- runReaderT (runEventWriterT (runStateT a mempty)) qr
51 ((r, bs), es) <- runReaderT (runEventWriterT (runStateT a mempty)) qr
@@ -191,45 +189,12 @@ instance PerformEvent t m => PerformEvent t (QueryT t q m) where
191 performEvent_ = lift . performEvent_
189 performEvent_ = lift . performEvent_
192 performEvent = lift . performEvent
190 performEvent = lift . performEvent
193
191
194−-- instance HasJS x m => HasJS x (QueryT t q m) where
195−-- type JSX (QueryT t q m) = JSX m
196−-- liftJS = lift . liftJS
197−
198−-- instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive q) => DomBuilder t (QueryT t q m) where
199−-- type DomBuilderSpace (QueryT t q m) = DomBuilderSpace m
200−-- textNode = liftTextNode
201−-- element elementTag cfg (QueryT child) = QueryT $ do
202−-- s <- get
203−-- let cfg' = cfg
204−-- { _elementConfig_eventSpec = _elementConfig_eventSpec cfg }
205−-- (e, (a, newS)) <- lift $ element elementTag cfg' $ runStateT child s
206−-- put newS
207−-- return (e, a)
208−
209−-- inputElement cfg = lift $ inputElement $ cfg & inputElementConfig_elementConfig %~ liftElementConfig
210−-- textAreaElement cfg = lift $ textAreaElement $ cfg & textAreaElementConfig_elementConfig %~ liftElementConfig
211−-- selectElement cfg (QueryT child) = QueryT $ do
212−-- s <- get
213−-- let cfg' = cfg & selectElementConfig_elementConfig %~ \c ->
214−-- c { _elementConfig_eventSpec = _elementConfig_eventSpec c }
215−-- (e, (a, newS)) <- lift $ selectElement cfg' $ runStateT child s
216−-- put newS
217−-- return (e, a)
218−-- placeRawElement = lift . placeRawElement
219−-- wrapRawElement e cfg = lift $ wrapRawElement e $ cfg
220−-- { _rawElementConfig_eventSpec = _rawElementConfig_eventSpec cfg
221−-- }
222−
223instance MonadRef m => MonadRef (QueryT t q m) where
192instance MonadRef m => MonadRef (QueryT t q m) where
224 type Ref (QueryT t q m) = Ref m
193 type Ref (QueryT t q m) = Ref m
225 newRef = QueryT . newRef
194 newRef = QueryT . newRef
226 readRef = QueryT . readRef
195 readRef = QueryT . readRef
227 writeRef r = QueryT . writeRef r
196 writeRef r = QueryT . writeRef r
228
197
229−-- instance HasJSContext m => HasJSContext (QueryT t q m) where
230−-- type JSContextPhantom (QueryT t q m) = JSContextPhantom m
231−-- askJSContext = QueryT askJSContext
232−
233instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (QueryT t q m) where
198instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (QueryT t q m) where
234 newEventWithTrigger = QueryT . newEventWithTrigger
199 newEventWithTrigger = QueryT . newEventWithTrigger
235 newFanEventWithTrigger a = QueryT . lift $ newFanEventWithTrigger a
200 newFanEventWithTrigger a = QueryT . lift $ newFanEventWithTrigger a
src/Reflex/Query/Class.hs+1−26
@@ -37,20 +37,9 @@ data QueryMorphism q q' = QueryMorphism
37 , _queryMorphism_mapQueryResult :: QueryResult q' -> QueryResult q
37 , _queryMorphism_mapQueryResult :: QueryResult q' -> QueryResult q
38 }
38 }
39
39
40−-- instance (Ord k, Query v) => Query (AppendMap k v) where
41−-- type QueryResult (AppendMap k v) = AppendMap k (QueryResult v)
42−-- crop q r = AppendMap.intersectionWith (flip crop) r q
43−
44−-- singletonQuery :: (Monoid (QueryResult q), Ord k) => k -> QueryMorphism q (AppendMap k q)
45−-- singletonQuery k = QueryMorphism { _queryMorphism_mapQuery = AppendMap.singleton k
46−-- , _queryMorphism_mapQueryResult = AppendMap.findWithDefault mempty k
47−-- }
48−
49-- | This type keeps track of the multiplicity of elements of the view selector that are being used by the app
40-- | This type keeps track of the multiplicity of elements of the view selector that are being used by the app
50newtype SelectedCount = SelectedCount { unSelectedCount :: Int }
41newtype SelectedCount = SelectedCount { unSelectedCount :: Int }
51− deriving (Eq, Ord, Show, Read, Integral, Num, Bounded, Enum, Real, Ix, Bits, FiniteBits, Storable, Data
42+ deriving (Eq, Ord, Show, Read, Integral, Num, Bounded, Enum, Real, Ix, Bits, FiniteBits, Storable, Data)
52− -- , ToJSON, FromJSON
53− )
54
43
55instance Semigroup SelectedCount where
44instance Semigroup SelectedCount where
56 SelectedCount a <> SelectedCount b = SelectedCount (a + b)
45 SelectedCount a <> SelectedCount b = SelectedCount (a + b)
@@ -68,20 +57,6 @@ instance Additive SelectedCount
68combineSelectedCounts :: SelectedCount -> SelectedCount -> Maybe SelectedCount
57combineSelectedCounts :: SelectedCount -> SelectedCount -> Maybe SelectedCount
69combineSelectedCounts (SelectedCount i) (SelectedCount j) = if i == negate j then Nothing else Just $ SelectedCount (i + j)
58combineSelectedCounts (SelectedCount i) (SelectedCount j) = if i == negate j then Nothing else Just $ SelectedCount (i + j)
70
59
71−-- class ( ToJSON (ViewSelector app SelectedCount), FromJSON (ViewSelector app SelectedCount)
72−-- , ToJSON (View app), FromJSON (View app)
73−-- , Monoid (ViewSelector app SelectedCount), Semigroup (ViewSelector app SelectedCount)
74−-- , Query (ViewSelector app SelectedCount), QueryResult (ViewSelector app SelectedCount) ~ View app
75−-- , Align (ViewSelector app)
76−-- , Eq (View app)
77−-- , Show (View app)
78−-- ) => HasView app where
79−-- type View app
80−-- type ViewSelector app :: * -> *
81−
82−-- cropView :: (Query q) => q -> QueryResult q -> QueryResult q
83−-- cropView = crop
84−
85class (Group q, Additive q, Query q) => MonadQuery t q m | m -> q t where
60class (Group q, Additive q, Query q) => MonadQuery t q m | m -> q t where
86 tellQueryIncremental :: Incremental t (AdditivePatch q) -> m ()
61 tellQueryIncremental :: Incremental t (AdditivePatch q) -> m ()
87 askQueryResult :: m (Dynamic t (QueryResult q))
62 askQueryResult :: m (Dynamic t (QueryResult q))