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

Make logging intangible #2049

Merged
merged 3 commits into from
Jul 17, 2024
Merged

Make logging intangible #2049

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
f2a8c0b
Make logging intangible
Jul 15, 2024
feec0a4
fix CI
Jul 15, 2024
7d2c8cd
Merge branch 'main' into noahyor/intangible-log
mergify[bot] Jul 17, 2024
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
5 changes: 3 additions & 2 deletions data/scenarios/Testing/475-wait-one.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@ objectives:
ishere "lambda"
} { return false }
solution: |
log "I will win next tick!"; place "lambda";
log "I will win next tick!"; wait 1; place "lambda";
robots:
- name: base
loc: [0, 0]
dir: east
devices:
- logger
- grabber
- clock
inventory:
- [1, lambda]
- name: sleeper
Expand All @@ -30,7 +31,7 @@ robots:
- logger
- clock
program: |
log "I shall sleep"; wait 1; log "I have awoken"
log "I shall sleep"; wait 2; log "I have awoken"
Copy link
Member

Choose a reason for hiding this comment

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

Does this test still make sense, now that we wait for two ticks and newly in solution for one? 🤔

world:
palette:
'.': [grass]
Expand Down
2 changes: 1 addition & 1 deletion src/swarm-lang/Swarm/Language/Syntax/Constants.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ constInfo c = case c of
<> "that is done automatically once you have a listening device equipped."
, "Note that you can see the messages either in your logger device or the message panel."
]
Log -> command 1 short $ shortDoc (Set.singleton $ Mutation LogEmission) "Log the string in the robot's logger."
Log -> command 1 Intangible $ shortDoc (Set.singleton $ Mutation LogEmission) "Log the string in the robot's logger."
View ->
command 1 short . doc (Set.singleton $ Query $ Sensing RobotSensing) "View the given actor." $
[ "This will recenter the map on the target robot and allow its inventory and logs to be inspected."
Expand Down
Loading