Error when duplicates encountered

Author: Soupstraw

nix/shell.nix

@@ -36,10 +36,6 @@ let
         enable = true;
         package = tools.fourmolu;
       };
-      hlint = {
-        enable = true;
-        package = tools.hlint;
-      };
       nixpkgs-fmt = {
         enable = true;
         package = pkgs.nixpkgs-fmt;

src/Codec/CBOR/Cuddle/Huddle.hs

@@ -97,7 +97,6 @@ import Codec.CBOR.Cuddle.CDDL (CDDL)
 import Codec.CBOR.Cuddle.CDDL qualified as C
 import Codec.CBOR.Cuddle.CDDL.CtlOp qualified as CtlOp
 import Codec.CBOR.Cuddle.Comments qualified as C
-import Control.Monad (when)
 import Control.Monad.State (MonadState (get), execState, modify)
 import Data.ByteString (ByteString)
 import Data.Default.Class (Default (..))
@@ -109,6 +108,7 @@ 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))
+import Data.Text (Text)
 import Data.Text qualified as T
 import Data.Tuple.Optics (Field2 (..))
 import Data.Void (Void)
@@ -1007,6 +1007,10 @@ hiName (HIRule (Named n _ _)) = n
 hiName (HIGroup (Named n _ _)) = n
 hiName (HIGRule (Named n _ _)) = n
 
+data HuddleError
+  = DuplicateDefinitions Text
+  deriving (Eq, Show)
+
 -- | Collect all rules starting from a given point. This will also insert a
 --   single pseudo-rule as the first element which references the specified
 --   top-level rules.
@@ -1017,6 +1021,12 @@ collectFrom topRs =
       (traverse goHuddleItem topRs)
       OMap.empty
   where
+    whenNotDefined n m = do
+      items <- get
+      if OMap.notMember n items
+        then m
+        else error $ "Duplicate definitions found: " <> show n
+
     toHuddle items =
       Huddle
         { roots = concatMap hiRule topRs
@@ -1026,21 +1036,18 @@ collectFrom topRs =
     goHuddleItem (HIGroup g) = goNamedGroup g
     goHuddleItem (HIGRule (Named _ (GRule _ t0) _)) = goT0 t0
     goRule r@(Named n t0 _) = do
-      items <- get
-      when (OMap.notMember n items) $ do
+      whenNotDefined n $ do
         modify (OMap.|> (n, HIRule r))
         goT0 t0
     goChoice f (NoChoice x) = f x
     goChoice f (ChoiceOf x xs) = f x >> goChoice f xs
     goT0 = goChoice goT2
     goNamedGroup r@(Named n g _) = do
-      items <- get
-      when (OMap.notMember n items) $ do
+      whenNotDefined n $ do
         modify (OMap.|> (n, HIGroup r))
         goGroup g
     goGRule r@(Named n g _) = do
-      items <- get
-      when (OMap.notMember n items) $ do
+      whenNotDefined n $ do
         modify (OMap.|> (n, HIGRule $ fmap callToDef r))
         goT0 (body g)
       -- Note that the parameters here may be different, so this doesn't live