hunk ./enumset.cabal 2 -Version: 0.0.3 +Version: 0.0.4 hunk ./enumset.cabal 25 +Source-Repository this + Tag: 0.0.4 + Type: darcs + Location: http://code.haskell.org/~thielema/enumset/ + hunk ./src/Data/EnumSet/PackedEnum.hs 36 - (Bits w, Enum a, Enum b) => + (Num w, Bits w, Enum a, Enum b) => hunk ./src/Data/EnumSet/PackedEnum.hs 55 - (Bits w, Enum a, Enum b) => + (Num w, Bits w, Enum a, Enum b) => hunk ./src/Data/EnumSet/Utility.hs 4 -import Data.Bits (Bits, (.&.), ) +import Data.Bits (Bits, bit, xor, (.&.), ) hunk ./src/Data/EnumSet/Utility.hs 13 +empty :: (Bits w) => w +empty = xor (bit 0) (bit 0) + hunk ./src/Data/EnumSet.hs 38 +import qualified Data.EnumSet.Utility as U hunk ./src/Data/EnumSet.hs 74 -fromEnums = Cons . foldl B.setBit 0 . map P.fromEnum +fromEnums = Cons . foldl B.setBit U.empty . map P.fromEnum hunk ./src/Data/EnumSet.hs 80 - takeWhile (0/=) . iterate (P.flip B.shiftR 1) . + takeWhile (U.empty /= ) . iterate (P.flip B.shiftR 1) . hunk ./src/Data/EnumSet.hs 104 - in if x1 == 0 + in if x1 == U.empty hunk ./src/Data/EnumSet.hs 119 -singletonByPosition = Cons . B.setBit 0 +singletonByPosition = Cons . B.setBit U.empty hunk ./src/Data/EnumSet.hs 123 -null (Cons x) = x==0 +null (Cons x) = x==U.empty hunk ./src/Data/EnumSet.hs 126 -empty = Cons 0 +empty = Cons U.empty hunk ./src/Data/EnumSet.hs 190 + Cons $ if b then B.bit (P.fromEnum n) else U.empty +{- requires Num instance hunk ./src/Data/EnumSet.hs 193 +-} hunk ./src/Data/FlagSet/PackedRecord.hs 16 -leastSigBit :: Bits w => w -> w +leastSigBit :: (Num w, Bits w) => w -> w hunk ./src/Data/FlagSet/PackedRecord.hs 40 - (Bits w) => + (Num w, Bits w) => hunk ./src/Data/FlagSet.hs 24 -import Data.EnumSet.Utility ((.-.), ) +import Data.EnumSet.Utility (empty, (.-.), ) hunk ./src/Data/FlagSet.hs 116 - mempty = MaskedValue 0 0 + mempty = MaskedValue empty empty