swarm-game · xsebek · Feb 18, 2023 · Feb 18, 2023 · Feb 18, 2023 · Feb 18, 2023
diff --git a/src/Data/BoolExpr.hs → src/boolexpr/Data/BoolExpr.hs b/src/Data/BoolExpr.hs → src/boolexpr/Data/BoolExpr.hs
diff --git a/src/Data/BoolExpr/Simplify.hs → src/boolexpr/Data/BoolExpr/Simplify.hs b/src/Data/BoolExpr/Simplify.hs → src/boolexpr/Data/BoolExpr/Simplify.hs
diff --git a/src/Swarm/App.hs → src/swarm-app/Swarm/App.hs b/src/Swarm/App.hs → src/swarm-app/Swarm/App.hs
diff --git a/src/Swarm/DocGen.hs → src/swarm-app/Swarm/DocGen.hs b/src/Swarm/DocGen.hs → src/swarm-app/Swarm/DocGen.hs
diff --git a/src/Swarm/Web.hs → src/swarm-app/Swarm/Web.hs b/src/Swarm/Web.hs → src/swarm-app/Swarm/Web.hs
diff --git a/app/Main.hs → src/swarm-exe/Main.hs b/app/Main.hs → src/swarm-exe/Main.hs
diff --git a/src/Swarm/Game/Achievement/Attainment.hs → ...game/Swarm/Game/Achievement/Attainment.hs b/src/Swarm/Game/Achievement/Attainment.hs → ...game/Swarm/Game/Achievement/Attainment.hs
diff --git a/src/Swarm/Game/Achievement/Definitions.hs → ...ame/Swarm/Game/Achievement/Definitions.hs b/src/Swarm/Game/Achievement/Definitions.hs → ...ame/Swarm/Game/Achievement/Definitions.hs
diff --git a/src/Swarm/Game/Achievement/Description.hs → ...ame/Swarm/Game/Achievement/Description.hs b/src/Swarm/Game/Achievement/Description.hs → ...ame/Swarm/Game/Achievement/Description.hs
diff --git a/src/Swarm/Game/Achievement/Persistence.hs → ...ame/Swarm/Game/Achievement/Persistence.hs b/src/Swarm/Game/Achievement/Persistence.hs → ...ame/Swarm/Game/Achievement/Persistence.hs
@@ -9,7 +9,7 @@ import Data.Either (partitionEithers)
 import Data.Yaml qualified as Y
 import Swarm.Game.Achievement.Attainment
 import Swarm.Game.Achievement.Definitions
