Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split swarm libraries #1069

Closed
wants to merge 12 commits into from
Closed

Split swarm libraries #1069

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9667e15
move files
xsebek Feb 18, 2023
ad568bd
wip cabal
xsebek Feb 18, 2023
a19995d
wip
xsebek Feb 18, 2023
547a547
wrap language server again in language
xsebek Feb 18, 2023
e5e2aef
fixup bench
xsebek Feb 18, 2023
6df71f2
restyle
xsebek Feb 18, 2023
fd7c1e8
fixup import
xsebek Feb 20, 2023
50d8175
remove tabs
xsebek Feb 20, 2023
0ed6710
Regenerate Haskell CI
xsebek Feb 20, 2023
df459fe
restore header notes
xsebek Feb 20, 2023
c05f295
Clean up cabal file
xsebek Feb 20, 2023
19809ff
Reexport modules
xsebek Feb 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 31 additions & 11 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.15.20221009
# version: 0.15.20230217
#
# REGENDATA ("0.15.20221009",["github","--config=cabal.haskell-ci","--copy-fields=all","swarm.cabal"])
# REGENDATA ("0.15.20230217",["github","--config=cabal.haskell-ci","--copy-fields=all","swarm.cabal"])
#
name: Haskell-CI
on:
Expand Down Expand Up @@ -86,8 +86,9 @@ jobs:
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
Expand All @@ -103,7 +104,7 @@ jobs:
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
Expand Down Expand Up @@ -151,7 +152,7 @@ jobs:
run: |
$CABAL v2-update -v
- name: cache (tools)
uses: actions/cache@v2
uses: actions/cache/restore@v3
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-0367592e
path: ~/.haskell-ci-tools
Expand Down Expand Up @@ -179,8 +180,14 @@ jobs:
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then if [ ! -e $HOME/.haskell-ci-tools/hlint-$HLINTVER/hlint ]; then echo "Downloading HLint version $HLINTVER"; mkdir -p $HOME/.haskell-ci-tools; curl --write-out 'Status Code: %{http_code} Redirects: %{num_redirects} Total time: %{time_total} Total Dsize: %{size_download}\n' --silent --location --output $HOME/.haskell-ci-tools/hlint-$HLINTVER.tar.gz "https://github.com/ndmitchell/hlint/releases/download/v$HLINTVER/hlint-$HLINTVER-x86_64-linux.tar.gz"; tar -xzv -f $HOME/.haskell-ci-tools/hlint-$HLINTVER.tar.gz -C $HOME/.haskell-ci-tools; fi ; fi
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then mkdir -p $CABAL_DIR/bin && ln -sf "$HOME/.haskell-ci-tools/hlint-$HLINTVER/hlint" $CABAL_DIR/bin/hlint ; fi
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then hlint --version ; fi
- name: save cache (tools)
uses: actions/cache/save@v3
if: always()
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-0367592e
path: ~/.haskell-ci-tools
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Speaking of CI, it looks like regenerating this file will get rid of GitHub warnings about deprecated actions. 🙂

Let's hope it will all work nicely. 🤞

