Fix warnings in utils/FastTypes

[ghc-hetmet.git] / compiler / utils / FastTypes.lhs

diff --git a/compiler/utils/FastTypes.lhs b/compiler/utils/FastTypes.lhs
index ab5ae46..bce98f4 100644 (file)
--- a/compiler/utils/FastTypes.lhs
+++ b/compiler/utils/FastTypes.lhs
@@ -4,23 +4,12 @@
 \section{Fast integers and booleans}
 
 \begin{code}
-{-# OPTIONS -w #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and fix
--- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
--- for details
-
 module FastTypes (
     FastInt, _ILIT, iBox, iUnbox,
     (+#), (-#), (*#), quotFastInt, negateFastInt,
     (==#), (<#), (<=#), (>=#), (>#),
-
-    FastBool, fastBool, isFastTrue, fastOr, fastAnd
   ) where
 
-#include "HsVersions.h"
-
 #if defined(__GLASGOW_HASKELL__)
 
 -- Import the beggars
@@ -36,19 +25,6 @@ iUnbox (I# x) = x
 quotFastInt   = quotInt#
 negateFastInt = negateInt#
 
-type FastBool = Int#
-fastBool True  = 1#
-fastBool False = 0#
-isFastTrue x = x ==# 1#
-
--- note that fastOr and fastAnd are strict in both arguments
--- since they are unboxed
-fastOr 1# _ = 1#
-fastOr 0# x = x
-
-fastAnd 0# x = 0#
-fastAnd 1# x = x
-
 #else /* ! __GLASGOW_HASKELL__ */
 
 type FastInt = Int
@@ -66,16 +42,6 @@ negateFastInt = negate
 (>=#) = (>=)
 (>#)  = (>)
 
-type FastBool = Bool
-fastBool x = x
-isFastTrue x = x
--- make sure these are as strict as the unboxed version,
--- so that the performance characteristics match
-fastOr False False = False
-fastOr _ _ = True
-fastAnd True True = True
-fastAnd _ _ = False
-
 --These are among the type-signatures necessary for !ghc to compile
 -- but break ghc (can't give a signature for an import...)
 --Note that the comparisons actually do return Bools not FastBools.
@@ -99,9 +65,4 @@ iUnbox :: Int -> FastInt
 quotFastInt :: FastInt -> FastInt -> FastInt
 negateFastInt :: FastInt -> FastInt
 
-fastBool :: Bool -> FastBool
-isFastTrue :: FastBool -> Bool
-fastOr :: FastBool -> FastBool -> FastBool
-fastAnd :: FastBool -> FastBool -> FastBool
-
 \end{code}