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

Jump to bottom

Merge new requirements context with existing when running from REPL #965

Merged
merged 3 commits into from
Jan 5, 2023
Merged

Merge new requirements context with existing when running from REPL #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe2c9cb
Merge new requirements context with existing when running from REPL
byorgey Jan 5, 2023
dcbbe3c
comment tweaks, and merge instead of set reqCtx in integration tests …
byorgey Jan 5, 2023
0db679b
Merge branch 'main' into fix/issue-964
mergify[bot] Jan 5, 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
4 changes: 2 additions & 2 deletions src/Swarm/TUI/Controller.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,13 +830,13 @@ handleREPLEventTyping = \case
-- term (by `def` statements) to their requirements.
-- E.g. if we had `def m = move end`, the reqCtx would
-- record the fact that `m` needs the `move` capability.
-- We simply dump the entire `reqCtx` into the robot's
-- We simply add the entire `reqCtx` to the robot's
-- context, so we can look up requirements if we later
-- need to requirements-check an argument to `build` or
-- `reprogram` at runtime. See the discussion at
-- https://github.com/swarm-game/swarm/pull/827 for more
-- details.
. (gameState . baseRobot . robotContext . defReqs .~ reqCtx)
. (gameState . baseRobot . robotContext . defReqs <>~ reqCtx)
byorgey marked this conversation as resolved.
Show resolved Hide resolved
-- Set up the robot's CESK machine to evaluate/execute the
-- given term, being sure to initialize the CESK machine
-- environment and store from the top-level context.
Expand Down
6 changes: 3 additions & 3 deletions test/integration/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
-- | Swarm integration tests
module Main where

import Control.Lens (Ixed (ix), to, use, view, (&), (.~), (<&>), (^.), (^..), (^?!))
import Control.Lens (Ixed (ix), to, use, view, (&), (.~), (<&>), (<>~), (^.), (^..), (^?!))
import Control.Monad (filterM, forM_, unless, void, when)
import Control.Monad.State (StateT (runStateT), gets)
import Control.Monad.Trans.Except (runExceptT)
Expand Down Expand Up @@ -249,10 +249,10 @@ testScenarioSolution _ci _em =
Just sol@(ProcessedTerm _ _ _ reqCtx) -> do
let gs' =
gs
-- See #827 for an explanation of why it's important to set
-- See #827 for an explanation of why it's important to add to
-- the robotContext defReqs here (and also why this will,
-- hopefully, eventually, go away).
& baseRobot . robotContext . defReqs .~ reqCtx
& baseRobot . robotContext . defReqs <>~ reqCtx
& baseRobot . machine .~ initMachine sol Ctx.empty emptyStore
m <- timeout (time s) (snd <$> runStateT playUntilWin gs')
case m of
Expand Down