add support for rule labels in constitutive rules too. issue #27

mengwong/mp/src/Lib.hs

@@ -324,7 +324,7 @@ pConstitutiveRule = debugName "pConstitutiveRule" $ do
   myTraceM $ "pConstitutiveRule: matched defWord " ++ show defWord
   myTraceM $ "pConstitutiveRule: \"" ++ Text.unpack term ++ "\" " ++ show defWord ++ "..."
   (ands,rs) <- withDepth leftX dBoolRules -- (foo AND (bar OR baz), [constitutive and regulative sub-rules])
-  return $ Constitutive term ands : rs
+  return $ Constitutive term ands Nothing : rs
 
 pRegRule :: Parser [Rule]
 pRegRule = debugName "pRegRule" $ try pRegRuleSugary <|> pRegRuleNormal

mengwong/mp/src/Types.hs

@@ -35,6 +35,7 @@ data Rule = Regulative
           | Constitutive
             { term :: ConstitutiveTerm
             , cond :: Maybe BoolStruct
+            , rlabel :: Maybe Text.Text
             }
           | RegAlias Text.Text -- softlink to a regulative rule label
           | ConAlias Text.Text -- softlink to a constitutive rule label

mengwong/mp/test/Spec.hs

@@ -120,6 +120,7 @@ main = do
       let degustates = Constitutive
                        { term = "degustates"
                        , cond = Just $ Any ( Pre "any of:" ) [ Leaf "eats", Leaf "drinks" ]
+                       , rlabel = Nothing
                        }
 
       it "should parse a simple constitutive rule" $ do
@@ -141,6 +142,7 @@ main = do
                         , Constitutive
                           { term = "degustates"
                           , cond = Just $ Any ( Pre "any of:" ) [ Leaf "eats", Leaf "drinks" ]
+                          , rlabel = Nothing
                           }
                         ]
 
@@ -209,10 +211,6 @@ main = do
         mycsv <- BS.readFile "test/chained-regulatives.csv"
         parseR (pRule <* eof) "" (exampleStream mycsv) `shouldParse` singer_chain
 
-      it "should render a box" $ do
-        asBoxes <$> asCSV indentedDummySing
-          `shouldBe` Right "abc\n"
-
   -- upgrade single OR group to bypass the top level AND group