Re-export necessary types for ledger tests

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## 1.1.0.0
 
+* Implement `IndexMappable` instance for
+  - `HuddleStage` to `CTreePhase`
+  - `HuddleStage` to `PrettyStage`
 * Change the order of fields in `GroupEntry`; the extension field is now the last field
 * Add `IndexMappable` to help with traversing `CDDL` trees
 * Add an index type parameter to all `CDDL` terms
@@ -13,7 +16,7 @@
 * Changed the type of the first argument for `generateCBORTerm` and 
   `generateCBORTerm'` to `CTreeRoot`
 * Removed all exports in `Codec.CBOR.Cuddle.CBOR.Validator` except for 
-  `validateCBOR` and `validateCBOR'`
+  `validateCBOR`, `validateCBOR'`, `CBORTermResult` and `CDDLResult`
 
 ## 1.0.0.0
 

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/CBOR/Validator.hs

@@ -5,6 +5,8 @@
 module Codec.CBOR.Cuddle.CBOR.Validator (
   validateCBOR,
   validateCBOR',
+  CDDLResult (..),
+  CBORTermResult (..),
 ) where
 
 import Codec.CBOR.Cuddle.CDDL hiding (CDDL, Group, Rule)

src/Codec/CBOR/Cuddle/Huddle.hs

@@ -1017,6 +1017,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,16 +1032,14 @@ 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

src/Codec/CBOR/Cuddle/IndexMappable.hs

@@ -214,6 +214,34 @@ instance IndexMappable XXType2 ParserStage HuddleStage where
 instance IndexMappable XTerm ParserStage HuddleStage where
   mapIndex (ParserXTerm c) = HuddleXTerm c
 
+-- HuddleStage -> CTreePhase
+
+instance IndexMappable XCddl HuddleStage CTreePhase where
+  mapIndex (HuddleXCddl c) = CTreeXCddl c
+
+instance IndexMappable XXTopLevel HuddleStage CTreePhase where
+  mapIndex (HuddleXXTopLevel c) = CTreeXXTopLevel c
+
+instance IndexMappable XXType2 HuddleStage CTreePhase where
+  mapIndex (HuddleXXType2 c) = CTreeXXType2 c
+
+instance IndexMappable XTerm HuddleStage CTreePhase where
+  mapIndex (HuddleXTerm c) = CTreeXTerm c
+
+-- HuddleStage -> PrettyStage
+
+instance IndexMappable XCddl HuddleStage PrettyStage where
+  mapIndex (HuddleXCddl c) = PrettyXCddl c
+
+instance IndexMappable XXTopLevel HuddleStage PrettyStage where
+  mapIndex (HuddleXXTopLevel c) = PrettyXXTopLevel c
+
+instance IndexMappable XXType2 HuddleStage PrettyStage where
+  mapIndex (HuddleXXType2 c) = absurd c
+
+instance IndexMappable XTerm HuddleStage PrettyStage where
+  mapIndex (HuddleXTerm c) = PrettyXTerm c
+
 -- ParserStage -> ParserStage
 
 instance IndexMappable XCddl ParserStage ParserStage