diff --git a/Data/IntMap/Unicode.hs b/Data/IntMap/Unicode.hs --- a/Data/IntMap/Unicode.hs +++ b/Data/IntMap/Unicode.hs @@ -8,9 +8,9 @@ -} module Data.IntMap.Unicode - ( (∈), (∉) + ( (∈), (∋), (∉), (∌) , (∅) - , (∪), (∩) + , (∪), (∖), (∆), (∩) ) where @@ -19,14 +19,15 @@ ------------------------------------------------------------------------------- -- from base: -import Data.Bool ( Bool ) -import Data.Int ( Int ) +import Data.Bool ( Bool ) +import Data.Int ( Int ) +import Data.Function ( flip ) -- from containers: import Data.IntMap ( IntMap , member, notMember , empty - , union, intersection + , union, difference, intersection ) @@ -35,14 +36,20 @@ ------------------------------------------------------------------------------- infix 4 ∈ +infix 4 ∋ infix 4 ∉ +infix 4 ∌ +infixl 6 ∪ +infixr 6 ∩ +infixl 9 ∖ +infixl 9 ∆ ------------------------------------------------------------------------------- -- Symbols ------------------------------------------------------------------------------- -{- | +{-| (∈) = 'member' U+2208, ELEMENT OF @@ -50,7 +57,15 @@ (∈) ∷ Int → IntMap α → Bool (∈) = member -{- | +{-| +(∋) = 'flip' (∈) + +U+220B, CONTAINS AS MEMBER +-} +(∋) ∷ IntMap α → Int → Bool +(∋) = flip (∈) + +{-| (∉) = 'notMember' U+2209, NOT AN ELEMENT OF @@ -58,7 +73,15 @@ (∉) ∷ Int → IntMap α → Bool (∉) = notMember -{- | +{-| +(∌) = 'flip' (∉) + +U+220C, DOES NOT CONTAIN AS MEMBER +-} +(∌) ∷ IntMap α → Int → Bool +(∌) = flip (∉) + +{-| (∅) = 'empty' U+2205, EMPTY SET @@ -66,7 +89,7 @@ (∅) ∷ IntMap α (∅) = empty -{- | +{-| (∪) = 'union' U+222A, UNION @@ -74,7 +97,25 @@ (∪) ∷ IntMap α → IntMap α → IntMap α (∪) = union -{- | +{-| +(∖) = 'difference' + +U+2216, SET MINUS +-} +(∖) ∷ IntMap α → IntMap β → IntMap α +(∖) = difference + +{-| +Symmetric difference + +a ∆ b = (a ∖ b) ∪ (b ∖ a) + +U+2206, INCREMENT +-} +(∆) ∷ IntMap α → IntMap α → IntMap α +a ∆ b = (a ∖ b) ∪ (b ∖ a) + +{-| (∩) = 'intersection' U+2229, INTERSECTION diff --git a/Data/IntSet/Unicode.hs b/Data/IntSet/Unicode.hs --- a/Data/IntSet/Unicode.hs +++ b/Data/IntSet/Unicode.hs @@ -8,9 +8,9 @@ -} module Data.IntSet.Unicode - ( (∈), (∉) + ( (∈), (∋), (∉), (∌) , (∅) - , (∪), (∩) + , (∪), (∖), (∆), (∩) , (⊆), (⊇), (⊈), (⊉) , (⊂), (⊃), (⊄), (⊅) ) where @@ -33,7 +33,7 @@ import Data.IntSet ( IntSet , member, notMember , empty - , union, intersection + , union, difference, intersection , isSubsetOf, isProperSubsetOf ) @@ -43,30 +43,60 @@ ------------------------------------------------------------------------------- infix 4 ∈ +infix 4 ∋ infix 4 ∉ +infix 4 ∌ +infix 4 ⊆ +infix 4 ⊇ +infix 4 ⊈ +infix 4 ⊉ +infix 4 ⊂ +infix 4 ⊃ +infix 4 ⊄ +infix 4 ⊅ +infixl 6 ∪ +infixr 6 ∩ +infixl 9 ∖ +infixl 9 ∆ ------------------------------------------------------------------------------- -- Symbols ------------------------------------------------------------------------------- -{- | +{-| (∈) = 'member' U+2208, ELEMENT OF -} -(∈) ∷ Int -> IntSet → Bool +(∈) ∷ Int → IntSet → Bool (∈) = member -{- | +{-| +(∋) = 'flip' (∈) + +U+220B, CONTAINS AS MEMBER +-} +(∋) ∷ IntSet → Int → Bool +(∋) = flip (∈) + +{-| (∉) = 'notMember' U+2209, NOT AN ELEMENT OF -} -(∉) ∷ Int -> IntSet → Bool +(∉) ∷ Int → IntSet → Bool (∉) = notMember -{- | +{-| +(∌) = 'flip' (∉) + +U+220C, DOES NOT CONTAIN AS MEMBER +-} +(∌) ∷ IntSet → Int → Bool +(∌) = flip (∉) + +{-| (∅) = 'empty' U+2205, EMPTY SET @@ -74,7 +104,7 @@ (∅) ∷ IntSet (∅) = empty -{- | +{-| (∪) = 'union' U+222A, UNION @@ -82,7 +112,25 @@ (∪) ∷ IntSet → IntSet → IntSet (∪) = union -{- | +{-| +(∖) = 'difference' + +U+2216, SET MINUS +-} +(∖) ∷ IntSet → IntSet → IntSet +(∖) = difference + +{-| +Symmetric difference + +a ∆ b = (a ∖ b) ∪ (b ∖ a) + +U+2206, INCREMENT +-} +(∆) ∷ IntSet → IntSet → IntSet +a ∆ b = (a ∖ b) ∪ (b ∖ a) + +{-| (∩) = 'intersection' U+2229, INTERSECTION @@ -90,7 +138,7 @@ (∩) ∷ IntSet → IntSet → IntSet (∩) = intersection -{- | +{-| (⊆) = 'isSubsetOf' U+2286, SUBSET OF OR EQUAL TO @@ -98,7 +146,7 @@ (⊆) ∷ IntSet → IntSet → Bool (⊆) = isSubsetOf -{- | +{-| (⊇) = 'flip' (⊆) U+2287, SUPERSET OF OR EQUAL TO @@ -106,23 +154,23 @@ (⊇) ∷ IntSet → IntSet → Bool (⊇) = flip (⊆) -{- | -x ⊈ y = (x ≢ y) ∧ (x ⊄ y) +{-| +a ⊈ b = (a ≢ b) ∧ (a ⊄ b) U+2288, NEITHER A SUBSET OF NOR EQUAL TO -} (⊈) ∷ IntSet → IntSet → Bool -x ⊈ y = (x ≢ y) ∧ (x ⊄ y) +a ⊈ b = (a ≢ b) ∧ (a ⊄ b) -{- | -x ⊉ y = (x ≢ y) ∧ (x ⊅ y) +{-| +a ⊉ b = (a ≢ b) ∧ (a ⊅ b) U+2289, NEITHER A SUPERSET OF NOR EQUAL TO -} (⊉) ∷ IntSet → IntSet → Bool -x ⊉ y = (x ≢ y) ∧ (x ⊅ y) +a ⊉ b = (a ≢ b) ∧ (a ⊅ b) -{- | +{-| (⊂) = 'isProperSubsetOf' U+2282, SUBSET OF @@ -130,7 +178,7 @@ (⊂) ∷ IntSet → IntSet → Bool (⊂) = isProperSubsetOf -{- | +{-| (⊃) = 'flip' (⊂) U+2283, SUPERSET OF @@ -138,18 +186,18 @@ (⊃) ∷ IntSet → IntSet → Bool (⊃) = flip (⊂) -{- | -x ⊄ y = 'not' (x ⊂ y) +{-| +a ⊄ b = 'not' (a ⊂ b) U+2284, NOT A SUBSET OF -} (⊄) ∷ IntSet → IntSet → Bool -x ⊄ y = not (x ⊂ y) +a ⊄ b = not (a ⊂ b) -{- | -x ⊅ y = 'not' (x ⊃ y) +{-| +a ⊅ b = 'not' (a ⊃ b) U+2285, NOT A SUPERSET OF -} (⊅) ∷ IntSet → IntSet → Bool -x ⊅ y = not (x ⊃ y) +a ⊅ b = not (a ⊃ b) diff --git a/Data/Map/Unicode.hs b/Data/Map/Unicode.hs --- a/Data/Map/Unicode.hs +++ b/Data/Map/Unicode.hs @@ -8,9 +8,9 @@ -} module Data.Map.Unicode - ( (∈), (∉) + ( (∈), (∋), (∉), (∌) , (∅) - , (∪), (∩) + , (∪), (∖), (∆), (∩) ) where @@ -19,14 +19,15 @@ ------------------------------------------------------------------------------- -- from base: -import Data.Bool ( Bool ) -import Data.Ord ( Ord ) +import Data.Bool ( Bool ) +import Data.Ord ( Ord ) +import Data.Function ( flip ) -- from containers: import Data.Map ( Map , member, notMember , empty - , union, intersection + , union, difference, intersection ) @@ -35,14 +36,20 @@ ------------------------------------------------------------------------------- infix 4 ∈ +infix 4 ∋ infix 4 ∉ +infix 4 ∌ +infixl 6 ∪ +infixr 6 ∩ +infixl 9 ∖ +infixl 9 ∆ ------------------------------------------------------------------------------- -- Symbols ------------------------------------------------------------------------------- -{- | +{-| (∈) = 'member' U+2208, ELEMENT OF @@ -50,7 +57,15 @@ (∈) ∷ Ord k ⇒ k → Map k α → Bool (∈) = member -{- | +{-| +(∋) = 'flip' (∈) + +U+220B, CONTAINS AS MEMBER +-} +(∋) ∷ Ord k ⇒ Map k α → k → Bool +(∋) = flip (∈) + +{-| (∉) = 'notMember' U+2209, NOT AN ELEMENT OF @@ -58,7 +73,15 @@ (∉) ∷ Ord k ⇒ k → Map k α → Bool (∉) = notMember -{- | +{-| +(∌) = 'flip' (∉) + +U+220C, DOES NOT CONTAIN AS MEMBER +-} +(∌) ∷ Ord k ⇒ Map k α → k → Bool +(∌) = flip (∉) + +{-| (∅) = 'empty' U+2205, EMPTY SET @@ -66,7 +89,7 @@ (∅) ∷ Map k α (∅) = empty -{- | +{-| (∪) = 'union' U+222A, UNION @@ -74,11 +97,28 @@ (∪) ∷ Ord k ⇒ Map k α → Map k α → Map k α (∪) = union -{- | +{-| +(∖) = 'difference' + +U+2216, SET MINUS +-} +(∖) ∷ Ord k ⇒ Map k α → Map k β → Map k α +(∖) = difference + +{-| +Symmetric difference + +a ∆ b = (a ∖ b) ∪ (b ∖ a) + +U+2206, INCREMENT +-} +(∆) ∷ Ord k ⇒ Map k α → Map k α → Map k α +a ∆ b = (a ∖ b) ∪ (b ∖ a) + +{-| (∩) = 'intersection' U+2229, INTERSECTION -} (∩) ∷ Ord k ⇒ Map k α → Map k β → Map k α (∩) = intersection - diff --git a/Data/Sequence/Unicode.hs b/Data/Sequence/Unicode.hs --- a/Data/Sequence/Unicode.hs +++ b/Data/Sequence/Unicode.hs @@ -39,7 +39,7 @@ -- Symbols ------------------------------------------------------------------------------- -{- | +{-| (∅) = 'empty' U+2205, EMPTY SET @@ -47,7 +47,7 @@ (∅) ∷ Seq α (∅) = empty -{- | +{-| (⊲) = ('<|') U+22B2, NORMAL SUBGROUP OF @@ -55,7 +55,7 @@ (⊲) ∷ α → Seq α → Seq α (⊲) = (<|) -{- | +{-| (⊳) = ('|>') U+22B3, CONTAINS AS NORMAL SUBGROUP @@ -63,7 +63,7 @@ (⊳) ∷ Seq α → α → Seq α (⊳) = (|>) -{- | +{-| (⋈) = ('><') U+22C8, BOWTIE diff --git a/Data/Set/Unicode.hs b/Data/Set/Unicode.hs --- a/Data/Set/Unicode.hs +++ b/Data/Set/Unicode.hs @@ -8,9 +8,9 @@ -} module Data.Set.Unicode - ( (∈), (∉) + ( (∈), (∋), (∉), (∌) , (∅) - , (∪), (∩) + , (∪), (∖), (∆), (∩) , (⊆), (⊇), (⊈), (⊉) , (⊂), (⊃), (⊄), (⊅) ) where @@ -25,7 +25,6 @@ import Data.Function ( flip ) import Data.Ord ( Ord ) - -- from base-unicode-symbols: import Data.Eq.Unicode ( (≢) ) import Data.Bool.Unicode ( (∧) ) @@ -34,7 +33,7 @@ import Data.Set ( Set , member, notMember , empty - , union, intersection + , union, difference, intersection , isSubsetOf, isProperSubsetOf ) @@ -44,14 +43,28 @@ ------------------------------------------------------------------------------- infix 4 ∈ +infix 4 ∋ infix 4 ∉ +infix 4 ∌ +infix 4 ⊆ +infix 4 ⊇ +infix 4 ⊈ +infix 4 ⊉ +infix 4 ⊂ +infix 4 ⊃ +infix 4 ⊄ +infix 4 ⊅ +infixl 6 ∪ +infixr 6 ∩ +infixl 9 ∖ +infixl 9 ∆ ------------------------------------------------------------------------------- -- Symbols ------------------------------------------------------------------------------- -{- | +{-| (∈) = 'member' U+2208, ELEMENT OF @@ -59,7 +72,15 @@ (∈) ∷ Ord α ⇒ α → Set α → Bool (∈) = member -{- | +{-| +(∋) = 'flip' (∈) + +U+220B, CONTAINS AS MEMBER +-} +(∋) ∷ Ord α ⇒ Set α → α → Bool +(∋) = flip (∈) + +{-| (∉) = 'notMember' U+2209, NOT AN ELEMENT OF @@ -67,7 +88,15 @@ (∉) ∷ Ord α ⇒ α → Set α → Bool (∉) = notMember -{- | +{-| +(∌) = 'flip' (∉) + +U+220C, DOES NOT CONTAIN AS MEMBER +-} +(∌) ∷ Ord α ⇒ Set α → α → Bool +(∌) = flip (∉) + +{-| (∅) = 'empty' U+2205, EMPTY SET @@ -75,7 +104,7 @@ (∅) ∷ Set α (∅) = empty -{- | +{-| (∪) = 'union' U+222A, UNION @@ -83,7 +112,25 @@ (∪) ∷ Ord α ⇒ Set α → Set α → Set α (∪) = union -{- | +{-| +(∖) = 'difference' + +U+2216, SET MINUS +-} +(∖) ∷ Ord α ⇒ Set α → Set α → Set α +(∖) = difference + +{-| +Symmetric difference + +a ∆ b = (a ∖ b) ∪ (b ∖ a) + +U+2206, INCREMENT +-} +(∆) ∷ Ord α ⇒ Set α → Set α → Set α +a ∆ b = (a ∖ b) ∪ (b ∖ a) + +{-| (∩) = 'intersection' U+2229, INTERSECTION @@ -91,7 +138,7 @@ (∩) ∷ Ord α ⇒ Set α → Set α → Set α (∩) = intersection -{- | +{-| (⊆) = 'isSubsetOf' U+2286, SUBSET OF OR EQUAL TO @@ -99,7 +146,7 @@ (⊆) ∷ Ord α ⇒ Set α → Set α → Bool (⊆) = isSubsetOf -{- | +{-| (⊇) = 'flip' (⊆) U+2287, SUPERSET OF OR EQUAL TO @@ -107,23 +154,23 @@ (⊇) ∷ Ord α ⇒ Set α → Set α → Bool (⊇) = flip (⊆) -{- | -x ⊈ y = (x ≢ y) ∧ (x ⊄ y) +{-| +a ⊈ b = (a ≢ b) ∧ (a ⊄ b) U+2288, NEITHER A SUBSET OF NOR EQUAL TO -} (⊈) ∷ Ord α ⇒ Set α → Set α → Bool -x ⊈ y = (x ≢ y) ∧ (x ⊄ y) +a ⊈ b = (a ≢ b) ∧ (a ⊄ b) -{- | -x ⊉ y = (x ≢ y) ∧ (x ⊅ y) +{-| +a ⊉ b = (a ≢ b) ∧ (a ⊅ b) U+2289, NEITHER A SUPERSET OF NOR EQUAL TO -} (⊉) ∷ Ord α ⇒ Set α → Set α → Bool -x ⊉ y = (x ≢ y) ∧ (x ⊅ y) +a ⊉ b = (a ≢ b) ∧ (a ⊅ b) -{- | +{-| (⊂) = 'isProperSubsetOf' U+2282, SUBSET OF @@ -131,7 +178,7 @@ (⊂) ∷ Ord α ⇒ Set α → Set α → Bool (⊂) = isProperSubsetOf -{- | +{-| (⊃) = 'flip' (⊂) U+2283, SUPERSET OF @@ -139,18 +186,18 @@ (⊃) ∷ Ord α ⇒ Set α → Set α → Bool (⊃) = flip (⊂) -{- | -x ⊄ y = 'not' (x ⊂ y) +{-| +a ⊄ b = 'not' (a ⊂ b) U+2284, NOT A SUBSET OF -} (⊄) ∷ Ord α ⇒ Set α → Set α → Bool -x ⊄ y = not (x ⊂ y) +a ⊄ b = not (a ⊂ b) -{- | -x ⊅ y = 'not' (x ⊃ y) +{-| +a ⊅ b = 'not' (a ⊃ b) U+2285, NOT A SUPERSET OF -} (⊅) ∷ Ord α ⇒ Set α → Set α → Bool -x ⊅ y = not (x ⊃ y) +a ⊅ b = not (a ⊃ b) diff --git a/containers-unicode-symbols.cabal b/containers-unicode-symbols.cabal --- a/containers-unicode-symbols.cabal +++ b/containers-unicode-symbols.cabal @@ -1,5 +1,5 @@ name: containers-unicode-symbols -version: 0.2.0.1 +version: 0.3 cabal-version: >=1.6 build-type: Simple stability: provisional @@ -30,6 +30,6 @@ , Data.Sequence.Unicode , Data.Set.Unicode build-depends: base >= 3.0.3.1 && < 4.3 - , base-unicode-symbols >= 0.1.1 && < 0.2 + , base-unicode-symbols >= 0.1.1 && < 0.3 , containers < 0.4 ghc-options: -Wall