X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FBit.hs;h=0f02fbff730728fd253e7d0c18bc9ac16d738e1a;hb=eee156f562f9c1c1194a67cef12f146304d88ce9;hp=7c1840823b041774774f7d49519ff190f6f52033;hpb=5825a18ea1267c1f769a054c650b2761de7f291c;p=hath.git

diff --git a/src/Bit.hs b/src/Bit.hs
index 7c18408..0f02fbf 100644
--- a/src/Bit.hs
+++ b/src/Bit.hs
@@ -1,16 +1,34 @@
-module Bit where
-
-data Bit = None | Zero | One
-         deriving (Eq, Show)
-
-bit_to_int :: Bit -> Int
-bit_to_int None = -1
-bit_to_int Zero =  0
-bit_to_int One  =  1
-
--- If we are passed a '0' or '1', convert it appropriately. Otherwise,
--- default to None.
-bit_from_char :: Char -> Bit
-bit_from_char '0' = Zero
-bit_from_char '1' = One
-bit_from_char  _  = None
+-- | The Bit module contains the Bit data type, which is essentially a
+--   renamed Boolean, and some convenience functions.
+module Bit (
+  Bit(..)
+  )
+where
+
+import Test.Tasty.QuickCheck (
+  Arbitrary,
+  arbitrary,
+  elements )
+
+
+data Bit = Zero | One
+  deriving (Enum, Eq)
+
+instance Show Bit where
+  show Zero = "0"
+  show One  = "1"
+
+
+instance Arbitrary Bit where
+  arbitrary = elements [ Zero, One ]
+
+
+instance Ord Bit where
+  Zero <= Zero = True
+  Zero <= One  = True
+  One  <= Zero = False
+  One  <= One  = True
+
+instance Bounded Bit where
+  minBound = Zero
+  maxBound = One