Add support for Tags in CTree

These do have an impact on the generated CBOR.

Author: nc6

cuddle.cabal

@@ -1,6 +1,6 @@
 cabal-version:   3.4
 name:            cuddle
-version:         0.1.12.0
+version:         0.1.20.0
 synopsis:        CDDL Generator and test utilities
 
 -- description:

src/Codec/CBOR/Cuddle/CBOR/Gen.hs

@@ -318,6 +318,11 @@ genForCTree (CTree.Enum node) = do
       genForNode $ nodes !! ix
     _ -> error "Attempt to form an enum from something other than a group"
 genForCTree (CTree.Unwrap node) = genForCTree =<< resolveIfRef node
+genForCTree (CTree.Tag tag node) = do
+  enc <- genForNode node
+  case enc of
+    S x -> pure $ S $ TTagged tag x
+    _ -> error "Tag controller does not correspond to a single term"
 
 genForNode :: (RandomGen g) => CTree.Node MonoRef -> M g WrappedTerm
 genForNode = genForCTree <=< resolveIfRef

src/Codec/CBOR/Cuddle/CDDL/CTree.hs

@@ -13,6 +13,7 @@ import Codec.CBOR.Cuddle.CDDL.Postlude (PTerm)
 import Data.Hashable (Hashable)
 import Data.List.NonEmpty qualified as NE
 import Data.Map.Strict qualified as Map
+import Data.Word (Word64)
 import GHC.Generics (Generic)
 
 --------------------------------------------------------------------------------
@@ -42,6 +43,7 @@ data CTree f
   | Control {op :: CtlOp, target :: Node f, controller :: Node f}
   | Enum (Node f)
   | Unwrap (Node f)
+  | Tag Word64 (Node f)
   deriving (Generic)
 
 -- | Traverse the CTree, carrying out the given operation at each node
@@ -67,6 +69,7 @@ traverseCTree atNode (Control o t c) = do
   pure $ Control o t' c'
 traverseCTree atNode (Enum ref) = Enum <$> atNode ref
 traverseCTree atNode (Unwrap ref) = Unwrap <$> atNode ref
+traverseCTree atNode (Tag i ref) = Tag i <$> atNode ref
 
 type Node f = f (CTree f)
 

src/Codec/CBOR/Cuddle/CDDL/Resolve.hs

@@ -183,9 +183,11 @@ buildRefCTree rules = CTreeRoot $ fmap toCTreeRule rules
         Ref n (fromGenArgs margs)
     toCTreeT2 (T2Enum g) = toCTreeEnum g
     toCTreeT2 (T2EnumRef n margs) = Ref n $ fromGenArgs margs
-    toCTreeT2 (T2Tag _mint t0) =
+    toCTreeT2 (T2Tag Nothing t0) =
       -- Currently not validating tags
       toCTreeT0 t0
+    toCTreeT2 (T2Tag (Just tag) t0) =
+      It . CTree.Tag tag $ toCTreeT0 t0
     toCTreeT2 (T2DataItem _maj _mmin) =
       -- We don't validate numerical items yet
       It $ CTree.Postlude PTAny