Commit c99b359

committed

Create NonEmptySet type

1 parent 4f29d02 commit c99b359Copy full SHA for c99b359

File tree

+197

-153

lines changed

+197

-153

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -238,15 +238,15 @@ mkArb step n`
`238`	`238`	`p <- step`
`239`	`239`	`q <- step`
`240`	`240`	`if dir`
`241`		`- then return (Bin 2 q (singleton p) Tip)`
`242`		`- else return (Bin 2 p Tip (singleton q))`
	`241`	`+ then return (NE$Bin 2 q (singleton p) Tip)`
	`242`	`+ else return (NE$Bin 2 p Tip (singleton q))`
`243`	`243`	`\| otherwise = do`
`244`	`244`	`-- This assumes a balance factor of delta = 3`
`245`	`245`	let upper = (3*(n - 1)) `quot` 4
`246`	`246`	let lower = (n + 2) `quot` 4
`247`	`247`	`ln <- liftGen $ choose (lower, upper)`
`248`	`248`	`let rn = n - ln - 1`
`249`		`- liftM3 (\lt x rt -> Bin n x lt rt) (mkArb step ln) step (mkArb step rn)`
	`249`	`+ liftM3 (\lt x rt -> NE$Bin n x lt rt) (mkArb step ln) step (mkArb step rn)`
`250`	`250`
`251`	`251`	`-- \| Given a strictly increasing list of elements, produce an arbitrarily`
`252`	`252`	`-- shaped set with exactly those elements.`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1929,7 +1929,7 @@ difference t1 (NE (Bin _ k _ l2 r2)) = case split k t1 of`
`1929`	`1929`	`withoutKeys :: Ord k => Map k a -> Set k -> Map k a`
`1930`	`1930`	`withoutKeys Tip _ = Tip`
`1931`	`1931`	`withoutKeys m Set.Tip = m`
`1932`		`-withoutKeys m (Set.Bin _ k ls rs) = case splitMember k m of`
	`1932`	`+withoutKeys m (Set.NE (Set.Bin _ k ls rs)) = case splitMember k m of`
`1933`	`1933`	`(lm, b, rm)`
`1934`	`1934`	\| not b && lm' `ptrEq` lm && rm' `ptrEq` rm -> m
`1935`	`1935`	`\| otherwise -> link2 lm' rm'`
`@@ -3356,7 +3356,8 @@ assocs m`
`3356`	`3356`
`3357`	`3357`	`keysSet :: Map k a -> Set.Set k`
`3358`	`3358`	`keysSet Tip = Set.Tip`
`3359`		`-keysSet (NE (Bin sz kx _ l r)) = Set.Bin sz kx (keysSet l) (keysSet r)`
	`3359`	`+keysSet (NE (Bin sz kx _ l r)) = Set.NE $`
	`3360`	`+ Set.Bin sz kx (keysSet l) (keysSet r)`
`3360`	`3361`
`3361`	`3362`	`-- \| /O(n)/. Build a map from a set of keys and a function which for each key`
`3362`	`3363`	`-- computes its value.`
`@@ -3366,7 +3367,7 @@ keysSet (NE (Bin sz kx _ l r)) = Set.Bin sz kx (keysSet l) (keysSet r)`
`3366`	`3367`
`3367`	`3368`	`fromSet :: (k -> a) -> Set.Set k -> Map k a`
`3368`	`3369`	`fromSet _ Set.Tip = Tip`
`3369`		`-fromSet f (Set.Bin sz x l r) = NE $ Bin sz x (f x) (fromSet f l) (fromSet f r)`
	`3370`	`+fromSet f (Set.NE (Set.Bin sz x l r)) = NE $ Bin sz x (f x) (fromSet f l) (fromSet f r)`
`3370`	`3371`
`3371`	`3372`	`{--------------------------------------------------------------------`
`3372`	`3373`	`Lists`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1469,7 +1469,8 @@ mapKeysWith c f = fromListWith c . foldrWithKey (\k x xs -> (f k, x) : xs) []`
`1469`	`1469`
`1470`	`1470`	`fromSet :: (k -> a) -> Set.Set k -> Map k a`
`1471`	`1471`	`fromSet _ Set.Tip = Tip`
`1472`		-fromSet f (Set.Bin sz x l r) = case f x of v -> v `seq` NE (Bin sz x v (fromSet f l) (fromSet f r))
	`1472`	`+fromSet f (Set.NE (Set.Bin sz x l r)) = case f x of`
	`1473`	+ v -> v `seq` NE (Bin sz x v (fromSet f l) (fromSet f r))
`1473`	`1474`
`1474`	`1475`	`{--------------------------------------------------------------------`
`1475`	`1476`	`Lists`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ module Data.Set (`
`70`	`70`	`Set -- instance Eq,Ord,Show,Read,Data,Typeable`
`71`	`71`	`#else`
`72`	`72`	`Set(..)`
	`73`	`+ , NonEmptySet(..)`
`73`	`74`	`#endif`
`74`	`75`
`75`	`76`	`-- * Construction`

Comments

(0)