[commit: packages/containers] develop, develop-0.6, develop-0.6-questionable, master, zip-devel: Revert "Fixed syntax of fixity declarations." (fa2c888)

git at git.haskell.org git at git.haskell.org
Fri Jan 23 22:38:49 UTC 2015


Repository : ssh://git@git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/fa2c8880efd7adf81e33de72f1a38a0c2b31e90b

>---------------------------------------------------------------

commit fa2c8880efd7adf81e33de72f1a38a0c2b31e90b
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Tue Jul 22 17:09:30 2014 +0200

    Revert "Fixed syntax of fixity declarations."
    
    This reverts commit 07ab0fa052843dc8fd4c874876d03d8a71525f87.


>---------------------------------------------------------------

fa2c8880efd7adf81e33de72f1a38a0c2b31e90b
 Data/IntMap/Base.hs | 8 ++++----
 Data/IntSet/Base.hs | 8 ++++----
 Data/Map/Base.hs    | 8 ++++----
 Data/Set/Base.hs    | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 237aea8..9f7be70 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -395,7 +395,7 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
-infix 4 `member`
+infix 4 member
 
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
@@ -405,7 +405,7 @@ infix 4 `member`
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
-infix 4 `notMember`
+infix 4 notMember
 
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
@@ -822,7 +822,7 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
-infixl 5 `union`
+infixl 5 union
 
 -- | /O(n+m)/. The union with a combining function.
 --
@@ -887,7 +887,7 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
-infixl 5 `intersection`
+infixl 5 intersection
 
 -- | /O(n+m)/. The intersection with a combining function.
 --
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 5aee4ef..9719de1 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -332,13 +332,13 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
-infix 4 `member`
+infix 4 member
 
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
-infix 4 `notMember`
+infix 4 notMember
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -527,7 +527,7 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
-infixl 5 `union`
+infixl 5 union
 
 {--------------------------------------------------------------------
   Difference
@@ -602,7 +602,7 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
-infixl 5 `intersection`
+infixl 5 intersection
 
 {--------------------------------------------------------------------
   Subset
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index bc2fd47..9d066fa 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -456,7 +456,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 `member`
+infix 4 member
 
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
@@ -471,7 +471,7 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
-infix 4 `notMember`
+infix 4 notMember
 
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
@@ -1234,7 +1234,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 `union`
+infixl 5 union
 
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
@@ -1356,7 +1356,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 `intersection`
+infixl 5 intersection
 
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index d0533f5..5727de6 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -318,7 +318,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 `member`
+infix 4 member
 
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
@@ -329,7 +329,7 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
-infix 4 `notMember`
+infix 4 notMember
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -582,7 +582,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 `union`
+infixl 5 union
 
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
@@ -642,7 +642,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 `intersection`
+infixl 5 intersection
 
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip



More information about the ghc-commits mailing list