a4fdb66 · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

on develop help sign in

Fix warnings

a4fdb66Tom Smalley8 years ago

reflex-dom-core/src/Reflex/Dom/Builder/Hydration.hs+13−10

compare with develop

unifiedsplit

@@ -12,6 +12,7 @@

12{-# LANGUAGE LambdaCase #-}

13{-# LANGUAGE MultiParamTypeClasses #-}

14{-# LANGUAGE OverloadedStrings #-}

15+{-# LANGUAGE PatternGuards #-}

15{-# LANGUAGE PolyKinds #-}

16{-# LANGUAGE PolyKinds #-}

16{-# LANGUAGE RankNTypes #-}

17{-# LANGUAGE RankNTypes #-}

17{-# LANGUAGE RecursiveDo #-}

18{-# LANGUAGE RecursiveDo #-}

@@ -54,7 +55,7 @@ module Reflex.Dom.Builder.Hydration

55import Control.Concurrent

56import Control.Concurrent

56import Control.Exception (bracketOnError)

57import Control.Exception (bracketOnError)

57−import Control.Lens hiding (element, ix)

58+import Control.Lens (Identity(..), imapM_, iforM_, (^.))

58import Control.Monad.Exception

59import Control.Monad.Exception

59import Control.Monad.Primitive

60import Control.Monad.Primitive

60import Control.Monad.Reader

61import Control.Monad.Reader

@@ -652,11 +653,11 @@ instance (SupportsHydrationDomBuilder t m) => DomBuilder t (HydrationDomBuilderT

652 type DomBuilderSpace (HydrationDomBuilderT t m) = HydrationDomSpace

653 type DomBuilderSpace (HydrationDomBuilderT t m) = HydrationDomSpace

653 {-# INLINABLE textNode #-}

654 {-# INLINABLE textNode #-}

654 textNode (TextNodeConfig initialContents mSetContents) = do

655 textNode (TextNodeConfig initialContents mSetContents) = do

655− t <- textNodeInternal initialContents mSetContents

656+ _ <- textNodeInternal initialContents mSetContents

656 return $ TextNode ()

657 return $ TextNode ()

657 {-# INLINABLE commentNode #-}

658 {-# INLINABLE commentNode #-}

658 commentNode (CommentNodeConfig initialContents mSetContents) = do

659 commentNode (CommentNodeConfig initialContents mSetContents) = do

659− c <- commentNodeInternal initialContents mSetContents

660+ _ <- commentNodeInternal initialContents mSetContents

660 return $ CommentNode ()

661 return $ CommentNode ()

661 {-# INLINABLE element #-}

662 {-# INLINABLE element #-}

662 element elementTag cfg child = do

663 element elementTag cfg child = do

@@ -1003,12 +1004,13 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m) =>

1003 let updateChildUnreadiness (p :: PatchDMapWithMove k (Compose (TraverseChild t m (Some k)) v')) old = do

1004 let updateChildUnreadiness (p :: PatchDMapWithMove k (Compose (TraverseChild t m (Some k)) v')) old = do

1004 let new :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> IO (PatchDMapWithMove.NodeInfo k (Constant (IORef (ChildReadyState (Some k)))) a)

1005 let new :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> IO (PatchDMapWithMove.NodeInfo k (Constant (IORef (ChildReadyState (Some k)))) a)

1005 new k = PatchDMapWithMove.nodeInfoMapFromM $ \case

1006 new k = PatchDMapWithMove.nodeInfoMapFromM $ \case

1006− PatchDMapWithMove.From_Insert (Compose (TraverseChild (Right myTypeImmediate) _)) -> do

1007+ PatchDMapWithMove.From_Insert (Compose (TraverseChild (Left _hydration) _)) -> return PatchDMapWithMove.From_Delete

1008+ PatchDMapWithMove.From_Insert (Compose (TraverseChild (Right immediate) _)) -> do

1007− readIORef (_traverseChildImmediate_childReadyState myTypeImmediate) >>= \case

1009+ readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case

1008 ChildReadyState_Ready -> return PatchDMapWithMove.From_Delete

1010 ChildReadyState_Ready -> return PatchDMapWithMove.From_Delete

1009 ChildReadyState_Unready _ -> do

1011 ChildReadyState_Unready _ -> do

1010− writeIORef (_traverseChildImmediate_childReadyState myTypeImmediate) $ ChildReadyState_Unready $ Just $ This k

1012+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ This k

1011− return $ PatchDMapWithMove.From_Insert $ Constant (_traverseChildImmediate_childReadyState myTypeImmediate)

1013+ return $ PatchDMapWithMove.From_Insert $ Constant (_traverseChildImmediate_childReadyState immediate)

1012 PatchDMapWithMove.From_Delete -> return PatchDMapWithMove.From_Delete

1014 PatchDMapWithMove.From_Delete -> return PatchDMapWithMove.From_Delete

1013 PatchDMapWithMove.From_Move fromKey -> return $ PatchDMapWithMove.From_Move fromKey

1015 PatchDMapWithMove.From_Move fromKey -> return $ PatchDMapWithMove.From_Move fromKey

1014 deleteOrMove :: forall a. k a -> Product (Constant (IORef (ChildReadyState (Some k)))) (ComposeMaybe k) a -> IO (Constant () a)

1016 deleteOrMove :: forall a. k a -> Product (Constant (IORef (ChildReadyState (Some k)))) (ComposeMaybe k) a -> IO (Constant () a)

@@ -1069,7 +1071,7 @@ traverseDMapWithKeyWithAdjust' = do

1069 let new :: forall a. k a -> ComposeMaybe (Compose (TraverseChild t m (Some k)) v') a -> IO (ComposeMaybe (Constant (IORef (ChildReadyState (Some k)))) a)

1071 let new :: forall a. k a -> ComposeMaybe (Compose (TraverseChild t m (Some k)) v') a -> IO (ComposeMaybe (Constant (IORef (ChildReadyState (Some k)))) a)

1070 new k (ComposeMaybe m) = ComposeMaybe <$> case m of

1072 new k (ComposeMaybe m) = ComposeMaybe <$> case m of

1071 Nothing -> return Nothing

1073 Nothing -> return Nothing

1072− Just (Compose (TraverseChild (Left hydration) _)) -> pure Nothing

1074+ Just (Compose (TraverseChild (Left _hydration) _)) -> pure Nothing

1073 Just (Compose (TraverseChild (Right immediate) _)) -> do

1075 Just (Compose (TraverseChild (Right immediate) _)) -> do

1074 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case

1076 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case

1075 ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready

1077 ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready

@@ -1143,8 +1145,9 @@ traverseIntMapWithKeyWithAdjust' = do

1143 let filtered :: PatchIntMap DOM.Text

1145 let filtered :: PatchIntMap DOM.Text

1144 filtered = PatchIntMap $ flip IntMap.mapMaybe p $ \case

1146 filtered = PatchIntMap $ flip IntMap.mapMaybe p $ \case

1145 Nothing -> Just Nothing -- deletion

1147 Nothing -> Just Nothing -- deletion

1146− Just tc | Left _ <- _traverseChild_mode tc -> Nothing

1148+ Just tc

1147− Just tc | Right immediate <- _traverseChild_mode tc -> Just $ Just $ _traverseChildImmediate_placeholder immediate

1149+ | Right immediate <- _traverseChild_mode tc -> Just $ Just $ _traverseChildImmediate_placeholder immediate

1150+ | otherwise -> Nothing

1148 liftIO $ writeIORef placeholders $! fromMaybe phs $ apply filtered phs

1151 liftIO $ writeIORef placeholders $! fromMaybe phs $ apply filtered phs

1149

1152

1150data ChildReadyState a

1153data ChildReadyState a

reflex-dom-core/src/Reflex/Dom/Builder/Static.hs−2

@@ -56,8 +56,6 @@ import Reflex.PostBuild.Class

56import Reflex.TriggerEvent.Class

57import System.Random (randomRIO)

59−import qualified GHCJS.DOM.Types as DOM

60−

61data StaticDomBuilderEnv t = StaticDomBuilderEnv

59data StaticDomBuilderEnv t = StaticDomBuilderEnv

62 { _staticDomBuilderEnv_shouldEscape :: Bool

60 { _staticDomBuilderEnv_shouldEscape :: Bool

63 , _staticDomBuilderEnv_selectValue :: Maybe (Behavior t Text)

61 , _staticDomBuilderEnv_selectValue :: Maybe (Behavior t Text)

reflex-dom-core/src/Reflex/Dom/Prerender.hs+1−1

@@ -37,7 +37,7 @@ import GHCJS.DOM.Types (MonadJSM)

37import Reflex hiding (askEvents)

38import Reflex.Dom.Builder.Class

39import Reflex.Dom.Builder.InputDisabled

40−import Reflex.Dom.Builder.Immediate (ImmediateDomBuilderT, SupportsImmediateDomBuilder, insertBefore, deleteBetweenExclusive, runImmediateDomBuilderT, ImmediateDomBuilderEnv(..), GhcjsDomSpace)

40+import Reflex.Dom.Builder.Immediate (ImmediateDomBuilderT, insertBefore, deleteBetweenExclusive, runImmediateDomBuilderT, ImmediateDomBuilderEnv(..), GhcjsDomSpace)

41import Reflex.Dom.Builder.Hydration

42import Reflex.Dom.Builder.Static

43import Reflex.Host.Class