move Simplify module

swarm-game · Jan 25, 2023 · bbad150 · bbad150
1 parent 28ac648
commit bbad150
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...Swarm/Game/Scenario/Objective/Simplify.hs → src/Data/BoolExpr/Simplify.hs b/...Swarm/Game/Scenario/Objective/Simplify.hs → src/Data/BoolExpr/Simplify.hs
@@ -1,6 +1,6 @@
 -- | Simplification logic for boolean expressions that is not
 -- provided in the 'boolexpr' package.
-module Swarm.Game.Scenario.Objective.Simplify (
+module Data.BoolExpr.Simplify (
   cannotBeTrue,
   replace,
 ) where

diff --git a/src/Swarm/Game/Scenario/Objective/WinCheck.hs b/src/Swarm/Game/Scenario/Objective/WinCheck.hs
@@ -3,14 +3,14 @@ module Swarm.Game.Scenario.Objective.WinCheck where
 
 import Data.Aeson
 import Data.BoolExpr qualified as BE
+import Data.BoolExpr.Simplify qualified as Simplify
 import Data.List (partition)
 import Data.Map qualified as M
 import Data.Set (Set)
 import Data.Set qualified as Set
 import GHC.Generics (Generic)
 import Swarm.Game.Scenario.Objective
 import Swarm.Game.Scenario.Objective.Logic as L
-import Swarm.Game.Scenario.Objective.Simplify qualified as Simplify
 
 -- | We have "won" if all of the "unwinnable" or remaining "incomplete" objectives are "optional".
 didWin :: ObjectiveCompletion -> Bool

diff --git a/swarm.cabal b/swarm.cabal
@@ -82,6 +82,7 @@ common ghc2021-extensions
 library
     import:           stan-config, common, ghc2021-extensions
     exposed-modules:  Data.BoolExpr
+                      Data.BoolExpr.Simplify
                       Swarm.App
                       Swarm.DocGen
                       Swarm.Game.CESK
@@ -97,7 +98,6 @@ library
                       Swarm.Game.Scenario.Objective.Graph
                       Swarm.Game.Scenario.Objective.Presentation.Model
                       Swarm.Game.Scenario.Objective.Presentation.Render
-                      Swarm.Game.Scenario.Objective.Simplify
                       Swarm.Game.Scenario.Objective.Validation
                       Swarm.Game.Scenario.Objective.WinCheck
                       Swarm.Game.Scenario.Objective

diff --git a/test/unit/TestBoolExpr.hs b/test/unit/TestBoolExpr.hs
@@ -4,10 +4,10 @@
 module TestBoolExpr where
 
 import Data.BoolExpr qualified as BE
+import Data.BoolExpr.Simplify qualified as Simplify
 import Data.List.NonEmpty (NonEmpty ((:|)))
 import Data.Set qualified as Set
 import Swarm.Game.Scenario.Objective.Logic
-import Swarm.Game.Scenario.Objective.Simplify qualified as Simplify
 import Swarm.Game.Scenario.Objective.WinCheck qualified as WC
 import Test.Tasty
 import Test.Tasty.HUnit