From: Ian Lynagh <igloo@earth.li>
Date: Sat, 23 Oct 2010 16:04:17 +0000 (+0000)
Subject: Merge GHC.Bool into GHC.Types
X-Git-Url: http://git.megacz.com/?p=ghc-prim.git;a=commitdiff_plain;h=49d560213f818de8ed7713ed9c3bf2ed210b076a

Merge GHC.Bool into GHC.Types
---

diff --git a/GHC/Bool.hs b/GHC/Bool.hs
deleted file mode 100644
index f826ae7..0000000
--- a/GHC/Bool.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-
-{-# OPTIONS_GHC -XNoImplicitPrelude #-}
-
-module GHC.Bool (Bool(..)) where
-
--- We need Inl etc behind the scenes for the Bool definition
-import GHC.Generics ()
-
-default ()
-
-data Bool = False | True
diff --git a/GHC/IntWord32.hs b/GHC/IntWord32.hs
index af4a391..d31a8ee 100644
--- a/GHC/IntWord32.hs
+++ b/GHC/IntWord32.hs
@@ -25,8 +25,8 @@ module GHC.IntWord32 (
  ) where
 
 #if WORD_SIZE_IN_BITS < 32
-import GHC.Bool
 import GHC.Prim
+import GHC.Types
 
 foreign import unsafe "stg_eqWord32"      eqWord32#      :: Word32# -> Word32# -> Bool
 foreign import unsafe "stg_neWord32"      neWord32#      :: Word32# -> Word32# -> Bool
diff --git a/GHC/IntWord64.hs b/GHC/IntWord64.hs
index 5260867..1b2da2f 100644
--- a/GHC/IntWord64.hs
+++ b/GHC/IntWord64.hs
@@ -25,8 +25,8 @@ module GHC.IntWord64 (
  ) where
 
 #if WORD_SIZE_IN_BITS < 64
-import GHC.Bool
 import GHC.Prim
+import GHC.Types
 
 foreign import ccall unsafe "hs_eqWord64"    eqWord64#      :: Word64# -> Word64# -> Bool
 foreign import ccall unsafe "hs_neWord64"    neWord64#      :: Word64# -> Word64# -> Bool
diff --git a/GHC/Types.hs b/GHC/Types.hs
index b2d0291..59ce386 100644
--- a/GHC/Types.hs
+++ b/GHC/Types.hs
@@ -16,7 +16,7 @@
 
 {-# OPTIONS_GHC -XNoImplicitPrelude #-}
 
-module GHC.Types (Char(..), Int(..), Float(..), Double(..), IO(..)) where
+module GHC.Types (Bool(..), Char(..), Int(..), Float(..), Double(..), IO(..)) where
 
 import GHC.Prim
 -- We need Inl etc behind the scenes for the type definitions
@@ -26,6 +26,8 @@ infixr 5 :
 
 data [] a = [] | a : [a]
 
+data Bool = False | True
+
 {-| The character type 'Char' is an enumeration whose values represent
 Unicode (or equivalently ISO\/IEC 10646) characters
 (see <http://www.unicode.org/> for details).
diff --git a/ghc-prim.cabal b/ghc-prim.cabal
index c887b6c..9de5b03 100644
--- a/ghc-prim.cabal
+++ b/ghc-prim.cabal
@@ -22,7 +22,6 @@ flag include-ghc-prim {
 Library {
     build-depends: rts
     exposed-modules:
-        GHC.Bool
         GHC.Debug
         GHC.Generics
         GHC.Magic