X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FOctet.hs;h=bdada65ab1b8e11bb52d95bdf33a7a25d4ce751c;hb=d1e7f72b70cfe4c1a5c5eb6e7773888506833131;hp=e0a4bf655c1ece922a37d5fcdc8f2634957a1a3d;hpb=d4f46f4d52b3d51c2eb59a4aa818d4f23f14203d;p=hath.git

diff --git a/src/Octet.hs b/src/Octet.hs
index e0a4bf6..bdada65 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
@@ -27,7 +33,7 @@ octet_to_int x =
     8   * (bit_to_int (b5 x)) +
     4   * (bit_to_int (b6 x)) +
     2   * (bit_to_int (b7 x)) +
-    0   * (bit_to_int (b8 x))
+    1   * (bit_to_int (b8 x))
 
 
 
@@ -36,14 +42,21 @@ octet_from_int x
     | (x < 0) || (x > 255) = Octet.None
     | otherwise = (Octet a1 a2 a3 a4 a5 a6 a7 a8)
     where
-      a1 = if (x `mod` 128) > 0 then One else Zero
-      a2 = if (x `mod` 64)  > 0 then One else Zero
-      a3 = if (x `mod` 32)  > 0 then One else Zero           
-      a4 = if (x `mod` 16)  > 0 then One else Zero
-      a5 = if (x `mod` 8)   > 0 then One else Zero
-      a6 = if (x `mod` 4)   > 0 then One else Zero
-      a7 = if (x `mod` 2)   > 0 then One else Zero           
-      a8 = if (x `mod` 1)   > 0 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
+      a5 = if ((x `mod` 16)  >= 8)  then One else Zero
+      a6 = if ((x `mod` 8)   >= 4)  then One else Zero
+      a7 = if ((x `mod` 4)   >= 2)  then One else Zero
+      a8 = if ((x `mod` 2)   == 1)  then One else Zero
+
+
+octet_from_string :: String -> Octet
+octet_from_string s =
+    case (reads s :: [(Int, String)]) of
+      []   -> Octet.None
+      x:_ -> octet_from_int (fst x)
 
 
 -- The octet with the least possible value.