X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=advent16%2FMain.hs;h=d9fc4a67c843656f888e85286dc129c8aa68cce7;hb=4437cd7086d710333d3667ec59be74a57bdff76e;hp=1a6a78f6a30cb405edbcc7591159a17ba8df1679;hpb=f2288eb8f38d9fe9c052cd8c9f871f9cc930cedc;p=advent-of-code-21.git

diff --git a/advent16/Main.hs b/advent16/Main.hs
index 1a6a78f..d9fc4a6 100644
--- a/advent16/Main.hs
+++ b/advent16/Main.hs
@@ -3,16 +3,16 @@
 import Data.Word
 import Data.Bits
 import Data.Char
-import Data.List
 import Data.Int
 
 import Control.Monad.State.Lazy
 
 import qualified Data.ByteString as BYS
-import qualified Data.BitString.BigEndian as BS
--- import Data.Binary.Strict.Get
+import qualified Data.Bitstream as BS
 
-type ParseState = BS.BitString
+type Transmission = BS.Bitstream BS.Right
+
+type ParseTrans = State Transmission
 
 data Packet = Packet Integer PacketContents
   deriving (Show, Eq)
@@ -43,45 +43,39 @@ part1 = packetVersionSum
 part2 :: Packet -> Integer
 part2 = evaluatePacket
 
-bitify :: String -> BS.BitString
-bitify = BS.bitString . BYS.pack . hexPack . map (fromIntegral . digitToInt)
--- byteify = BYS.pack . hexPack . map (fromIntegral . digitToInt)
+bitify :: String -> Transmission
+bitify = BS.fromByteString . BYS.pack . hexPack . map (fromIntegral . digitToInt)
 
 hexPack :: [Word8] -> [Word8]
 hexPack [] = []
 hexPack (x:[]) = hexPack [x, 0]
 hexPack (x:y:xs) = ((x `shift` 4) .|. y) : hexPack xs
 
-wordify :: BS.BitString -> Integer
-wordify bs = foldl' addBit 0 $ BS.to01List bs
-  where addBit w b = (w * 2) + (fromIntegral b)
-
-
-getBool :: State ParseState Bool
+getBool :: ParseTrans Bool
 getBool = 
   do  bs <- get
-      let value = head $ BS.toList $ BS.take 1 bs
+      let value = head $ BS.unpack $ BS.take 1 bs
       put (BS.drop 1 bs)
       return value
 
-getInt :: Int64 -> State ParseState Integer
+getInt :: Int64 -> ParseTrans Integer
 getInt n = 
   do  bs <- get
-      let bits = BS.take n bs
+      let value = BS.toBits $ BS.take n bs
       put (BS.drop n bs)
-      return (wordify bits)
+      return value
 
-getBits :: Int64 -> State ParseState BS.BitString
+getBits :: Int64 -> ParseTrans Transmission
 getBits n = 
   do  bs <- get
       let bits = BS.take n bs
       put (BS.drop n bs)
       return bits
 
-getLiteral :: State ParseState Integer
+getLiteral :: ParseTrans Integer
 getLiteral = getLiteralAcc 0
 
-getLiteralAcc :: Integer -> State ParseState Integer
+getLiteralAcc :: Integer -> ParseTrans Integer
 getLiteralAcc acc =
   do  continues <- getBool
       nybble <- getInt 4
@@ -90,7 +84,7 @@ getLiteralAcc acc =
       then (do getLiteralAcc acc')
       else (return acc')
 
--- getLiteralPacket :: State ParseState (Integer, Integer, Integer)
+-- getLiteralPacket :: ParseTrans (Integer, Integer, Integer)
 -- getLiteralPacket = 
 --   do  version <- getInt 3
 --       pType <- getInt 3
@@ -98,7 +92,7 @@ getLiteralAcc acc =
 --       return (version, pType, val)
 
 
-getPacket :: State ParseState Packet
+getPacket :: ParseTrans Packet
 getPacket =
   do version <- getInt 3
      pType <- getInt 3
@@ -120,7 +114,7 @@ mkOperator pType contents = case pType of
   7 -> EqualTo (contents!!0) (contents!!1)
 
 
-getOperatorContents :: State ParseState [Packet]
+getOperatorContents :: ParseTrans [Packet]
 getOperatorContents =
   do isNumPackets <- getBool
      if isNumPackets
@@ -130,13 +124,13 @@ getOperatorContents =
              subString <- getBits (fromIntegral numBits)
              return $ getPacketsByLength subString
 
-getPacketsByLength :: BS.BitString -> [Packet]
+getPacketsByLength :: Transmission -> [Packet]
 getPacketsByLength bits
   | BS.null bits = []
   | otherwise = p : (getPacketsByLength remaining)
   where (p, remaining) = runState getPacket bits
 
-getPacketsByCount :: Integer -> State ParseState [Packet]
+getPacketsByCount :: Integer -> ParseTrans [Packet]
 getPacketsByCount 0 = return []
 getPacketsByCount n = 
   do p <- getPacket