Allow collecting from multiple rules.

Author: nc6

example/Conway.hs

@@ -20,7 +20,7 @@ import GHC.Show (Show (show))
 default (Integer, Double)
 
 conway :: Huddle
-conway = collectFrom block
+conway = collectFrom [block]
 
 block :: Rule
 block =

src/Codec/CBOR/Cuddle/Huddle.hs

@@ -789,11 +789,11 @@ binding2 fRule t0 t1 =
 --------------------------------------------------------------------------------
 
 -- | Collect all rules starting from a given point.
-collectFrom :: Rule -> Huddle
-collectFrom topR =
+collectFrom :: [Rule] -> Huddle
+collectFrom topRs =
   toHuddle $
     execState
-      (goRule topR)
+      (traverse goRule topRs)
       (HaskMap.empty, HaskMap.empty, HaskMap.empty)
   where
     toHuddle (rules, groups, gRules) =

test/Test/Codec/CBOR/Cuddle/Huddle.hs

@@ -105,10 +105,10 @@ genericSpec =
         dict = binding2 $ \k v -> "dict" =:= mp [0 <+ asKey k ==> v]
      in do
           it "Should bind a single parameter" $
-            toCDDL (collectFrom ("intset" =:= set VUInt))
+            toCDDL (collectFrom ["intset" =:= set VUInt])
               `shouldMatchParseCDDL` "intset = set<uint>\n set<a0> = [* a0]"
           it "Should bind two parameters" $
-            toCDDL (collectFrom ("mymap" =:= dict VUInt VText))
+            toCDDL (collectFrom ["mymap" =:= dict VUInt VText])
               `shouldMatchParseCDDL` "mymap = dict<uint, text>\n dict<a0, b0> = {* a0 => b0}"
 
 --------------------------------------------------------------------------------