Implement parsing and generation of major type 7

Author: jasagredo

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

@@ -202,6 +202,7 @@ genPostlude pt = case pt of
   PTText -> TString <$> genText 30
   PTAny -> pure $ TString "Any"
   PTNil -> pure TNull
+  PTUndefined -> pure $ TSimple 23
 
 --------------------------------------------------------------------------------
 -- Kinds of terms
@@ -427,6 +428,7 @@ genValue (VText t) = pure $ TString t
 genValue (VBytes b) = case Base16.decode b of
   Right bHex -> pure $ TBytes bHex
   Left err -> error $ "Unable to parse hex encoded bytestring: " <> err
+genValue (VBool b) = pure $ TBool b
 
 --------------------------------------------------------------------------------
 -- Generator functions

src/Codec/CBOR/Cuddle/CDDL.hs

@@ -375,6 +375,7 @@ data Value
   | VFloat64 Double
   | VText T.Text
   | VBytes B.ByteString
+  | VBool Bool
   deriving (Eq, Generic, Show)
   deriving anyclass (ToExpr)
 

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

@@ -49,6 +49,7 @@ data PTerm
   | PTText
   | PTAny
   | PTNil
+  | PTUndefined
   deriving (Eq, Generic, Ord, Show)
 
 instance Hashable PTerm

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

@@ -191,11 +191,28 @@ buildRefCTree rules = CTreeRoot $ fmap toCTreeRule rules
       toCTreeT0 t0
     toCTreeT2 (T2Tag (Just tag) t0) =
       It . CTree.Tag tag $ toCTreeT0 t0
+    toCTreeT2 (T2DataItem 7 (Just mmin)) =
+      toCTreeDataItem mmin
     toCTreeT2 (T2DataItem _maj _mmin) =
       -- We don't validate numerical items yet
       It $ CTree.Postlude PTAny
     toCTreeT2 T2Any = It $ CTree.Postlude PTAny
 
+    toCTreeDataItem 20 =
+      It . CTree.Literal $ VBool False
+    toCTreeDataItem 21 =
+      It . CTree.Literal $ VBool True
+    toCTreeDataItem 25 =
+      It $ CTree.Postlude PTHalf
+    toCTreeDataItem 26 =
+      It $ CTree.Postlude PTFloat
+    toCTreeDataItem 27 =
+      It $ CTree.Postlude PTDouble
+    toCTreeDataItem 23 =
+      It $ CTree.Postlude PTUndefined
+    toCTreeDataItem _ =
+      It $ CTree.Postlude PTAny
+
     toCTreeGroupEntryNC :: WithComments GroupEntry -> CTree.Node OrRef
     toCTreeGroupEntryNC = toCTreeGroupEntry . stripComment
 

src/Codec/CBOR/Cuddle/Pretty.hs

@@ -218,3 +218,5 @@ instance Pretty Value where
   pretty (VFloat64 i) = pretty i
   pretty (VText t) = enclose "\"" "\"" $ pretty t
   pretty (VBytes b) = fromString $ "h" <> "'" <> BS.unpack b <> "'"
+  pretty (VBool True) = "true"
+  pretty (VBool False) = "false"