SimplifyL4.hs: Streamline / improve the mapM-ing in simplifyHcBodyBsr

Co-authored-by: johsi-k <johsi.k@gmail.com>
smucclaw · Aug 28, 2023 · 1993573 · 1993573
1 parent 22fc2bd
commit 1993573
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/lib/haskell/natural4/src/LS/XPile/LogicalEnglish/SimplifyL4.hs b/lib/haskell/natural4/src/LS/XPile/LogicalEnglish/SimplifyL4.hs
@@ -159,17 +159,10 @@ simpheadRPC exprsl exprsr =
 
 simplifyHcBodyBsr :: L4.BoolStructR -> SimpL4 (BoolPropn L4AtomicP)
 simplifyHcBodyBsr = \case
-  AA.Leaf rp      -> 
-    simplifybodyRP rp
-  AA.All _ propns -> do
-    props <- mapM simplifyHcBodyBsr propns
-    return $ And props
-  AA.Any _ propns -> do
-    props <- mapM simplifyHcBodyBsr propns
-    return $ Or props
-  AA.Not propn    -> do
-    prop <- simplifyHcBodyBsr propn
-    return $ Not prop
+  AA.Leaf rp      -> simplifybodyRP rp
+  AA.All _ propns -> And <$> mapM simplifyHcBodyBsr propns
+  AA.Any _ propns -> Or <$> mapM simplifyHcBodyBsr propns
+  AA.Not propn    -> Not <$> simplifyHcBodyBsr propn
 {- ^ where a 'L4 propn' = BoolStructR =  BoolStruct _lbl RelationalPredicate.
 Note that a BoolStructR is NOT a 'RPBoolStructR' --- a RPBoolStructR is one of the data constructors for the RelationalPredicate sum type
 -}