X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FBit.hs;h=c01ae94b5563df50707a23c3e5dfc19b6257ebb6;hb=45ac9baca360d0f0dabe4576fb44c1634a50dbf7;hp=1c7de7bf4169862cf791e8ebf6bd5e92751a4852;hpb=64dfebebdecd1119ab8345a6de34597f6a878a98;p=hath.git

diff --git a/src/Bit.hs b/src/Bit.hs
index 1c7de7b..c01ae94 100644
--- a/src/Bit.hs
+++ b/src/Bit.hs
@@ -1,15 +1,35 @@
-module Bit where
+-- | The Bit module contains the Bit data type, which is essentially a
+--   renamed Boolean, and some convenience functions.
+module Bit (
+  Bit(..)
+  )
+where
+
+import Test.QuickCheck (
+  Arbitrary,
+  arbitrary,
+  elements
+  )
+
 
 data Bit = Zero | One
-         deriving (Eq, Show)
-
-bit_to_int :: Bit -> Int
-bit_to_int Zero = 0
-bit_to_int One  = 1
-
--- If we are passed a '0' or '1', convert it appropriately. Otherwise,
--- default to Zero.
-bit_from_char :: Char -> Bit
-bit_from_char '0' = Zero
-bit_from_char '1' = One
-bit_from_char  _  = Zero
+  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