83b6156 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

on master help sign in

Merge pull request #1054 from puffnfresh/map-set-ord-constraints

83b6156Edwin Brady13 years ago

libs/base/Data/SortedMap.idr+3−3

@@ -183,10 +183,10 @@ treeDelete {n=(S (S _))} k (Branch3 t1 k1 t2 k2 t3) =

183 Left t3' => Left (Branch3 t1 k1 t2 k2 t3')

184 Right t3' => Left (merge3 t1 k1 t2 k2 t3')

185

186−treeToList : Ord k => Tree n k v -> List (k, v)

186+treeToList : Tree n k v -> List (k, v)

187treeToList = treeToList' (:: [])

188 where

189− treeToList' : Ord k => ((k, v) -> List (k, v)) -> Tree n k v -> List (k, v)

189+ treeToList' : ((k, v) -> List (k, v)) -> Tree n k v -> List (k, v)

190 treeToList' cont (Leaf k v) = cont (k, v)

191 treeToList' cont (Branch2 t1 _ t2) = treeToList' (:: treeToList' cont t2) t1

192 treeToList' cont (Branch3 t1 _ t2 _ t3) = treeToList' (:: treeToList' (:: treeToList' cont t3) t2) t1

@@ -223,7 +223,7 @@ delete k (M (S _) t) =

223fromList : Ord k => List (k, v) -> SortedMap k v

224fromList l = foldl (flip (uncurry insert)) empty l

225

226−toList : Ord k => SortedMap k v -> List (k, v)

226+toList : SortedMap k v -> List (k, v)

227toList Empty = []

228toList (M _ t) = treeToList t

229

libs/base/Data/SortedSet.idr+4−1

@@ -21,5 +21,8 @@ contains k (SetWrapper m) = isJust (Data.SortedMap.lookup k m)

21fromList : Ord k => List k -> SortedSet k

22fromList l = SetWrapper (Data.SortedMap.fromList (map (\i => (i, ())) l))

24−toList : Ord k => SortedSet k -> List k

24+toList : SortedSet k -> List k

25toList (SetWrapper m) = map (\(i, _) => i) (Data.SortedMap.toList m)

26+

27+instance Foldable SortedSet where

28+ foldr f e xs = foldr f e (Data.SortedSet.toList xs)