@@ -10,7 +10,7 @@ module Lib(
10import Control.Monad.Extra
10import Control.Monad.Extra
11import Control.Monad.Trans.Writer
11import Control.Monad.Trans.Writer
12import Data.Maybe
12import Data.Maybe
13−import Data.List
13+import Data.List.Extra
14import Data.Bits
14import Data.Bits
15import Data.Monoid
15import Data.Monoid
16import Numeric
16import Numeric
@@ -106,7 +106,7 @@ charSetC sets =
106 ,\x -> fromMaybe ("table[(int) *p] & " ++ showBit (bit $ fromJust $ elemIndex x hard)) $ simple x)
106 ,\x -> fromMaybe ("table[(int) *p] & " ++ showBit (bit $ fromJust $ elemIndex x hard)) $ simple x)
108 showBit x = "0x" ++ showHex (x :: Int) ""
108 showBit x = "0x" ++ showHex (x :: Int) ""
109− disp c = showBit $ foldr (.|.) 0 [bit i | (i, h) <- zip [0..] hard, fromCharSet h c]
109+ disp c = showBit $ foldr (.|.) 0 [bit i | (i, h) <- zipFrom 0 hard, fromCharSet h c]
111 hard = nub $ filter (isNothing . simple) sets
111 hard = nub $ filter (isNothing . simple) sets