Skip to content

Error when duplicates encountered #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Soupstraw wants to merge 1 commit into from
Closed

Error when duplicates encountered #109

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/Codec/CBOR/Cuddle/Huddle.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ import Data.Function (on)
import Data.Generics.Product (HasField' (field'), field, getField)
import Data.List qualified as L
import Data.List.NonEmpty qualified as NE
import Data.Map.Ordered.Strict (OMap, (|<>))
import Data.Map.Ordered.Strict (OMap)
import Data.Map.Ordered.Strict qualified as OMap
import Data.Set qualified as Set
import Data.String (IsString (fromString))
Expand Down Expand Up @@ -167,7 +167,9 @@ data Huddle = Huddle
-- definition from the `Huddle` value on the left.
huddleAugment :: Huddle -> Huddle -> Huddle
huddleAugment (Huddle rootsL itemsL) (Huddle rootsR itemsR) =
Huddle (L.nubBy ((==) `on` name) $ rootsL <> rootsR) (itemsL |<> itemsR)
Huddle
(L.nubBy ((==) `on` name) $ rootsL <> rootsR)
(OMap.unionWithL (\t _ _ -> error $ "Duplicate definitions: " <> show t) itemsL itemsR)

-- | This semigroup instance:
-- - Takes takes the roots from the RHS unless they are empty, in which case
Expand All @@ -185,7 +187,8 @@ instance Semigroup Huddle where
{ roots = case roots h2 of
[] -> roots h1
xs -> xs
, items = OMap.unionWithL (\_ _ v2 -> v2) (items h1) (items h2)
, items =
OMap.unionWithL (\t _ _ -> error $ "Duplicate definitions found: " <> show t) (items h1) (items h2)
}

-- | This instance is mostly used for testing
Expand Down