fix(eo-phi-normalizer): allow optional "when" and "tests" in the rule…

…s file
objectionary · Nov 28, 2024 · dc71f63 · dc71f63
1 parent f417b6f
commit dc71f63
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/eo-phi-normalizer/src/Language/EO/Phi/Rules/Yaml.hs b/eo-phi-normalizer/src/Language/EO/Phi/Rules/Yaml.hs
@@ -101,8 +101,8 @@ data Rule = Rule
   , pattern :: Object
   , result :: Object
   , fresh :: Maybe [FreshMetaId]
-  , when :: [Condition]
-  , tests :: [RuleTest]
+  , when :: Maybe [Condition]
+  , tests :: Maybe [RuleTest]
   }
   deriving (Generic, FromJSON, Show)
 
@@ -183,7 +183,7 @@ convertRule Rule{..} ctx obj = do
   let pattern' = applySubst contextSubsts pattern
       result' = applySubst contextSubsts result
   subst <- matchObject pattern' obj
-  guard $ all (\cond -> checkCond ctx cond (contextSubsts <> subst)) when
+  guard $ all (\cond -> checkCond ctx cond (contextSubsts <> subst)) (fromMaybe [] when)
   let substFresh = mkFreshSubst ctx result' fresh
       result'' = applySubst (contextSubsts <> subst <> substFresh) result'
       -- TODO #152:30m what context should we pass to evaluate meta funcs?

diff --git a/eo-phi-normalizer/src/Language/EO/Phi/ToLaTeX.hs b/eo-phi-normalizer/src/Language/EO/Phi/ToLaTeX.hs
@@ -119,7 +119,7 @@ instance ToLatex RuleAttribute where
 instance ToLatex Condition where
   toLatex (IsNF nf) = inMathMode $ toLatex nf <> "\\in\\mathcal{N}"
   toLatex (IsNFInsideFormation nf_inside_formation) =
-    (inMathMode $ toLatex nf_inside_formation) <> " is nf inside formation"
+    inMathMode (toLatex nf_inside_formation) <> " is nf inside formation"
   toLatex (PresentAttrs (AttrsInBindings attrs bindings)) =
     inMathMode $ fold (intersperse ", " (map toLatex attrs)) <> " \\in " <> foldMap toLatex bindings
   toLatex (AbsentAttrs (AttrsInBindings attrs bindings)) =
@@ -147,7 +147,7 @@ instance ToLatex Rule where
       <> inMathMode (toLatex result)
       <> (if not (null when) || isNonEmptyContext context then "\\\\\\text {if }" else mempty)
       <> maybe mempty (\c -> "&" <> toLatex c <> "\\\\") context
-      <> fold (intersperse ",\\\\" (map (("&" <>) . toLatex) when))
+      <> fold (intersperse ",\\\\" (maybe [] (map (("&" <>) . toLatex)) when))
 
 instance ToLatex [Rule] where
   toLatex rules =
@@ -166,7 +166,7 @@ ruleToLatexCompact (Rule name _ context _ pattern result _ when _) =
     <> inMathMode (toLatex result)
     <> (if not (null when) || isNonEmptyContext context then "\\quad\\text {if }" else "")
     <> maybe mempty (\c -> toLatex c <> ", ") context
-    <> fold (intersperse ", " (map toLatex when))
+    <> fold (intersperse ", " (maybe [] (map toLatex) when))
 
 rulesToLatexCompact :: [Rule] -> LaTeX
 rulesToLatexCompact rules =

diff --git a/eo-phi-normalizer/src/Language/EO/Test/YamlSpec.hs b/eo-phi-normalizer/src/Language/EO/Test/YamlSpec.hs
@@ -27,6 +27,7 @@
 module Language.EO.Test.YamlSpec where
 
 import Control.Monad (forM_)
+import Data.Maybe (fromMaybe)
 import Language.EO.Phi.Dataize.Context (defaultContext)
 import Language.EO.Phi.Rules.Common (applyOneRule)
 import Language.EO.Phi.Rules.Yaml (Rule (..), RuleSet (..), RuleTest (..), RuleTestOption (..), convertRuleNamed)
@@ -40,7 +41,8 @@ spec testPaths = describe "User-defined rules unit tests" do
     describe ruleset.title do
       forM_ ruleset.rules $ \rule -> do
         describe rule.name do
-          forM_ rule.tests $ \ruleTest -> do
+          let tests' = fromMaybe [] rule.tests
+          forM_ tests' $ \ruleTest -> do
             it ruleTest.name $
               let rule' = convertRuleNamed rule
                   resultOneStep = applyOneRule (defaultContext [rule'] ruleTest.input) ruleTest.input