GaloisInc/what4
1
1
Fork 0
mirror of https://github.com/GaloisInc/what4.git synced 2024-11-29 13:55:51 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #109 from GaloisInc/rmv_miscconstraints

Browse Source 
Remove a couple of miscellaneous constraints.
This commit is contained in:
Kevin Quick 2021-03-15 15:05:58 -07:00 committed by GitHub
commit 65e8d78c04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
what4/src/What4/Utils/AnnotatedMap.hs
View File

@ -59,13 +59,13 @@ filterFingerTree p =
foldl' (\xs x -> if p x then xs FT.|> x else xs) FT.empty
mapMaybeFingerTree ::
(FT.Measured v1 a1, FT.Measured v2 a2) =>
(FT.Measured v2 a2) =>
(a1 -> Maybe a2) -> FT.FingerTree v1 a1 -> FT.FingerTree v2 a2
mapMaybeFingerTree f =
foldl' (\xs x -> maybe xs (xs FT.|>) (f x)) FT.empty
traverseMaybeFingerTree ::
(Applicative f, FT.Measured v1 a1, FT.Measured v2 a2) =>
(Applicative f, FT.Measured v2 a2) =>
(a1 -> f (Maybe a2)) -> FT.FingerTree v1 a1 -> f (FT.FingerTree v2 a2)
traverseMaybeFingerTree f =
foldl' (\m x -> rebuild <$> m <*> f x) (pure FT.empty)
@ -85,7 +85,7 @@ instance (Ord k, Semigroup v) => Semigroup (Tag k v) where
instance (Ord k, Semigroup v) => Monoid (Tag k v) where
mempty = NoTag
unionTag :: (Ord k, Semigroup v) => Tag k v -> Tag k v -> Tag k v
unionTag :: (Semigroup v) => Tag k v -> Tag k v -> Tag k v
unionTag x NoTag = x
unionTag NoTag y = y
unionTag (Tag ix _ vx) (Tag iy ky vy) =
@ -286,7 +286,7 @@ mapMaybe f (AnnotatedMap ft) =
where g (Entry k v a) = Entry k v <$> f a
traverseMaybeWithKey ::
(Applicative f, Ord k, Semigroup v1, Semigroup v2) =>
(Applicative f, Ord k, Semigroup v2) =>
(k -> v1 -> a1 -> f (Maybe (v2, a2))) ->
AnnotatedMap k v1 a1 -> f (AnnotatedMap k v2 a2)
traverseMaybeWithKey f (AnnotatedMap ft) =