with:
path: source
- name: initial cabal.project for sdist
Expand Down Expand Up @@ -216,8 +223,8 @@ jobs:
run: |
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
cabal-plan
- name: cache
uses: actions/cache@v2
- name: restore cache
uses: actions/cache/restore@v3
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store
Expand All @@ -238,12 +245,25 @@ jobs:
cabal-docspec $ARG_COMPILER
- name: hlint
run: |
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then (cd ${PKGDIR_swarm} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 -XBangPatterns -XDeriveAnyClass -XDeriveDataTypeable -XDeriveFunctor -XDeriveGeneric -XDeriveTraversable -XExplicitForAll -XFlexibleContexts -XFlexibleInstances -XGADTSyntax -XMultiParamTypeClasses -XNumericUnderscores -XRankNTypes -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeOperators -XImportQualifiedPost -XLambdaCase -XStrictData src) ; fi
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then (cd ${PKGDIR_swarm} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 -XImportQualifiedPost app) ; fi
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then (cd ${PKGDIR_swarm} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 -XBangPatterns -XDeriveAnyClass -XDeriveDataTypeable -XDeriveFunctor -XDeriveGeneric -XDeriveTraversable -XExplicitForAll -XFlexibleContexts -XFlexibleInstances -XGADTSyntax -XMultiParamTypeClasses -XNumericUnderscores -XRankNTypes -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeOperators -XImportQualifiedPost -XLambdaCase -XStrictData src/swarm-app) ; fi
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then (cd ${PKGDIR_swarm} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 -XBangPatterns -XDeriveAnyClass -XDeriveDataTypeable -XDeriveFunctor -XDeriveGeneric -XDeriveTraversable -XExplicitForAll -XFlexibleContexts -XFlexibleInstances -XGADTSyntax -XMultiParamTypeClasses -XNumericUnderscores -XRankNTypes -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeOperators -XImportQualifiedPost -XLambdaCase -XStrictData src/swarm-user-interface) ; fi
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then (cd ${PKGDIR_swarm} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 -XBangPatterns -XDeriveAnyClass -XDeriveDataTypeable -XDeriveFunctor -XDeriveGeneric -XDeriveTraversable -XExplicitForAll -XFlexibleContexts -XFlexibleInstances -XGADTSyntax -XMultiParamTypeClasses -XNumericUnderscores -XRankNTypes -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeOperators -XImportQualifiedPost -XLambdaCase -XStrictData src/swarm-version) ; fi
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then (cd ${PKGDIR_swarm} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 -XBangPatterns -XDeriveAnyClass -XDeriveDataTypeable -XDeriveFunctor -XDeriveGeneric -XDeriveTraversable -XExplicitForAll -XFlexibleContexts -XFlexibleInstances -XGADTSyntax -XMultiParamTypeClasses -XNumericUnderscores -XRankNTypes -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeOperators -XImportQualifiedPost -XLambdaCase -XStrictData src/swarm-game) ; fi
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then (cd ${PKGDIR_swarm} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 -XBangPatterns -XDeriveAnyClass -XDeriveDataTypeable -XDeriveFunctor -XDeriveGeneric -XDeriveTraversable -XExplicitForAll -XFlexibleContexts -XFlexibleInstances -XGADTSyntax -XMultiParamTypeClasses -XNumericUnderscores -XRankNTypes -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeOperators -XImportQualifiedPost -XLambdaCase src/swarm-language-server) ; fi
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then (cd ${PKGDIR_swarm} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 -XBangPatterns -XDeriveAnyClass -XDeriveDataTypeable -XDeriveFunctor -XDeriveGeneric -XDeriveTraversable -XExplicitForAll -XFlexibleContexts -XFlexibleInstances -XGADTSyntax -XMultiParamTypeClasses -XNumericUnderscores -XRankNTypes -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeOperators -XImportQualifiedPost -XLambdaCase -XStrictData src/swarm-language) ; fi
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then (cd ${PKGDIR_swarm} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 -XBangPatterns -XDeriveAnyClass -XDeriveDataTypeable -XDeriveFunctor -XDeriveGeneric -XDeriveTraversable -XExplicitForAll -XFlexibleContexts -XFlexibleInstances -XGADTSyntax -XMultiParamTypeClasses -XNumericUnderscores -XRankNTypes -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeOperators -XImportQualifiedPost -XLambdaCase -XStrictData src/swarm-util) ; fi
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then (cd ${PKGDIR_swarm} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 -XBangPatterns -XDeriveAnyClass -XDeriveDataTypeable -XDeriveFunctor -XDeriveGeneric -XDeriveTraversable -XExplicitForAll -XFlexibleContexts -XFlexibleInstances -XGADTSyntax -XMultiParamTypeClasses -XNumericUnderscores -XRankNTypes -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeOperators -XImportQualifiedPost -XLambdaCase -XStrictData src/boolexpr) ; fi
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then (cd ${PKGDIR_swarm} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 -XImportQualifiedPost src/swarm-exe) ; fi
- name: cabal check
run: |
cd ${PKGDIR_swarm} || false
${CABAL} -vnormal check
- name: haddock
run: |
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
- name: save cache
uses: actions/cache/save@v3
if: always()
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store
0 src/Data/BoolExpr.hs → src/boolexpr/Data/BoolExpr.hs
View file
Open in desktop
File renamed without changes.
0 src/Data/BoolExpr/Simplify.hs → src/boolexpr/Data/BoolExpr/Simplify.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/App.hs → src/swarm-app/Swarm/App.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/DocGen.hs → src/swarm-app/Swarm/DocGen.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Web.hs → src/swarm-app/Swarm/Web.hs
View file
Open in desktop
File renamed without changes.
0 app/Main.hs → src/swarm-exe/Main.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Achievement/Attainment.hs → ...game/Swarm/Game/Achievement/Attainment.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Achievement/Definitions.hs → ...ame/Swarm/Game/Achievement/Definitions.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Achievement/Description.hs → ...ame/Swarm/Game/Achievement/Description.hs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/Swarm/Game/Achievement/Persistence.hs → ...ame/Swarm/Game/Achievement/Persistence.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
0 src/Swarm/Game/CESK.hs → src/swarm-game/Swarm/Game/CESK.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Display.hs → src/swarm-game/Swarm/Game/Display.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Entity.hs → src/swarm-game/Swarm/Game/Entity.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Exception.hs → src/swarm-game/Swarm/Game/Exception.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Location.hs → src/swarm-game/Swarm/Game/Location.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Log.hs → src/swarm-game/Swarm/Game/Log.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Recipe.hs → src/swarm-game/Swarm/Game/Recipe.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Robot.hs → src/swarm-game/Swarm/Game/Robot.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Scenario.hs → src/swarm-game/Swarm/Game/Scenario.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Scenario/Cell.hs → src/swarm-game/Swarm/Game/Scenario/Cell.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Scenario/Objective.hs → ...arm-game/Swarm/Game/Scenario/Objective.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Scenario/Objective/Graph.hs → ...me/Swarm/Game/Scenario/Objective/Graph.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Scenario/Objective/Logic.hs → ...me/Swarm/Game/Scenario/Objective/Logic.hs
View file
Open in desktop
File renamed without changes.
0 ...arm/Game/Scenario/Objective/Validation.hs → ...arm/Game/Scenario/Objective/Validation.hs
View file
Open in desktop
File renamed without changes.
0 ...Swarm/Game/Scenario/Objective/WinCheck.hs → ...Swarm/Game/Scenario/Objective/WinCheck.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Scenario/RobotLookup.hs → ...m-game/Swarm/Game/Scenario/RobotLookup.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Scenario/Style.hs → src/swarm-game/Swarm/Game/Scenario/Style.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Scenario/WorldDescription.hs → ...e/Swarm/Game/Scenario/WorldDescription.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/ScenarioInfo.hs → src/swarm-game/Swarm/Game/ScenarioInfo.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/State.hs → src/swarm-game/Swarm/Game/State.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Step.hs → src/swarm-game/Swarm/Game/Step.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/Terrain.hs → src/swarm-game/Swarm/Game/Terrain.hs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/Swarm/TUI/Model/Failure.hs → src/swarm-game/Swarm/Game/Util/Failure.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{-# LANGUAGE OverloadedStrings #-}

-- |
-- Module : Swarm.Game.Failure
-- Module : Swarm.Game.Util.Failure
-- Copyright : Ondřej Šebek
-- Maintainer : ondras98@icloud.com
--
Expand All @@ -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
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kostmo FYI I had to move the module back to the Game just to compile, but the change in #1116 is better (no Util directory and less code in the Util module itself) so I will rebase once merged. 👍

It seems that I am also susceptible to making silly Util modules when desperate. 😅

Splitting the libraries with Cabal has been a great learning experience for me, so I hope not to repeat my mistake from #982 where I put this module in TUI in the first place. 🤦


import Data.Char (toLower)
import Data.Text (Text)
Expand Down
0 src/Swarm/Game/World.hs → src/swarm-game/Swarm/Game/World.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Game/WorldGen.hs → src/swarm-game/Swarm/Game/WorldGen.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/LSP.hs → ...arm-language-server/Swarm/Language/LSP.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/LSP/Hover.hs → ...nguage-server/Swarm/Language/LSP/Hover.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/LSP/VarUsage.hs → ...age-server/Swarm/Language/LSP/VarUsage.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/Capability.hs → ...arm-language/Swarm/Language/Capability.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/Context.hs → src/swarm-language/Swarm/Language/Context.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/Elaborate.hs → ...warm-language/Swarm/Language/Elaborate.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/Module.hs → src/swarm-language/Swarm/Language/Module.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/Parse.hs → src/swarm-language/Swarm/Language/Parse.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/Parse/QQ.hs → ...swarm-language/Swarm/Language/Parse/QQ.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/Pipeline.hs → ...swarm-language/Swarm/Language/Pipeline.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/Pipeline/QQ.hs → ...rm-language/Swarm/Language/Pipeline/QQ.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/Pretty.hs → src/swarm-language/Swarm/Language/Pretty.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/Requirement.hs → ...rm-language/Swarm/Language/Requirement.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/Syntax.hs → src/swarm-language/Swarm/Language/Syntax.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/Typecheck.hs → ...warm-language/Swarm/Language/Typecheck.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/Typed.hs → src/swarm-language/Swarm/Language/Typed.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/Types.hs → src/swarm-language/Swarm/Language/Types.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Language/Value.hs → src/swarm-language/Swarm/Language/Value.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/Attr.hs → src/swarm-user-interface/Swarm/TUI/Attr.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/Border.hs → src/swarm-user-interface/Swarm/TUI/Border.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/Controller.hs → ...rm-user-interface/Swarm/TUI/Controller.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/Controller/Util.hs → ...er-interface/Swarm/TUI/Controller/Util.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/Inventory/Sorting.hs → ...-interface/Swarm/TUI/Inventory/Sorting.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/List.hs → src/swarm-user-interface/Swarm/TUI/List.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/Model.hs → src/swarm-user-interface/Swarm/TUI/Model.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/Model/Goal.hs → ...rm-user-interface/Swarm/TUI/Model/Goal.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/Model/Menu.hs → ...rm-user-interface/Swarm/TUI/Model/Menu.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/Model/Name.hs → ...rm-user-interface/Swarm/TUI/Model/Name.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/Model/Repl.hs → ...rm-user-interface/Swarm/TUI/Model/Repl.hs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/Swarm/TUI/Model/StateUpdate.hs → ...-interface/Swarm/TUI/Model/StateUpdate.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Swarm/TUI/Model/UI.hs → ...warm-user-interface/Swarm/TUI/Model/UI.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 src/Swarm/TUI/Panel.hs → src/swarm-user-interface/Swarm/TUI/Panel.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/View.hs → src/swarm-user-interface/Swarm/TUI/View.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/View/Achievement.hs → ...r-interface/Swarm/TUI/View/Achievement.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/View/CellDisplay.hs → ...r-interface/Swarm/TUI/View/CellDisplay.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/View/CustomStyling.hs → ...interface/Swarm/TUI/View/CustomStyling.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/View/Objective.hs → ...ser-interface/Swarm/TUI/View/Objective.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/TUI/View/Util.hs → ...arm-user-interface/Swarm/TUI/View/Util.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Util.hs → src/swarm-util/Swarm/Util.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Util/Yaml.hs → src/swarm-util/Swarm/Util/Yaml.hs
View file
Open in desktop
File renamed without changes.
0 src/Swarm/Version.hs → src/swarm-version/Swarm/Version.hs
View file
Open in desktop
File renamed without changes.
Loading