Update for QuickCheck 2.

[hath.git] / src / Bit.hs

diff --git a/src/Bit.hs b/src/Bit.hs
index 1c7de7bf4169862cf791e8ebf6bd5e92751a4852..a4241bc2a72b8a062649def5d1daa40f0a13f030 100644 (file)
--- a/src/Bit.hs
+++ b/src/Bit.hs
@@ -1,15 +1,29 @@
 module Bit where
 
-data Bit = Zero | One
-         deriving (Eq, Show)
+import Test.QuickCheck
+
+
+data Bit = None | Zero | One
+         deriving (Eq)
+
+instance Show Bit where
+    show None = "None"
+    show Zero = "0"
+    show One  = "1"
+
+
+instance Arbitrary Bit where
+    arbitrary = elements [ Zero, One ]
+
 
 bit_to_int :: Bit -> Int
-bit_to_int Zero = 0
-bit_to_int One  = 1
+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 Zero.
+-- default to None.
 bit_from_char :: Char -> Bit
 bit_from_char '0' = Zero
 bit_from_char '1' = One
-bit_from_char  _  = Zero
+bit_from_char  _  = None