6fcf213 · patch · git.iko.soy

git.iko.soy/patch

Merge branch 'develop' of github.com:reflex-frp/patch into dpatch-map-inner-patch

commit6fcf213b025c725e5e4ee59a5b46c5c6b8916dea authorJohn Ericson <John.Ericson@Obsidian.Systems> dateTue 21 Jan 2020, 12:01 (7 years ago) parent08f13f2 5335f5d

8 files changed+114−53

compare with develop

unifiedsplit

ChangeLog.md+12 dep/reflex-platform/default.nix+7−6 dep/reflex-platform/github.json+3−2 patch.cabal+2−1 release.nix+20−10 src/Data/Patch/IntMap.hs+24−10 src/Data/Patch/Map.hs+29−13 src/Data/Patch/MapWithMove.hs+17−11

ChangeLog.md+12

@@ -6,6 +6,18 @@

77* `PatchDMapWithMove` supports moves with a patch.

9+## 0.0.2.0

10+

11+* Consistently provide:

12+

13+ - `Wrapped` instances

14+

15+ - `*WithIndex` instances

16+

17+ - `un*` newtype unwrappers

18+

19+ for `PatchMap`, `PatchIntMap`, and `PatchMapWithMove`.

20+

921## 0.0.1.0

1022

1123* Support older GHCs with `split-these` flag.

dep/reflex-platform/default.nix+7−6

@@ -1,7 +1,8 @@

11# DO NOT HAND-EDIT THIS FILE

2−import ((import <nixpkgs> {}).fetchFromGitHub (

3− let json = builtins.fromJSON (builtins.readFile ./github.json);

4− in { inherit (json) owner repo rev sha256;

5− private = json.private or false;

6− }

7−))

2+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:

3+ if !fetchSubmodules && !private then builtins.fetchTarball {

4+ url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;

5+ } else (import <nixpkgs> {}).fetchFromGitHub {

6+ inherit owner repo rev sha256 fetchSubmodules private;

7+ };

8+in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))

dep/reflex-platform/github.json+3−2

@@ -2,6 +2,7 @@

22 "owner": "reflex-frp",

33 "repo": "reflex-platform",

44 "branch": "master",

5− "rev": "510b990d0b11f0626afbec5fe8575b5b2395391b",

6− "sha256": "09cmahsbxr0963wq171c7j139iyzz49hramr4v9nsf684wcwkngv"

5+ "private": false,

6+ "rev": "c9d11db1b98855fe8ab24a3ff6a5dbe0ad902ad9",

7+ "sha256": "0sfzkqdvyah5mwvmli0wq1nl0b8cvk2cmfgfy4rz57wv42x3099y"

78}

patch.cabal+2−1

@@ -1,5 +1,5 @@

11Name: patch

2−Version: 0.0.1.0

2+Version: 0.0.2.0

33Synopsis: Infrastructure for writing patches which act on other types.

44Description:

55 In this library, a patch is something which can be applied, analogous to a

@@ -35,6 +35,7 @@ library

3535 , containers >= 0.6 && < 0.7

3636 , dependent-map >= 0.3 && < 0.4

3737 , dependent-sum >= 0.6 && < 0.7

38+ , lens >= 4.7 && < 5

3839 , semigroupoids >= 4.0 && < 6

3940 , transformers >= 0.5.6.0 && < 0.6

4041 , witherable >= 0.3 && < 0.3.2

release.nix+20−10

@@ -18,16 +18,26 @@ let

1818 "ghcIosAarch64"

1919 ];

2020 compilerPkgs = lib.genAttrs compilers (ghc: let

21− src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [

22− "release.nix"

23− ".git"

24− "dist"

25− "dist-newstyle"

26− "cabal.haskell-ci"

27− "cabal.project"

28− ".travis.yml"

29− ])) ./.;

30− in reflex-platform.${ghc}.callCabal2nix "patch" src {});

