From 0b5f07477e642bf5bb3e07e650257ee106ec4672 Mon Sep 17 00:00:00 2001
From: Stefan Friese <mail@stefan.works>
Date: Thu, 16 May 2024 21:52:38 +0200
Subject: [PATCH] reworked b2 and b8 functions

---
 Main.hs | 59 ++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/Main.hs b/Main.hs
index 76ec22e..9d552c9 100644
--- a/Main.hs
+++ b/Main.hs
@@ -270,15 +270,18 @@ enc10 :: String -> String
 enc10 str = C.unpack $ C.pack $ Prelude.foldl (\acc char -> acc ++ show (ord char)) "" str
 
 -- decode octal
+-- octalToChar :: String -> Char
+-- octalToChar str = chr $ Prelude.foldl (\acc c -> acc * 8 + read [c]) 0 str
+
+-- Function to decode a single octal value to its corresponding character
 octalToChar :: String -> Char
-octalToChar str = chr $ Prelude.foldl (\acc c -> acc * 8 + read [c]) 0 str
+octalToChar octal = chr (read ("0o" ++ octal))  -- Assumes input is in base 8 (octal)
 
-chunksOf :: Int -> [a] -> [[a]]
-chunksOf _ [] = []
-chunksOf n xs = Prelude.take n xs : chunksOf n (Prelude.drop n xs)
+-- Function to split a string into chunks of three characters each
+chunksOf3 :: String -> [String]
+chunksOf3 [] = []
+chunksOf3 str = Prelude.take 3 str : chunksOf3 (Prelude.drop 3 str)
 
-decodeOctal :: String -> String
-decodeOctal = map octalToChar . words
 
 -- decodeOctal :: String -> String
 -- decodeOctal = map (octalToChar . padOctal) . words
@@ -291,7 +294,7 @@ decodeOctal = map octalToChar . words
 
 -- Function to decode a string of octal numbers to characters
 dec8 :: String -> String
-dec8 = map octalToChar . chunksOf 3 . filter (/= ' ')
+dec8 =  map octalToChar . words
 
 -- dec8 :: String -> String
 -- dec8  = C.unpack . encodeUtf8 . toText . showbOct . hexStringToInt
@@ -330,6 +333,11 @@ dec8 = map octalToChar . chunksOf 3 . filter (/= ' ')
 -- enc8 :: String -> String
 -- enc8 = unwords . map (concatMap unicodeToOctal . (:[]))
 
+chunksOf :: Int -> [a] -> [[a]]
+chunksOf _ [] = []
+chunksOf n xs = Prelude.take n xs : chunksOf n (Prelude.drop n xs)
+
+
 unicodeToOctal :: Char -> [String]
 unicodeToOctal c = chunksOf 3 $ reverse $ decimalToOctal' (ord c)
   where
@@ -351,25 +359,36 @@ enc8 = unwords . concatMap unicodeToOctal
 -- enc8 :: String -> String
 -- enc8 = concatMap unicodeToOctal
 
-dec2 :: String -> String
+-- dec2 :: String -> String
 -- dec2  = C.unpack . encodeUtf8 . toText . showbBin . hexStringToInt
 -- dec2  = TL.unpack . toLazyText . showbBin . hexStringToInt . enc16
-dec2  = TL.unpack . toLazyText . showbBin . hexStringToInt
+-- dec2  = TL.unpack . toLazyText . showbBin . hexStringToInt
+--
+binaryToChar :: String -> Char
+binaryToChar binStr = chr $ binaryToInt binStr
+
+binaryToInt :: String -> Int
+binaryToInt binStr = Prelude.foldl (\acc x -> acc * 2 + digitToInt x) 0 binStr
+
+dec2 :: String -> String
+dec2 input = map binaryToChar $ words input
 
 
-enc2 :: String -> String
 -- enc2  = C.unpack . BSU.fromString . intToHexString . binToInt . (reverse . (map fromJust . (map fromBinDigit)))
 -- enc2 input = C.unpack $ C.pack $ show $ Prelude.foldl (\acc char -> (acc `shiftL` 8) .|. fromIntegral (ord char)) BSU.fromString
-enc2 input = concatMap (\c -> padTo7Bits (decimalToBinary (ord c))) input
-   where
-      decimalToBinary :: Int -> String
-      decimalToBinary 0 = "0"
-      decimalToBinary n = reverse $ decimalToBinary' n
-         where
-            decimalToBinary' 0 = "" 
-            decimalToBinary' m = let (q, r) = m `divMod` 2 in (if r == 0 then '0' else '1') : decimalToBinary' q
-      padTo7Bits :: String -> String
-      padTo7Bits bits = replicate (7 - Prelude.length bits) '0' ++ bits
+charToBinary :: Char -> String
+charToBinary char = let binaryStr = intToBinary $ ord char
+                    in replicate (7 - Prelude.length binaryStr) '0' ++ binaryStr
+
+intToBinary :: Int -> String
+intToBinary n = reverse $ decimalToBinary' n
+  where
+    decimalToBinary' 0 = "0"
+    decimalToBinary' m = let (q, r) = m `divMod` 2 in intToDigit r : decimalToBinary' q
+
+-- enc2 :: String -> String
+enc2 :: String -> String
+enc2 input = unwords $ map charToBinary input
 
 
 decqp :: String -> String