From 1dfa268bb0cca6cf6fb0ffbfe331d84329aea534 Mon Sep 17 00:00:00 2001
From: Aleksey Veresov <aleksey@veresov.pro>
Date: Fri, 2 Apr 2021 21:50:13 +0300
Subject: fix

---
 src/Utils.hs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/Utils.hs')

diff --git a/src/Utils.hs b/src/Utils.hs
index 81c6e8a..1d908e1 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -12,14 +12,14 @@ toBit :: Bool -> Int
 toBit True  = 1
 toBit False = 0
 
-toBits :: Bits a => a -> [Int] -> [Int]
-toBits x r = map (toBit . testBit x) r
+toBits :: FiniteBits a => a -> [Int]
+toBits x = reverse $ map (toBit . testBit x) [0..finiteBitSize x - 1]
 
 fromBits :: [Int] -> Int
-fromBits = foldl (\a b -> 2 * a + b) 0 . reverse
+fromBits = foldl (\a b -> 2 * a + b) 0
 
-extractBits :: Bits a => a -> [Int] -> Int
-extractBits x r = fromBits $ toBits x r
+extractBits :: FiniteBits a => a -> [Int] -> Int
+extractBits x r = fromBits $ map (\i -> toBits x !! i) r
 
 
 -------------------------------------------------------------------------------
-- 
cgit v1.2.3