From 8dc98f6420661f32ff64eab7823465d271114f8f Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Sat, 8 Dec 2007 02:50:15 +0100 Subject: Hide generalized newtype deriving from Haddock darcs-hash:20071208015015-a5988-71859e01140da3ecdacddab8f37f789fa495d9c8 --- XMonad/Core.hs | 7 ++++++- xmonad.cabal | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/XMonad/Core.hs b/XMonad/Core.hs index fc7040f..4e60c79 100644 --- a/XMonad/Core.hs +++ b/XMonad/Core.hs @@ -116,14 +116,19 @@ data ScreenDetail = SD { screenRect :: !Rectangle -- instantiated on XConf and XState automatically. -- newtype X a = X (ReaderT XConf (StateT XState IO) a) +#ifndef __HADDOCK__ deriving (Functor, Monad, MonadIO, MonadState XState, MonadReader XConf) +#endif instance (Monoid a) => Monoid (X a) where mempty = return mempty mappend = liftM2 mappend type ManageHook = Query (Endo WindowSet) -newtype Query a = Query (ReaderT Window X a) deriving (Functor, Monad, MonadReader Window, MonadIO) +newtype Query a = Query (ReaderT Window X a) +#ifndef __HADDOCK__ + deriving (Functor, Monad, MonadReader Window, MonadIO) +#endif runManageHook :: ManageHook -> Window -> X (WindowSet -> WindowSet) runManageHook (Query m) w = appEndo <$> runReaderT m w diff --git a/xmonad.cabal b/xmonad.cabal index c7e0e40..568ad94 100644 --- a/xmonad.cabal +++ b/xmonad.cabal @@ -43,6 +43,7 @@ library ghc-options: -funbox-strict-fields -Wall -Werror -optl-Wl,-s ghc-prof-options: -prof -auto-all + extensions: CPP executable xmonad main-is: Main.hs @@ -51,3 +52,4 @@ executable xmonad ghc-options: -funbox-strict-fields -Wall -Werror -optl-Wl,-s ghc-prof-options: -prof -auto-all + extensions: CPP -- cgit v1.2.3