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

Better CESK machine pretty-printing #948

Merged
merged 8 commits into from
Jan 4, 2023
Merged

Better CESK machine pretty-printing #948

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
94ba46e
WIP: improve `prettyCESK` and make it into a `PrettyPrec` instance
byorgey Jan 2, 2023
b8a6b8d
fix `prettyCESK` calls in `Step.hs`
byorgey Jan 2, 2023
ff4db11
Merge branch 'main' into feature/pretty-CESK
byorgey Jan 2, 2023
8d0d535
remove dead code and add more documentation
byorgey Jan 2, 2023
002f27a
move debugging to a better spot
byorgey Jan 2, 2023
a72412d
show the `Const` in an `FImmediate` frame
byorgey Jan 4, 2023
53b3bab
s/loc/addr/
byorgey Jan 4, 2023
13c14b8
Merge branch 'main' into feature/pretty-CESK
mergify[bot] Jan 4, 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
Prev Previous commit
Next Next commit
s/loc/addr/
  • Loading branch information
@byorgey
byorgey committed Jan 4, 2023
commit 53b3bab87e0bd21318bdaeabe2b87041ec0920b6
2 changes: 1 addition & 1 deletion src/Swarm/Game/CESK.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ prettyFrame (FBind Nothing t _) (p, inner) = (0, pparens (p < 1) inner <+> ";" <
prettyFrame (FBind (Just x) t _) (p, inner) = (0, hsep [pretty x, "<-", pparens (p < 1) inner, ";", ppr t])
prettyFrame FDiscardEnv inner = prettyPrefix "D·" inner
prettyFrame (FImmediate c _worldUpds _robotUpds) inner = prettyPrefix ("I[" <> ppr c <> "]·") inner
prettyFrame (FUpdate loc) inner = prettyPrefix ("S@" <> pretty loc) inner
prettyFrame (FUpdate addr) inner = prettyPrefix ("S@" <> pretty addr) inner
prettyFrame FFinishAtomic inner = prettyPrefix "A·" inner
prettyFrame (FMeetAll _ _) inner = prettyPrefix "M·" inner

Expand Down