git.iko.soy/patch
on develop help sign in
Merge pull request #17 from maralorn/bump-version-bounds
7551cf1Elliot Cameron
patch.cabal+4−4
compare with develop
unifiedsplit
@@ -35,12 +35,12 @@ library
35 build-depends: base >= 4.9 && < 4.14
35 build-depends: base >= 4.9 && < 4.14
36 , constraints-extras >= 0.3 && < 0.4
36 , constraints-extras >= 0.3 && < 0.4
37 , containers >= 0.6 && < 0.7
37 , containers >= 0.6 && < 0.7
38− , dependent-map >= 0.3 && < 0.4
38+ , dependent-map >= 0.3 && < 0.5
39− , dependent-sum >= 0.6 && < 0.7
39+ , dependent-sum >= 0.6 && < 0.8
40 , lens >= 4.7 && < 5
40 , lens >= 4.7 && < 5
41 , semigroupoids >= 4.0 && < 6
41 , semigroupoids >= 4.0 && < 6
42 , transformers >= 0.5.6.0 && < 0.6
42 , transformers >= 0.5.6.0 && < 0.6
43− , witherable >= 0.3 && < 0.3.2
43+ , witherable >= 0.3 && < 0.4
44
44
45 exposed-modules: Data.Functor.Misc
45 exposed-modules: Data.Functor.Misc
46 , Data.Monoid.DecidablyEmpty
46 , Data.Monoid.DecidablyEmpty
@@ -56,7 +56,7 @@ library
56 ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs
56 ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs
57
57
58 if flag(split-these)
58 if flag(split-these)
59− build-depends: these >= 1 && <1.1
59+ build-depends: these >= 1 && <1.2
60 , semialign >=1 && <1.2
60 , semialign >=1 && <1.2
61 , monoidal-containers >= 0.6 && < 0.7
61 , monoidal-containers >= 0.6 && < 0.7
62 else
62 else
src/Data/Functor/Misc.hs+2−2
@@ -47,7 +47,7 @@ import Data.IntMap (IntMap)
47import qualified Data.IntMap as IntMap
47import qualified Data.IntMap as IntMap
48import Data.Map (Map)
48import Data.Map (Map)
49import qualified Data.Map as Map
49import qualified Data.Map as Map
50−import Data.Some (Some(Some))
50+import Data.Some (Some, mkSome)
51import Data.These
51import Data.These
52import Data.Type.Equality ((:~:)(Refl))
52import Data.Type.Equality ((:~:)(Refl))
53import Data.Typeable hiding (Refl)
53import Data.Typeable hiding (Refl)
@@ -116,7 +116,7 @@ intMapWithFunctorToDMap = DMap.fromDistinctAscList . map (\(k, v) -> Const2 k :=
116-- | Convert a 'DMap' to a regular 'Map' by forgetting the types associated with
116-- | Convert a 'DMap' to a regular 'Map' by forgetting the types associated with
117-- the keys, using a function to remove the wrapping 'Functor'
117-- the keys, using a function to remove the wrapping 'Functor'
118weakenDMapWith :: (forall a. v a -> v') -> DMap k v -> Map (Some k) v'
118weakenDMapWith :: (forall a. v a -> v') -> DMap k v -> Map (Some k) v'
119−weakenDMapWith f = Map.fromDistinctAscList . map (\(k :=> v) -> (Some k, f v)) . DMap.toAscList
119+weakenDMapWith f = Map.fromDistinctAscList . map (\(k :=> v) -> (mkSome k, f v)) . DMap.toAscList
120
120
121--------------------------------------------------------------------------------
121--------------------------------------------------------------------------------
122-- WrapArg
122-- WrapArg
src/Data/Patch/DMap.hs+3−1
@@ -14,7 +14,9 @@ import Data.Patch.Class
14import Data.Patch.IntMap
14import Data.Patch.IntMap
15import Data.Patch.Map
15import Data.Patch.Map
16
16
17−import Data.Dependent.Map (DMap, DSum (..), GCompare (..))
17+import Data.Dependent.Map (DMap)
18+import Data.Dependent.Sum (DSum (..))
19+import Data.GADT.Compare (GCompare (..))
18import qualified Data.Dependent.Map as DMap
20import qualified Data.Dependent.Map as DMap
19import Data.Functor.Constant
21import Data.Functor.Constant
20import Data.Functor.Misc
22import Data.Functor.Misc
src/Data/Patch/DMapWithMove.hs+6−5
@@ -20,12 +20,13 @@ import Data.Patch.MapWithMove (PatchMapWithMove (..))
20import qualified Data.Patch.MapWithMove as MapWithMove
20import qualified Data.Patch.MapWithMove as MapWithMove
21
21
22import Data.Constraint.Extras
22import Data.Constraint.Extras
23−import Data.Dependent.Map (DMap, DSum (..), GCompare (..))
23+import Data.Dependent.Map (DMap)
24+import Data.Dependent.Sum (DSum (..))
24import qualified Data.Dependent.Map as DMap
25import qualified Data.Dependent.Map as DMap
25import Data.Functor.Constant
26import Data.Functor.Constant
26import Data.Functor.Misc
27import Data.Functor.Misc
27import Data.Functor.Product
28import Data.Functor.Product
28−import Data.GADT.Compare (GEq (..))
29+import Data.GADT.Compare (GEq (..), GCompare (..))
29import Data.GADT.Show (GShow, gshow)
30import Data.GADT.Show (GShow, gshow)
30import qualified Data.Map as Map
31import qualified Data.Map as Map
31import Data.Maybe
32import Data.Maybe
@@ -33,7 +34,7 @@ import Data.Monoid.DecidablyEmpty
33#if !MIN_VERSION_base(4,11,0)
34#if !MIN_VERSION_base(4,11,0)
34import Data.Semigroup (Semigroup (..))
35import Data.Semigroup (Semigroup (..))
35#endif
36#endif
36−import Data.Some (Some(Some))
37+import Data.Some (Some, mkSome)
37import Data.These
38import Data.These
38
39
39-- | Like 'PatchMapWithMove', but for 'DMap'. Each key carries a 'NodeInfo' which describes how it will be changed by the patch and connects move sources and
40-- | Like 'PatchMapWithMove', but for 'DMap'. Each key carries a 'NodeInfo' which describes how it will be changed by the patch and connects move sources and
@@ -317,8 +318,8 @@ weakenPatchDMapWithMoveWith f (PatchDMapWithMove p) = PatchMapWithMove $ weakenD
317 { MapWithMove._nodeInfo_from = case _nodeInfo_from ni of
318 { MapWithMove._nodeInfo_from = case _nodeInfo_from ni of
318 From_Insert v -> MapWithMove.From_Insert $ f v
319 From_Insert v -> MapWithMove.From_Insert $ f v
319 From_Delete -> MapWithMove.From_Delete
320 From_Delete -> MapWithMove.From_Delete
320− From_Move k -> MapWithMove.From_Move $ Some k
321+ From_Move k -> MapWithMove.From_Move $ mkSome k
321− , MapWithMove._nodeInfo_to = Some <$> getComposeMaybe (_nodeInfo_to ni)
322+ , MapWithMove._nodeInfo_to = mkSome <$> getComposeMaybe (_nodeInfo_to ni)
322 }
323 }
323
324
324-- |"Weaken" a @'PatchDMapWithMove' (Const2 k a) v@ to a @'PatchMapWithMove' k v'@. Weaken is in scare quotes because the 'Const2' has already disabled any
325-- |"Weaken" a @'PatchDMapWithMove' (Const2 k a) v@ to a @'PatchMapWithMove' k v'@. Weaken is in scare quotes because the 'Const2' has already disabled any