git.iko.soy/reflex-dom
on develop help sign in
Fix build with ghc 7.10
commit0d7665f77c2c56035c22d5445418f1d1f5b55fdc authorLuigy Leon <luigy@outlook.com> dateTue 13 Jun 2017, 21:09 (9 years ago) parent21087a7
3 files changed+19−6
compare with develop
unifiedsplit
reflex-dom-core/src/Foreign/JavaScript/Orphans.hs+12−6 reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+3 reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+4
reflex-dom-core/src/Foreign/JavaScript/Orphans.hs+12−6
@@ -16,13 +16,19 @@ import Reflex.Requester.Base (RequesterT)
1616import Reflex.TriggerEvent.Base
1717import Reflex.Query.Base (QueryT)
1818
19−instance (MonadJSM m, ReflexHost t) => MonadJSM (PostBuildT t m)
19+instance (MonadJSM m, ReflexHost t) => MonadJSM (PostBuildT t m) where
20+ liftJSM' = lift . liftJSM'
2021instance (MonadJSM (HostFrame t), ReflexHost t) => MonadJSM (PerformEventT t m) where
2122 liftJSM' = PerformEventT . lift . liftJSM'
22−instance MonadJSM m => MonadJSM (DynamicWriterT t w m)
23−instance MonadJSM m => MonadJSM (EventWriterT t w m)
24−instance MonadJSM m => MonadJSM (RequesterT t request response m)
25−instance MonadJSM m => MonadJSM (TriggerEventT t m)
26−instance MonadJSM m => MonadJSM (QueryT t q m)
23+instance MonadJSM m => MonadJSM (DynamicWriterT t w m) where
24+ liftJSM' = lift . liftJSM'
25+instance MonadJSM m => MonadJSM (EventWriterT t w m) where
26+ liftJSM' = lift . liftJSM'
27+instance MonadJSM m => MonadJSM (RequesterT t request response m) where
28+ liftJSM' = lift . liftJSM'
29+instance MonadJSM m => MonadJSM (TriggerEventT t m) where
30+ liftJSM' = lift . liftJSM'
31+instance MonadJSM m => MonadJSM (QueryT t q m) where
32+ liftJSM' = lift . liftJSM'
2733
2834#endif
reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+3
@@ -7,6 +7,9 @@
77{-# LANGUAGE FlexibleInstances #-}
88{-# LANGUAGE FunctionalDependencies #-}
99{-# LANGUAGE GeneralizedNewtypeDeriving #-}
10+#if !MIN_VERSION_base(4,9,0)
11+{-# LANGUAGE ImpredicativeTypes #-}
12+#endif
1013{-# LANGUAGE LambdaCase #-}
1114{-# LANGUAGE MultiParamTypeClasses #-}
1215{-# LANGUAGE OverloadedStrings #-}
reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+4
@@ -760,7 +760,11 @@ instance (Reflex t, MonadAdjust t m, MonadJSM m, MonadHold t m, MonadFix m, Prim
760760 mapM_ (\(k :=> v) -> void $ placeFragment k v) $ DMap.toDescList p -- We need to go in reverse order here, to make sure the placeholders are in the right spot at the right time
761761 liftIO $ writeIORef placeholders $! phsAfter
762762
763+#if MIN_VERSION_base(4,9,0)
763764data ChildReadyState k
765+#else
766+data ChildReadyState (k :: * -> *)
767+#endif
764768 = ChildReadyState_Ready
765769 | ChildReadyState_Unready !(Maybe (Some k))
766770 deriving (Show, Read, Eq, Ord)