Move partitionPredicates to Booster.Pattern.Bool

Author: geo2a

booster/library/Booster/Pattern/Bool.hs

@@ -13,6 +13,7 @@ module Booster.Pattern.Bool (
     mkEq,
     destructEq,
     asEquations,
+    partitionPredicates,
     -- patterns
     pattern TrueBool,
     pattern FalseBool,
@@ -27,8 +28,10 @@ module Booster.Pattern.Bool (
 ) where
 
 import Data.ByteString.Char8 (ByteString)
+import Data.List (partition)
 import Data.Map.Strict (Map)
 import Data.Map.Strict qualified as Map
+import Data.Maybe (isJust, mapMaybe)
 
 import Booster.Definition.Attributes.Base (
     FunctionType (..),
@@ -232,3 +235,9 @@ destructEq = \case
 -- | turns a substitution into a list of equations
 asEquations :: Map Variable Term -> [Predicate]
 asEquations = map (uncurry mkEq) . Map.assocs
+
+-- | Extract substitution items from a list of generic predicates. Return empty substitution if none are found
+partitionPredicates :: [Predicate] -> (Map Variable Term, [Predicate])
+partitionPredicates ps =
+    let (substItems, normalPreds) = partition (isJust . destructEq) ps
+     in (Map.fromList . mapMaybe destructEq $ substItems, normalPreds)

booster/library/Booster/Pattern/Rewrite.hs

@@ -37,7 +37,7 @@ import Data.List (intersperse, partition)
 import Data.List.NonEmpty (NonEmpty (..), toList)
 import Data.List.NonEmpty qualified as NE
 import Data.Map qualified as Map
-import Data.Maybe (catMaybes, fromMaybe, isJust, mapMaybe)
+import Data.Maybe (catMaybes, fromMaybe, mapMaybe)
 import Data.Sequence (Seq, (|>))
 import Data.Set qualified as Set
 import Data.Text as Text (Text, pack)
@@ -393,12 +393,6 @@ applyRule pat@Pattern{ceilConditions} rule =
                         withPatternContext rewritten $
                             return (rule, rewritten)
   where
-    -- extract substitution items from a list of generic predicates. Return empty substitution if none are found
-    partitionPredicates :: [Predicate] -> (Substitution, [Predicate])
-    partitionPredicates ps =
-        let (substItems, normalPreds) = partition (isJust . destructEq) ps
-         in (Map.fromList . mapMaybe destructEq $ substItems, normalPreds)
-
     -- Given known predicates, a known substitution and a newly acquired substitution (from the ensures clause):
     -- - apply the new substitution to the old substitution
     -- - simplify the substituted old substitution, assuming known truth