-import Swarm.TUI.Model.Failure
+import Swarm.Game.Util.Failure
 import Swarm.Util
 import System.Directory (
   doesDirectoryExist,

diff --git a/src/Swarm/Game/CESK.hs → src/swarm-game/Swarm/Game/CESK.hs b/src/Swarm/Game/CESK.hs → src/swarm-game/Swarm/Game/CESK.hs
diff --git a/src/Swarm/Game/Display.hs → src/swarm-game/Swarm/Game/Display.hs b/src/Swarm/Game/Display.hs → src/swarm-game/Swarm/Game/Display.hs
diff --git a/src/Swarm/Game/Entity.hs → src/swarm-game/Swarm/Game/Entity.hs b/src/Swarm/Game/Entity.hs → src/swarm-game/Swarm/Game/Entity.hs
diff --git a/src/Swarm/Game/Exception.hs → src/swarm-game/Swarm/Game/Exception.hs b/src/Swarm/Game/Exception.hs → src/swarm-game/Swarm/Game/Exception.hs
diff --git a/src/Swarm/Game/Location.hs → src/swarm-game/Swarm/Game/Location.hs b/src/Swarm/Game/Location.hs → src/swarm-game/Swarm/Game/Location.hs
diff --git a/src/Swarm/Game/Log.hs → src/swarm-game/Swarm/Game/Log.hs b/src/Swarm/Game/Log.hs → src/swarm-game/Swarm/Game/Log.hs
diff --git a/src/Swarm/Game/Recipe.hs → src/swarm-game/Swarm/Game/Recipe.hs b/src/Swarm/Game/Recipe.hs → src/swarm-game/Swarm/Game/Recipe.hs
diff --git a/src/Swarm/Game/Robot.hs → src/swarm-game/Swarm/Game/Robot.hs b/src/Swarm/Game/Robot.hs → src/swarm-game/Swarm/Game/Robot.hs
diff --git a/src/Swarm/Game/Scenario.hs → src/swarm-game/Swarm/Game/Scenario.hs b/src/Swarm/Game/Scenario.hs → src/swarm-game/Swarm/Game/Scenario.hs
diff --git a/src/Swarm/Game/Scenario/Cell.hs → src/swarm-game/Swarm/Game/Scenario/Cell.hs b/src/Swarm/Game/Scenario/Cell.hs → src/swarm-game/Swarm/Game/Scenario/Cell.hs
diff --git a/src/Swarm/Game/Scenario/Objective.hs → ...arm-game/Swarm/Game/Scenario/Objective.hs b/src/Swarm/Game/Scenario/Objective.hs → ...arm-game/Swarm/Game/Scenario/Objective.hs
diff --git a/src/Swarm/Game/Scenario/Objective/Graph.hs → ...me/Swarm/Game/Scenario/Objective/Graph.hs b/src/Swarm/Game/Scenario/Objective/Graph.hs → ...me/Swarm/Game/Scenario/Objective/Graph.hs
diff --git a/src/Swarm/Game/Scenario/Objective/Logic.hs → ...me/Swarm/Game/Scenario/Objective/Logic.hs b/src/Swarm/Game/Scenario/Objective/Logic.hs → ...me/Swarm/Game/Scenario/Objective/Logic.hs
diff --git a/...arm/Game/Scenario/Objective/Validation.hs → ...arm/Game/Scenario/Objective/Validation.hs b/...arm/Game/Scenario/Objective/Validation.hs → ...arm/Game/Scenario/Objective/Validation.hs
diff --git a/...Swarm/Game/Scenario/Objective/WinCheck.hs → ...Swarm/Game/Scenario/Objective/WinCheck.hs b/...Swarm/Game/Scenario/Objective/WinCheck.hs → ...Swarm/Game/Scenario/Objective/WinCheck.hs
diff --git a/src/Swarm/Game/Scenario/RobotLookup.hs → ...m-game/Swarm/Game/Scenario/RobotLookup.hs b/src/Swarm/Game/Scenario/RobotLookup.hs → ...m-game/Swarm/Game/Scenario/RobotLookup.hs
diff --git a/src/Swarm/Game/Scenario/Style.hs → src/swarm-game/Swarm/Game/Scenario/Style.hs b/src/Swarm/Game/Scenario/Style.hs → src/swarm-game/Swarm/Game/Scenario/Style.hs
diff --git a/src/Swarm/Game/Scenario/WorldDescription.hs → ...e/Swarm/Game/Scenario/WorldDescription.hs b/src/Swarm/Game/Scenario/WorldDescription.hs → ...e/Swarm/Game/Scenario/WorldDescription.hs
diff --git a/src/Swarm/Game/ScenarioInfo.hs → src/swarm-game/Swarm/Game/ScenarioInfo.hs b/src/Swarm/Game/ScenarioInfo.hs → src/swarm-game/Swarm/Game/ScenarioInfo.hs
diff --git a/src/Swarm/Game/State.hs → src/swarm-game/Swarm/Game/State.hs b/src/Swarm/Game/State.hs → src/swarm-game/Swarm/Game/State.hs
diff --git a/src/Swarm/Game/Step.hs → src/swarm-game/Swarm/Game/Step.hs b/src/Swarm/Game/Step.hs → src/swarm-game/Swarm/Game/Step.hs
diff --git a/src/Swarm/Game/Terrain.hs → src/swarm-game/Swarm/Game/Terrain.hs b/src/Swarm/Game/Terrain.hs → src/swarm-game/Swarm/Game/Terrain.hs
diff --git a/src/Swarm/TUI/Model/Failure.hs → src/swarm-game/Swarm/Game/Util/Failure.hs b/src/Swarm/TUI/Model/Failure.hs → src/swarm-game/Swarm/Game/Util/Failure.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 
 -- |
--- Module      :  Swarm.Game.Failure
+-- Module      :  Swarm.Game.Util.Failure
 -- Copyright   :  Ondřej Šebek
 -- Maintainer  :  ondras98@icloud.com
 --
@@ -11,7 +11,7 @@
 --
 -- These failures are often not fatal and serve
 -- to create common infrastructure for logging.
-module Swarm.TUI.Model.Failure where
+module Swarm.Game.Util.Failure where
 
 import Data.Char (toLower)
 import Data.Text (Text)

diff --git a/src/Swarm/Game/World.hs → src/swarm-game/Swarm/Game/World.hs b/src/Swarm/Game/World.hs → src/swarm-game/Swarm/Game/World.hs
diff --git a/src/Swarm/Game/WorldGen.hs → src/swarm-game/Swarm/Game/WorldGen.hs b/src/Swarm/Game/WorldGen.hs → src/swarm-game/Swarm/Game/WorldGen.hs
diff --git a/src/Swarm/Language/LSP.hs → ...arm-language-server/Swarm/Language/LSP.hs b/src/Swarm/Language/LSP.hs → ...arm-language-server/Swarm/Language/LSP.hs
diff --git a/src/Swarm/Language/LSP/Hover.hs → ...nguage-server/Swarm/Language/LSP/Hover.hs b/src/Swarm/Language/LSP/Hover.hs → ...nguage-server/Swarm/Language/LSP/Hover.hs
diff --git a/src/Swarm/Language/LSP/VarUsage.hs → ...age-server/Swarm/Language/LSP/VarUsage.hs b/src/Swarm/Language/LSP/VarUsage.hs → ...age-server/Swarm/Language/LSP/VarUsage.hs
diff --git a/src/Swarm/Language/Capability.hs → ...arm-language/Swarm/Language/Capability.hs b/src/Swarm/Language/Capability.hs → ...arm-language/Swarm/Language/Capability.hs
diff --git a/src/Swarm/Language/Context.hs → src/swarm-language/Swarm/Language/Context.hs b/src/Swarm/Language/Context.hs → src/swarm-language/Swarm/Language/Context.hs
diff --git a/src/Swarm/Language/Elaborate.hs → ...warm-language/Swarm/Language/Elaborate.hs b/src/Swarm/Language/Elaborate.hs → ...warm-language/Swarm/Language/Elaborate.hs
diff --git a/src/Swarm/Language/Module.hs → src/swarm-language/Swarm/Language/Module.hs b/src/Swarm/Language/Module.hs → src/swarm-language/Swarm/Language/Module.hs
diff --git a/src/Swarm/Language/Parse.hs → src/swarm-language/Swarm/Language/Parse.hs b/src/Swarm/Language/Parse.hs → src/swarm-language/Swarm/Language/Parse.hs
diff --git a/src/Swarm/Language/Parse/QQ.hs → ...swarm-language/Swarm/Language/Parse/QQ.hs b/src/Swarm/Language/Parse/QQ.hs → ...swarm-language/Swarm/Language/Parse/QQ.hs
diff --git a/src/Swarm/Language/Pipeline.hs → ...swarm-language/Swarm/Language/Pipeline.hs b/src/Swarm/Language/Pipeline.hs → ...swarm-language/Swarm/Language/Pipeline.hs
diff --git a/src/Swarm/Language/Pipeline/QQ.hs → ...rm-language/Swarm/Language/Pipeline/QQ.hs b/src/Swarm/Language/Pipeline/QQ.hs → ...rm-language/Swarm/Language/Pipeline/QQ.hs
diff --git a/src/Swarm/Language/Pretty.hs → src/swarm-language/Swarm/Language/Pretty.hs b/src/Swarm/Language/Pretty.hs → src/swarm-language/Swarm/Language/Pretty.hs
diff --git a/src/Swarm/Language/Requirement.hs → ...rm-language/Swarm/Language/Requirement.hs b/src/Swarm/Language/Requirement.hs → ...rm-language/Swarm/Language/Requirement.hs
diff --git a/src/Swarm/Language/Syntax.hs → src/swarm-language/Swarm/Language/Syntax.hs b/src/Swarm/Language/Syntax.hs → src/swarm-language/Swarm/Language/Syntax.hs
diff --git a/src/Swarm/Language/Typecheck.hs → ...warm-language/Swarm/Language/Typecheck.hs b/src/Swarm/Language/Typecheck.hs → ...warm-language/Swarm/Language/Typecheck.hs
diff --git a/src/Swarm/Language/Typed.hs → src/swarm-language/Swarm/Language/Typed.hs b/src/Swarm/Language/Typed.hs → src/swarm-language/Swarm/Language/Typed.hs
diff --git a/src/Swarm/Language/Types.hs → src/swarm-language/Swarm/Language/Types.hs b/src/Swarm/Language/Types.hs → src/swarm-language/Swarm/Language/Types.hs
diff --git a/src/Swarm/Language/Value.hs → src/swarm-language/Swarm/Language/Value.hs b/src/Swarm/Language/Value.hs → src/swarm-language/Swarm/Language/Value.hs
diff --git a/src/Swarm/TUI/Attr.hs → src/swarm-user-interface/Swarm/TUI/Attr.hs b/src/Swarm/TUI/Attr.hs → src/swarm-user-interface/Swarm/TUI/Attr.hs
diff --git a/src/Swarm/TUI/Border.hs → src/swarm-user-interface/Swarm/TUI/Border.hs b/src/Swarm/TUI/Border.hs → src/swarm-user-interface/Swarm/TUI/Border.hs
diff --git a/src/Swarm/TUI/Controller.hs → ...rm-user-interface/Swarm/TUI/Controller.hs b/src/Swarm/TUI/Controller.hs → ...rm-user-interface/Swarm/TUI/Controller.hs
diff --git a/src/Swarm/TUI/Controller/Util.hs → ...er-interface/Swarm/TUI/Controller/Util.hs b/src/Swarm/TUI/Controller/Util.hs → ...er-interface/Swarm/TUI/Controller/Util.hs
diff --git a/src/Swarm/TUI/Inventory/Sorting.hs → ...-interface/Swarm/TUI/Inventory/Sorting.hs b/src/Swarm/TUI/Inventory/Sorting.hs → ...-interface/Swarm/TUI/Inventory/Sorting.hs
diff --git a/src/Swarm/TUI/List.hs → src/swarm-user-interface/Swarm/TUI/List.hs b/src/Swarm/TUI/List.hs → src/swarm-user-interface/Swarm/TUI/List.hs
diff --git a/src/Swarm/TUI/Model.hs → src/swarm-user-interface/Swarm/TUI/Model.hs b/src/Swarm/TUI/Model.hs → src/swarm-user-interface/Swarm/TUI/Model.hs
diff --git a/src/Swarm/TUI/Model/Goal.hs → ...rm-user-interface/Swarm/TUI/Model/Goal.hs b/src/Swarm/TUI/Model/Goal.hs → ...rm-user-interface/Swarm/TUI/Model/Goal.hs
diff --git a/src/Swarm/TUI/Model/Menu.hs → ...rm-user-interface/Swarm/TUI/Model/Menu.hs b/src/Swarm/TUI/Model/Menu.hs → ...rm-user-interface/Swarm/TUI/Model/Menu.hs
diff --git a/src/Swarm/TUI/Model/Name.hs → ...rm-user-interface/Swarm/TUI/Model/Name.hs b/src/Swarm/TUI/Model/Name.hs → ...rm-user-interface/Swarm/TUI/Model/Name.hs
diff --git a/src/Swarm/TUI/Model/Repl.hs → ...rm-user-interface/Swarm/TUI/Model/Repl.hs b/src/Swarm/TUI/Model/Repl.hs → ...rm-user-interface/Swarm/TUI/Model/Repl.hs
diff --git a/src/Swarm/TUI/Model/StateUpdate.hs → ...-interface/Swarm/TUI/Model/StateUpdate.hs b/src/Swarm/TUI/Model/StateUpdate.hs → ...-interface/Swarm/TUI/Model/StateUpdate.hs
@@ -37,10 +37,10 @@ import Swarm.Game.ScenarioInfo (
   _SISingle,
  )
 import Swarm.Game.State
+import Swarm.Game.Util.Failure (prettyFailure)
 import Swarm.TUI.Attr (swarmAttrMap)
 import Swarm.TUI.Inventory.Sorting
 import Swarm.TUI.Model
-import Swarm.TUI.Model.Failure (prettyFailure)
 import Swarm.TUI.Model.Goal (emptyGoalDisplay)
 import Swarm.TUI.Model.Repl
 import Swarm.TUI.Model.UI

diff --git a/src/Swarm/TUI/Model/UI.hs → ...warm-user-interface/Swarm/TUI/Model/UI.hs b/src/Swarm/TUI/Model/UI.hs → ...warm-user-interface/Swarm/TUI/Model/UI.hs
@@ -63,10 +63,10 @@ import Swarm.Game.Achievement.Persistence
 import Swarm.Game.ScenarioInfo (
   ScenarioInfoPair,
  )
+import Swarm.Game.Util.Failure (SystemFailure)
 import Swarm.Game.World qualified as W
 import Swarm.TUI.Attr (swarmAttrMap)
 import Swarm.TUI.Inventory.Sorting
-import Swarm.TUI.Model.Failure (SystemFailure)
 import Swarm.TUI.Model.Goal
 import Swarm.TUI.Model.Menu
 import Swarm.TUI.Model.Name

diff --git a/src/Swarm/TUI/Panel.hs → src/swarm-user-interface/Swarm/TUI/Panel.hs b/src/Swarm/TUI/Panel.hs → src/swarm-user-interface/Swarm/TUI/Panel.hs
diff --git a/src/Swarm/TUI/View.hs → src/swarm-user-interface/Swarm/TUI/View.hs b/src/Swarm/TUI/View.hs → src/swarm-user-interface/Swarm/TUI/View.hs
diff --git a/src/Swarm/TUI/View/Achievement.hs → ...r-interface/Swarm/TUI/View/Achievement.hs b/src/Swarm/TUI/View/Achievement.hs → ...r-interface/Swarm/TUI/View/Achievement.hs
diff --git a/src/Swarm/TUI/View/CellDisplay.hs → ...r-interface/Swarm/TUI/View/CellDisplay.hs b/src/Swarm/TUI/View/CellDisplay.hs → ...r-interface/Swarm/TUI/View/CellDisplay.hs
diff --git a/src/Swarm/TUI/View/CustomStyling.hs → ...interface/Swarm/TUI/View/CustomStyling.hs b/src/Swarm/TUI/View/CustomStyling.hs → ...interface/Swarm/TUI/View/CustomStyling.hs
diff --git a/src/Swarm/TUI/View/Objective.hs → ...ser-interface/Swarm/TUI/View/Objective.hs b/src/Swarm/TUI/View/Objective.hs → ...ser-interface/Swarm/TUI/View/Objective.hs
diff --git a/src/Swarm/TUI/View/Util.hs → ...arm-user-interface/Swarm/TUI/View/Util.hs b/src/Swarm/TUI/View/Util.hs → ...arm-user-interface/Swarm/TUI/View/Util.hs
diff --git a/src/Swarm/Util.hs → src/swarm-util/Swarm/Util.hs b/src/Swarm/Util.hs → src/swarm-util/Swarm/Util.hs
diff --git a/src/Swarm/Util/Yaml.hs → src/swarm-util/Swarm/Util/Yaml.hs b/src/Swarm/Util/Yaml.hs → src/swarm-util/Swarm/Util/Yaml.hs
diff --git a/src/Swarm/Version.hs → src/swarm-version/Swarm/Version.hs b/src/Swarm/Version.hs → src/swarm-version/Swarm/Version.hs
diff --git a/swarm.cabal b/swarm.cabal
diff --git a/bench/Benchmark.hs → test/bench/Benchmark.hs b/bench/Benchmark.hs → test/bench/Benchmark.hs