X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;ds=sidebyside;f=src%2FOctet.hs;h=e2e01ea93eadbc9d72d06a522c562227596fdced;hb=62733fdca35195dd5ad984bdd5c9d1247d2a9bc0;hp=aaff3d2e0415a5029a13b5bb9fe957b449e26bd5;hpb=1b7390b71484de63c8ded01371a1dd2adf93909e;p=hath.git

diff --git a/src/Octet.hs b/src/Octet.hs
index aaff3d2..e2e01ea 100644
--- a/src/Octet.hs
+++ b/src/Octet.hs
@@ -13,7 +13,13 @@ data Octet = None | Octet { b1 :: Bit,
                             b6 :: Bit,
                             b7 :: Bit,
                             b8 :: Bit }
-           deriving (Eq, Show)
+           deriving (Eq)
+
+
+instance Show Octet where
+    show Octet.None = "None"
+    show oct = show (octet_to_int oct)
+
 
 -- Convert each bit to its integer value, and multiply by the
 -- appropriate power of two. Sum them up, and we should get an integer
@@ -36,7 +42,7 @@ octet_from_int x
     | (x < 0) || (x > 255) = Octet.None
     | otherwise = (Octet a1 a2 a3 a4 a5 a6 a7 a8)
     where
-      a1 = if (x > 128) then One else Zero
+      a1 = if (x >= 128) then One else Zero
       a2 = if ((x `mod` 128) >= 64) then One else Zero
       a3 = if ((x `mod` 64)  >= 32) then One else Zero
       a4 = if ((x `mod` 32)  >= 16) then One else Zero