family-tree 0.4.1.0 → 0.4.1.1

raw patch · 2 files changed

+3/−9 lines, 2 files

Files

• family-tree.cabal +1/−1
• src/Data/FamilyTree.hs +2/−8

@@ -10,7 +10,7 @@ -- PVP summary:      +-+------- breaking API changes --                   | | +----- non-breaking API additions --                   | | | +--- code changes with no API change-version:             0.4.1.0+version:             0.4.1.1  package-url:         https://github.com/Taneb/family-tree 

@@ -30,7 +30,6 @@  birthplace,  deathdate,  deathplace,- attendedEvents,  Family(..),  head1,  head2,@@ -169,8 +168,7 @@     _birthplace = Nothing,     _deathdate = Nothing,     _deathplace = Nothing,-    _attributes = HM.empty,-    _attendedEvents = IS.empty+    _attributes = HM.empty     }   p1 `mappend` p2 = Person {     _name = ((<|>) `on` _name) p1 p2,@@ -178,8 +176,7 @@     _birthplace = ((<|>) `on` _birthplace) p1 p2,     _deathdate = ((<|>) `on` _deathdate) p1 p2,     _deathplace = ((<|>) `on` _deathplace) p1 p2,-    _attributes = (HM.union `on` _attributes) p1 p2,-    _attendedEvents = (IS.union `on` _attendedEvents) p1 p2+    _attributes = (HM.union `on` _attributes) p1 p2     }  instance Monoid Family where@@ -238,7 +235,6 @@     put (toModifiedJulianDay . I.sup <$> _deathdate person)     put (_deathplace person)     put (map (both %~ encodeUtf8) . HM.toList $ _attributes person)-    put (_attendedEvents person)   get = do     n <- get     bdi <- get@@ -248,7 +244,6 @@     dds <- get     dp <- get     a <- get-    e <- get     return Person       {_name = fmap decodeUtf8 n       ,_birthdate = I.I <$> fmap ModifiedJulianDay bdi <*>@@ -258,7 +253,6 @@         fmap ModifiedJulianDay dds       ,_deathplace = dp       ,_attributes = HM.fromList $ map (both %~ decodeUtf8) a-      ,_attendedEvents = e       }  instance Binary Family where