21+ reflex-platform = reflex-platform-fun {

22+ inherit system;

23+ haskellOverlays = [

24+ # Use this package's source for reflex

25+ (self: super: {

26+ _dep = super._dep // {

27+ patch = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [

28+ "release.nix"

29+ ".git"

30+ "dist"

31+ "dist-newstyle"

32+ "cabal.haskell-ci"

33+ "cabal.project"

34+ ".travis.yml"

35+ ])) ./.;

36+ };

37+ })

38+ ];

39+ };

40+ in reflex-platform.${ghc}.patch);

3141 in compilerPkgs // {

3242 cache = reflex-platform.pinBuildInputs "patch-${system}"

3343 (builtins.attrValues compilerPkgs);

src/Data/Patch/IntMap.hs+24−10

@@ -1,12 +1,15 @@

1−{-# LANGUAGE DeriveFoldable #-}

2−{-# LANGUAGE DeriveFunctor #-}

31{-# LANGUAGE DeriveTraversable #-}

2+{-# LANGUAGE FlexibleInstances #-}

43{-# LANGUAGE GeneralizedNewtypeDeriving #-}

4+{-# LANGUAGE MultiParamTypeClasses #-}

5+{-# LANGUAGE TemplateHaskell #-}

56{-# LANGUAGE TypeFamilies #-}

68-- | Module containing 'PatchIntMap', a 'Patch' for 'IntMap' which allows for

79-- insert/update or delete of associations.

810module Data.Patch.IntMap where

911

12+import Control.Lens

1013import Data.IntMap.Strict (IntMap)

1114import qualified Data.IntMap.Strict as IntMap

1215import Data.Maybe

@@ -16,7 +19,20 @@ import Data.Patch.Class

1619-- | 'Patch' for 'IntMap' which represents insertion or deletion of keys in the mapping.

1720-- Internally represented by 'IntMap (Maybe a)', where @Just@ means insert/update

1821-- and @Nothing@ means delete.

19−newtype PatchIntMap a = PatchIntMap (IntMap (Maybe a)) deriving (Functor, Foldable, Traversable, Monoid)

22+newtype PatchIntMap a = PatchIntMap { unPatchIntMap :: IntMap (Maybe a) }

23+ deriving ( Show, Read, Eq, Ord

24+ , Functor, Foldable, Traversable, Monoid

25+ )

26+

27+-- | @a <> b@ will apply the changes of @b@ and then apply the changes of @a@.

28+-- If the same key is modified by both patches, the one on the left will take

29+-- precedence.

30+instance Semigroup (PatchIntMap v) where

31+ PatchIntMap a <> PatchIntMap b = PatchIntMap $ a `mappend` b --TODO: Add a semigroup instance for Map

32+ -- PatchMap is idempotent, so stimes n is id for every n

33+ stimes = stimesIdempotentMonoid

34+

35+makeWrapped ''PatchIntMap

2036

2137-- | Apply the insertions or deletions to a given 'IntMap'.

2238instance PatchHet (PatchIntMap a) where

@@ -28,13 +44,11 @@ instance Patch (PatchIntMap a) where

2844 adds = IntMap.mapMaybe id p

2945 in IntMap.union adds $ v `IntMap.difference` removes

3046

31−-- | @a <> b@ will apply the changes of @b@ and then apply the changes of @a@.

32−-- If the same key is modified by both patches, the one on the left will take

33−-- precedence.

34−instance Semigroup (PatchIntMap v) where

35− PatchIntMap a <> PatchIntMap b = PatchIntMap $ a `mappend` b --TODO: Add a semigroup instance for Map

36− -- PatchMap is idempotent, so stimes n is id for every n

37− stimes = stimesIdempotentMonoid

47+instance FunctorWithIndex Int PatchIntMap

48+instance FoldableWithIndex Int PatchIntMap

49+instance TraversableWithIndex Int PatchIntMap where

50+ itraverse = itraversed . Indexed

51+ itraversed = _Wrapped .> itraversed <. traversed

3852

3953-- | Map a function @Int -> a -> b@ over all @a@s in the given @'PatchIntMap' a@

4054-- (that is, all inserts/updates), producing a @PatchIntMap b@.

src/Data/Patch/Map.hs+29−13

@@ -1,11 +1,18 @@

1+{-# LANGUAGE DeriveTraversable #-}

2+{-# LANGUAGE FlexibleInstances #-}

13{-# LANGUAGE LambdaCase #-}

4+{-# LANGUAGE MultiParamTypeClasses #-}

5+{-# LANGUAGE StandaloneDeriving #-}

6+{-# LANGUAGE TemplateHaskell #-}

27{-# LANGUAGE TypeFamilies #-}

39-- | 'Patch'es on 'Map' that consist only of insertions (including overwrites)

410-- and deletions

511module Data.Patch.Map where

612

713import Data.Patch.Class

814

15+import Control.Lens

916import Data.Map (Map)

1017import qualified Data.Map as Map

1118import Data.Maybe

@@ -15,7 +22,23 @@ import Data.Semigroup

1522-- deleted. Insertions are represented as values wrapped in 'Just', while

1623-- deletions are represented as 'Nothing's

1724newtype PatchMap k v = PatchMap { unPatchMap :: Map k (Maybe v) }

18− deriving (Show, Read, Eq, Ord)

25+ deriving ( Show, Read, Eq, Ord

26+ , Foldable, Traversable

27+ )

28+

29+-- | 'fmap'ping a 'PatchMap' will alter all of the values it will insert.

30+-- Deletions are unaffected.

31+deriving instance Functor (PatchMap k)

32+

33+-- | @a <> b@ will apply the changes of @b@ and then apply the changes of @a@.

34+-- If the same key is modified by both patches, the one on the left will take

35+-- precedence.

36+instance Ord k => Semigroup (PatchMap k v) where

37+ PatchMap a <> PatchMap b = PatchMap $ a `mappend` b --TODO: Add a semigroup instance for Map

38+ -- PatchMap is idempotent, so stimes n is id for every n

39+ stimes = stimesIdempotentMonoid

40+

41+makeWrapped ''PatchMap

1942

2043-- | Apply the insertions or deletions to a given 'Map'.

2144instance Ord k => PatchHet (PatchMap k v) where

@@ -30,24 +53,17 @@ instance Ord k => Patch (PatchMap k v) where

3053 Nothing -> Just ()

3154 Just _ -> Nothing

3255

33−-- | @a <> b@ will apply the changes of @b@ and then apply the changes of @a@.

34−-- If the same key is modified by both patches, the one on the left will take

35−-- precedence.

36−instance Ord k => Semigroup (PatchMap k v) where

37− PatchMap a <> PatchMap b = PatchMap $ a `mappend` b --TODO: Add a semigroup instance for Map

38− -- PatchMap is idempotent, so stimes n is id for every n

39− stimes = stimesIdempotentMonoid

56+instance FunctorWithIndex k (PatchMap k)

57+instance FoldableWithIndex k (PatchMap k)

58+instance TraversableWithIndex k (PatchMap k) where

59+ itraverse = itraversed . Indexed

60+ itraversed = _Wrapped .> itraversed <. traversed

4061

4162-- | The empty 'PatchMap' contains no insertions or deletions

4263instance Ord k => Monoid (PatchMap k v) where

4364 mempty = PatchMap mempty

4465 mappend = (<>)

4566

46−-- | 'fmap'ping a 'PatchMap' will alter all of the values it will insert.

47−-- Deletions are unaffected.

48−instance Functor (PatchMap k) where

49− fmap f = PatchMap . fmap (fmap f) . unPatchMap

50−

5167-- | Returns all the new elements that will be added to the 'Map'

5268patchMapNewElements :: PatchMap k v -> [v]

5369patchMapNewElements (PatchMap p) = catMaybes $ Map.elems p

src/Data/Patch/MapWithMove.hs+17−11

@@ -1,11 +1,17 @@

11{-# LANGUAGE CPP #-}

2+{-# LANGUAGE DeriveTraversable #-}

23{-# LANGUAGE FlexibleContexts #-}

4+{-# LANGUAGE FlexibleInstances #-}

35{-# LANGUAGE LambdaCase #-}

6+{-# LANGUAGE MultiParamTypeClasses #-}

47{-# LANGUAGE PatternGuards #-}

58{-# LANGUAGE ScopedTypeVariables #-}

69{-# LANGUAGE StandaloneDeriving #-}

10+{-# LANGUAGE TemplateHaskell #-}

11+{-# LANGUAGE TypeApplications #-}

712{-# LANGUAGE TypeFamilies #-}

813{-# LANGUAGE UndecidableInstances #-}

14+

915-- | 'Patch'es on 'Map' that can insert, delete, and move values from one key to

1016-- another

1117module Data.Patch.MapWithMove where

@@ -13,6 +19,7 @@ module Data.Patch.MapWithMove where

1319import Data.Patch.Class

1420

1521import Control.Arrow

22+import Control.Lens hiding (from, to)

1623import Control.Monad.Trans.State

1724import Data.Foldable

1825import Data.Function

@@ -31,8 +38,12 @@ import Data.Tuple

3138-- | Patch a Map with additions, deletions, and moves. Invariant: If key @k1@

3239-- is coming from @From_Move k2@, then key @k2@ should be going to @Just k1@,

3340-- and vice versa. There should never be any unpaired From/To keys.

34−newtype PatchMapWithMove k p = PatchMapWithMove (Map k (NodeInfo k p))

41+newtype PatchMapWithMove k p = PatchMapWithMove

42+ { -- | Extract the internal representation of the 'PatchMapWithMove'

43+ unPatchMapWithMove :: Map k (NodeInfo k p)

44+ }

3545deriving instance (Show k, Show p, Show (PatchTarget p)) => Show (PatchMapWithMove k p)

46+deriving instance (Ord k, Read k, Read p, Read (PatchTarget p)) => Read (PatchMapWithMove k p)

3647deriving instance (Eq k, Eq p, Eq (PatchTarget p)) => Eq (PatchMapWithMove k p)

3748deriving instance (Ord k, Ord p, Ord (PatchTarget p)) => Ord (PatchMapWithMove k p)

3849

@@ -67,11 +78,11 @@ deriving instance (Ord k, Ord p, Ord (PatchTarget p)) => Ord (From k p)

6778data To k p

6879 = To_NonMove

6980 | To_Move !k !p

81+ deriving ( Show, Read, Eq, Ord

82+ , Functor, Foldable, Traversable

83+ )

7084

71−deriving instance (Show k, Show p, Show (PatchTarget p)) => Show (To k p)

72−deriving instance (Read k, Read p, Read (PatchTarget p)) => Read (To k p)

73−deriving instance (Eq k, Eq p, Eq (PatchTarget p)) => Eq (To k p)

74−deriving instance (Ord k, Ord p, Ord (PatchTarget p)) => Ord (To k p)

85+makeWrapped ''PatchMapWithMove

7586

7687-- | Create a 'PatchMapWithMove', validating it

7788patchMapWithMove

@@ -94,12 +105,7 @@ patchMapWithMoveInsertAll m = PatchMapWithMove $ flip fmap m $ \v -> NodeInfo

94105 , _nodeInfo_to = To_NonMove

95106 }

96107

97−-- | Extract the internal representation of the 'PatchMapWithMove'

98−unPatchMapWithMove

99− :: PatchMapWithMove k p -> Map k (NodeInfo k p)

100−unPatchMapWithMove (PatchMapWithMove p) = p

101−

102−-- | Make a @'PatchMapWithMove' k p@ which has the effect of inserting or updating a value @v@ to the given key @k@, like 'Map.insert'.

108+-- | Make a @'PatchMapWithMove' k p@ which has the effect of inserting or replacing a value @v@ at the given key @k@, like 'Map.insert'.

103109insertMapKey

104110 :: k -> PatchTarget p -> PatchMapWithMove k p

105111insertMapKey k v = PatchMapWithMove . Map.singleton k $ NodeInfo (From_Insert v) To_NonMove