summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <bgamari.foss@gmail.com>2015-11-12 20:35:47 +0100
committerBen Gamari <ben@smart-cactus.org>2015-11-14 21:16:29 +0100
commit3353f62ab8658346b0084fe6382edeb86d104012 (patch)
treeb925412debaae3501b0a6d5b91b6955376c18611
parent8988be8561ce0857f3befd6ab3b6c29060685c0a (diff)
downloadhaskell-3353f62ab8658346b0084fe6382edeb86d104012.tar.gz
Rip out __HADDOCK__ references
As it turns out no one actually sets this macro anyways and haddock now clearly has no trouble parsing this code. Test Plan: Validate Reviewers: hvr, goldfire, austin Reviewed By: austin Subscribers: duncan, thomie, hvr Differential Revision: https://phabricator.haskell.org/D1463
-rw-r--r--libraries/base/Foreign/Marshal/Error.hs4
-rw-r--r--libraries/base/GHC/Base.hs8
-rw-r--r--libraries/base/GHC/ConsoleHandler.hs2
-rw-r--r--libraries/integer-simple/GHC/Integer/Type.hs4
4 files changed, 1 insertions, 17 deletions
diff --git a/libraries/base/Foreign/Marshal/Error.hs b/libraries/base/Foreign/Marshal/Error.hs
index 758812b688..be75043608 100644
--- a/libraries/base/Foreign/Marshal/Error.hs
+++ b/libraries/base/Foreign/Marshal/Error.hs
@@ -30,10 +30,6 @@ module Foreign.Marshal.Error (
import Foreign.Ptr
-#ifdef __HADDOCK__
-import Data.Bool
-import System.IO.Error
-#endif
import GHC.Base
import GHC.Num
import GHC.IO.Exception
diff --git a/libraries/base/GHC/Base.hs b/libraries/base/GHC/Base.hs
index 189e480359..199664d9db 100644
--- a/libraries/base/GHC/Base.hs
+++ b/libraries/base/GHC/Base.hs
@@ -1204,11 +1204,3 @@ a `iShiftRL#` b | isTrue# (b >=# WORD_SIZE_IN_BITS#) = 0#
-- unpackFoldr "foo" c (unpackFoldr "baz" c n) = unpackFoldr "foobaz" c n
#-}
-
-
-#ifdef __HADDOCK__
--- | A special argument for the 'Control.Monad.ST.ST' type constructor,
--- indexing a state embedded in the 'Prelude.IO' monad by
--- 'Control.Monad.ST.stToIO'.
-data RealWorld
-#endif
diff --git a/libraries/base/GHC/ConsoleHandler.hs b/libraries/base/GHC/ConsoleHandler.hs
index 126e17470a..609eb2005c 100644
--- a/libraries/base/GHC/ConsoleHandler.hs
+++ b/libraries/base/GHC/ConsoleHandler.hs
@@ -19,7 +19,7 @@
-----------------------------------------------------------------------------
module GHC.ConsoleHandler
-#if !defined(mingw32_HOST_OS) && !defined(__HADDOCK__)
+#if !defined(mingw32_HOST_OS)
where
import GHC.Base () -- dummy dependency
diff --git a/libraries/integer-simple/GHC/Integer/Type.hs b/libraries/integer-simple/GHC/Integer/Type.hs
index cd39b7d6bd..31f852bbd1 100644
--- a/libraries/integer-simple/GHC/Integer/Type.hs
+++ b/libraries/integer-simple/GHC/Integer/Type.hs
@@ -34,8 +34,6 @@ import GHC.Tuple ()
import GHC.IntWord64
#endif
-#if !defined(__HADDOCK__)
-
data Integer = Positive !Positive | Negative !Positive | Naught
-------------------------------------------------------------------
@@ -868,8 +866,6 @@ floatFromPositive (Some w ds)
(2.0# `powerFloat#` int2Float# (highHalfShift ())))
`plusFloat#` int2Float# (word2Int# l)
-#endif
-
{-
Note [Avoid patError]