dual-tree 0.2.2.1 → 0.2.3.0

raw patch · 3 files changed

+22/−17 lines, 3 filesdep ~basedep ~monoid-extrasdep ~newtype-genericsPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: base, monoid-extras, newtype-generics, semigroups

API changes (from Hackage documentation)

Files

• CHANGES +5/−0
• dual-tree.cabal +5/−5
• src/Data/Tree/DUAL/Internal.hs +12/−12

@@ -1,3 +1,8 @@+* 0.2.3.0: 11 May 2021++- Allow base-4.14, 4.15 and test with GHC 8.10, 9.0+- Drop support for GHC 8.2 and earlier+ * 0.2.2.1: 19 October 2019  - Allow semigroups-0.19

@@ -1,5 +1,5 @@ name:                dual-tree-version:             0.2.2.1+version:             0.2.3.0 synopsis:            Rose trees with cached and accumulating monoidal annotations description:         Rose (n-ary) trees with both upwards- (/i.e./                      cached) and downwards-traveling (/i.e./@@ -31,7 +31,7 @@ build-type:          Simple cabal-version:       >=1.10 bug-reports:         https://github.com/diagrams/dual-tree/issues-tested-with:         GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.2, GHC == 8.6.1, GHC == 8.8.1+tested-with:         GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.4, GHC == 9.0.1 source-repository head   type: git   location: https://github.com/diagrams/dual-tree.git@@ -40,10 +40,10 @@   default-language:  Haskell2010   exposed-modules:   Data.Tree.DUAL                      Data.Tree.DUAL.Internal-  build-depends:     base >= 4.3 && < 4.14,+  build-depends:     base >= 4.3 && < 4.16,                      semigroups >= 0.8 && < 0.20,-                     newtype-generics >= 0.5.3 && < 0.6,-                     monoid-extras >= 0.2 && < 0.6+                     newtype-generics >= 0.6 && < 0.7,+                     monoid-extras >= 0.6 && < 0.7   hs-source-dirs:    src   other-extensions:  GeneralizedNewtypeDeriving,                      MultiParamTypeClasses,

@@ -27,7 +27,7 @@ -- @u@ annotation.  'DUALTreeNE' and 'DUALTreeU' are mutually -- recursive, so that recursive tree nodes are interleaved with cached -- @u@ annotations.  'DUALTree' is defined by just wrapping--- 'DUALTreeU' in 'Option'.  This method has the advantage that the+-- 'DUALTreeU' in 'Maybe.  This method has the advantage that the -- type system enforces the invariant that there is only one -- representation for the empty tree.  It also allows us to get away -- with only 'Semigroup' constraints in many places.@@ -149,11 +149,11 @@ -- --   * 'Monoid'. The identity is the empty tree. -newtype DUALTree d u a l = DUALTree { unDUALTree :: Option (DUALTreeU d u a l) }+newtype DUALTree d u a l = DUALTree { unDUALTree :: Maybe (DUALTreeU d u a l) }   deriving ( Functor, Semigroup, Typeable, Show, Eq )  instance Newtype (DUALTree d u a l) where-  type O (DUALTree d u a l) = Option (DUALTreeU d u a l)+  type O (DUALTree d u a l) = Maybe (DUALTreeU d u a l)   pack   = DUALTree   unpack = unDUALTree @@ -177,16 +177,16 @@ -- | The empty DUAL-tree.  This is a synonym for 'mempty', but with a --   more general type. empty :: DUALTree d u a l-empty = DUALTree (Option Nothing)+empty = DUALTree Nothing  -- | Construct a leaf node from a @u@ annotation along with a leaf --   datum. leaf :: u -> l -> DUALTree d u a l-leaf u l = DUALTree (Option (Just (DUALTreeU (u, Leaf u l))))+leaf u l = DUALTree (Just (DUALTreeU (u, Leaf u l)))  -- | Construct a leaf node from a @u@ annotation. leafU :: u -> DUALTree d u a l-leafU u = DUALTree (Option (Just (DUALTreeU (u, LeafU u))))+leafU u = DUALTree (Just (DUALTreeU (u, LeafU u)))  -- | Add a @u@ annotation to the root, combining it (on the left) with --   the existing cached @u@ annotation.  This function is provided@@ -216,7 +216,7 @@ --   top-level cached @u@ annotation paired with a non-empty --   DUAL-tree. nonEmpty :: DUALTree d u a l -> Maybe (u, DUALTreeNE d u a l)-nonEmpty = fmap unpack . getOption . unpack+nonEmpty = fmap unpack . unpack  -- | Get the @u@ annotation at the root, or @Nothing@ if the tree is --   empty.@@ -274,14 +274,14 @@            -> (d -> r -> r)      -- ^ Process an internal d node            -> (a -> r -> r)      -- ^ Process an internal datum            -> DUALTreeNE d u a l -> r-foldDUALNE  = foldDUALNE' (Option Nothing)+foldDUALNE  = foldDUALNE' Nothing   where-    foldDUALNE' dacc lf _   _   _    _   (Leaf _ l)  = lf (option mempty id dacc) l+    foldDUALNE' dacc lf _   _   _    _   (Leaf _ l)  = lf (maybe mempty id dacc) l     foldDUALNE' _    _  lfU _   _    _   (LeafU _)   = lfU     foldDUALNE' dacc lf lfU con down ann (Concat ts)       = con (NEL.map (foldDUALNE' dacc lf lfU con down ann . snd . unpack) ts)     foldDUALNE' dacc lf lfU con down ann (Act d t)-      = down d (foldDUALNE' (dacc <> (Option (Just d))) lf lfU con down ann . snd . unpack $ t)+      = down d (foldDUALNE' (dacc <> Just d) lf lfU con down ann . snd . unpack $ t)     foldDUALNE' dacc lf lfU con down ann (Annot a t)       = ann a (foldDUALNE' dacc lf lfU con down ann . snd . unpack $ t) @@ -309,9 +309,9 @@          -> (d -> r -> r)          -- ^ Process an internal d node          -> (a -> r -> r)          -- ^ Process an internal datum          -> DUALTree d u a l -> Maybe r-foldDUAL _ _ _ _ _ (DUALTree (Option Nothing))+foldDUAL _ _ _ _ _ (DUALTree Nothing)   = Nothing-foldDUAL l u c d a (DUALTree (Option (Just (DUALTreeU (_, t)))))+foldDUAL l u c d a (DUALTree (Just (DUALTreeU (_, t))))   = Just $ foldDUALNE l u c d a t  -- | A specialized fold provided for convenience: flatten a tree into