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

diff --git a/src/Bit.hs b/src/Bit.hs
index d7fb679..c01ae94 100644
--- a/src/Bit.hs
+++ b/src/Bit.hs
@@ -1,22 +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
 
-data Bit = None | Zero | One
-         deriving (Eq)
+import Test.QuickCheck (
+  Arbitrary,
+  arbitrary,
+  elements
+  )
+
+
+data Bit = Zero | One
+  deriving (Enum, Eq)
 
 instance Show Bit where
-    show None = "None"
-    show Zero = "0"
-    show One  = "1"
-
-                
-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
+  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