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

World description DSL #1376

Merged
merged 105 commits into from
Aug 17, 2023
Merged

World description DSL #1376

merged 105 commits into from
Aug 17, 2023

Commits on Jun 13, 2023

  1. fix documentation

    @byorgey
    byorgey committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    76cd623 View commit details
    Browse the repository at this point in the history

  2. early draft of world description DSL

    @byorgey
    byorgey committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    e126c57 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. fiddling around with intrinsically typed EDSL for world functions

    @byorgey
    byorgey committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    4a949dd View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. more work on intrinsically typed DSL

    @byorgey
    byorgey committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    d0f7e8b View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. buncha work on world DSL

    @byorgey
    byorgey committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    a452d88 View commit details
    Browse the repository at this point in the history

  2. bit more work + notes for later

    @byorgey
    byorgey committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    f82a130 View commit details
    Browse the repository at this point in the history

  3. fix syntax error

    @byorgey
    byorgey committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    01e2b3d View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. working on subtyping and inference

    @byorgey
    byorgey committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    978c8d7 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2023

  1. work on inference, delete old code

    @byorgey
    byorgey committed Jun 25, 2023
    Configuration menu
    Copy the full SHA
    518246a View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Merge branch 'main' into feature/world-dsl

    @byorgey
    byorgey committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    eb2f9ab View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. great progress!

    @byorgey
    byorgey committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    e96c194 View commit details
    Browse the repository at this point in the history

  2. copy in code for compiling to combinators

    @byorgey
    byorgey committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    27cae70 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. more work on inference (let, overlay)

    @byorgey
    byorgey committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    5d2763a View commit details
    Browse the repository at this point in the history

  2. wibbles

    @byorgey
    byorgey committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    069eebf View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. split into modules

    @byorgey
    byorgey committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    4eca03d View commit details
    Browse the repository at this point in the history

  2. fix for recent GHCs

    @byorgey
    byorgey committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    7530766 View commit details
    Browse the repository at this point in the history

  3. basic parser for cell values

    @byorgey
    byorgey committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    15626de View commit details
    Browse the repository at this point in the history

  4. WIP

    @byorgey
    byorgey committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    c1a45de View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. work on world DSL parser

    @byorgey
    byorgey committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    89ad0d5 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2023

  1. get basic world described with DSL program working!

    @byorgey
    byorgey committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    35a8c08 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. error framework, get overlay working

    @byorgey
    byorgey committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    7a9a796 View commit details
    Browse the repository at this point in the history

  2. start to get testWorld2 DSL description working 

    Fix up `mask`, `perlin`, `seed`, slightly better errors
    @byorgey
    byorgey committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    5445c69 View commit details
    Browse the repository at this point in the history

  3. get two more biomes working (add hash, abs)

    @byorgey
    byorgey committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    2550a6e View commit details
    Browse the repository at this point in the history

  4. finish transcribing test world 2 to DSL

    @byorgey
    byorgey committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    a583ccd View commit details
    Browse the repository at this point in the history

  5. delete dead code

    @byorgey
    byorgey committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    ac41297 View commit details
    Browse the repository at this point in the history

  6. get world offset working for DSL worlds

    @byorgey
    byorgey committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    3ecdac8 View commit details
    Browse the repository at this point in the history

  7. blank world can use the DSL!

    @byorgey
    byorgey committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    60dc12e View commit details
    Browse the repository at this point in the history

  8. classic mode can use the DSL!

    @byorgey
    byorgey committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    7a0ff43 View commit details
    Browse the repository at this point in the history

  9. more flexible cell syntax

    @byorgey
    byorgey committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    5e2163a View commit details
    Browse the repository at this point in the history

  10. rename test file

    @byorgey
    byorgey committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    4f81b7c View commit details
    Browse the repository at this point in the history

  11. fix cell parser

    @byorgey
    byorgey committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    f5cb71d View commit details
    Browse the repository at this point in the history

  12. update todos

    @byorgey
    byorgey committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    889215d View commit details
    Browse the repository at this point in the history

  13. move todos to PR description

    @byorgey
    byorgey committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    ab8846d View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. add Semigroup and Monoid instances for TerrainType

    @byorgey
    byorgey committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    7ab4c72 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. interpret BTerms for comparison

    @byorgey
    byorgey committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    05b4771 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feature/world-dsl

    @byorgey
    byorgey committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    1fe06b1 View commit details
    Browse the repository at this point in the history

  3. fix merge

    @byorgey
    byorgey committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    f0078cd View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. store world DSL expressions in worlds/*.world + enable import

    @byorgey
    byorgey committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    95386c7 View commit details
    Browse the repository at this point in the history

  2. update all "classic world" scenarios to import worlds/classic.world

    @byorgey
    byorgey committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    5b6ad5c View commit details
    Browse the repository at this point in the history

  3. fix warnings

    @byorgey
    byorgey committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    2d6818c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into feature/world-dsl

    @byorgey
    byorgey committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    071dfe1 View commit details
    Browse the repository at this point in the history

  5. get rid of testWorld2 + make blank world default 

    Also remove a bunch of unneeded `default: [blank]` specifications.
    @byorgey
    byorgey committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    2cad10c View commit details
    Browse the repository at this point in the history

  6. WIP: do away with default, make WorldFun a Monoid 

    Complicated by the fact that we sometimes want to have transparency
on the "entity channel" (e.g. to stamp a structure with some
transparent parts over existing entities etc.) and sometimes want to
"erase" entities (e.g. when the default background has an entity like
water and in some places we want to override it).  Add `Erasable` type
to deal with this.
    @byorgey
    byorgey committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    964dc2b View commit details
    Browse the repository at this point in the history

  7. get Erasable to work for specifying cells in palette

    @byorgey
    byorgey committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    5902494 View commit details
    Browse the repository at this point in the history

  8. fix type errors, and get rid of default for good

    @byorgey
    byorgey committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    268d773 View commit details
    Browse the repository at this point in the history

  9. update comment and remove dead code

    @byorgey
    byorgey committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    038ed2a View commit details
    Browse the repository at this point in the history

  10. rename Swarm.WorldGen -> Swarm.World.Gen

    @byorgey
    byorgey committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    bae128f View commit details
    Browse the repository at this point in the history

  11. wibble

    @byorgey
    byorgey committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    eac4dc3 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2023

  1. extract entities in classic world automatically

    @byorgey
    byorgey committed Jul 22, 2023
    Configuration menu
    Copy the full SHA
    ed0666b View commit details
    Browse the repository at this point in the history

  2. fix missing interpConst case

    @byorgey
    byorgey committed Jul 22, 2023
    Configuration menu
    Copy the full SHA
    0794262 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2023

  1. use NotFun to get rid of pattern-match warnings

    @byorgey
    byorgey committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    2f3a5cb View commit details
    Browse the repository at this point in the history

  2. split out Abstract and Interpret, implement rotate + reflect

    @byorgey
    byorgey committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    c4aabb2 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. reorganization and a bunch of documentation

    @byorgey
    byorgey committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    e5e4941 View commit details
    Browse the repository at this point in the history

  2. more cleanup, implement compiling for reflect + rot

    @byorgey
    byorgey committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    8b10fff View commit details
    Browse the repository at this point in the history

  3. more documentation + comments

    @byorgey
    byorgey committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    4390159 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. link TODOs to issues

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    54f8e19 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feature/world-dsl

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    c32aa12 View commit details
    Browse the repository at this point in the history

  3. work on fixing up merge (WIP)

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    5a6a195 View commit details
    Browse the repository at this point in the history

  4. finish fixing up merge

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    a13e9a0 View commit details
    Browse the repository at this point in the history

  5. remove redundant import

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    130835c View commit details
    Browse the repository at this point in the history

  6. turn XXX into TODO with issue reference

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    f473fbf View commit details
    Browse the repository at this point in the history

  7. WIP: move typechecking for world DSL terms earlier, during JSON parsing

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    728f71c View commit details
    Browse the repository at this point in the history

  8. fix tests

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    93a27c8 View commit details
    Browse the repository at this point in the history

  9. remove dead cod

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    3d08b92 View commit details
    Browse the repository at this point in the history

  10. fix warning

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    cc585c3 View commit details
    Browse the repository at this point in the history

  11. fix benchmark

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    7b1f0bb View commit details
    Browse the repository at this point in the history

  12. enable TypeFamilies, needed for older GHC versions

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    9336924 View commit details
    Browse the repository at this point in the history

  13. add notes to XXX comments

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    d4e15d1 View commit details
    Browse the repository at this point in the history

  14. add GADTs extension for GHC <= 9.2

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    76dfddf View commit details
    Browse the repository at this point in the history

  15. fix more warnings / add needed extensions for older GHC

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    c31b85d View commit details
    Browse the repository at this point in the history

  16. address some review comments

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    72e5178 View commit details
    Browse the repository at this point in the history

  17. Restyled by fourmolu (#1398) 

    Co-authored-by: Restyled.io <[email protected]>
    @restyled-io @restyled-commits
    restyled-io[bot] and restyled-commits authored Jul 27, 2023
    Configuration menu
    Copy the full SHA
    827ba36 View commit details
    Browse the repository at this point in the history

  18. clean up and start working on type errors + pretty-printing

    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    76a8075 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'feature/world-dsl' of github.com:swarm-game/swarm into … 

    …feature/world-dsl
    @byorgey
    byorgey committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    affaa99 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. type errors

    @byorgey
    byorgey committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    1cd417a View commit details
    Browse the repository at this point in the history

  2. PrettyPrec instance for Cell

    @byorgey
    byorgey committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    65d4dd0 View commit details
    Browse the repository at this point in the history

  3. require entire DSL term to be parsed

    @byorgey
    byorgey committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    6610d4a View commit details
    Browse the repository at this point in the history

  4. turn prettyCheckErr into PrettyPrec instance

    @byorgey
    byorgey committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    26b3060 View commit details
    Browse the repository at this point in the history

  5. rename WExpMap to WorldMap

    @byorgey
    byorgey committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    ee6e415 View commit details
    Browse the repository at this point in the history

  6. rename runTTerm -> runWorld

    @byorgey
    byorgey committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    32c12a6 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. Merge branch 'main' into feature/world-dsl

    @byorgey
    byorgey committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    0ac5934 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. finish merge

    @byorgey
    byorgey committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    4cc7f3b View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Merge branch 'main' into feature/world-dsl

    @byorgey
    byorgey committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    6540900 View commit details
    Browse the repository at this point in the history

  2. fix formatting

    @byorgey
    byorgey committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    69e8e5f View commit details
    Browse the repository at this point in the history

  3. world DSL tests

    @byorgey
    byorgey committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    9226b48 View commit details
    Browse the repository at this point in the history

  4. add override test to 00-ORDER.txt

    @byorgey
    byorgey committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    7f7a95a View commit details
    Browse the repository at this point in the history

  5. move world loading code into Swarm.Game.World.Load

    @byorgey
    byorgey committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    a36b58e View commit details
    Browse the repository at this point in the history

  6. improve rotTuple implementation

    @byorgey
    byorgey committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    13d2827 View commit details
    Browse the repository at this point in the history

  7. add some comments

    @byorgey
    byorgey committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    4725801 View commit details
    Browse the repository at this point in the history

  8. delete empty file

    @byorgey
    byorgey committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    5452801 View commit details
    Browse the repository at this point in the history

  9. use ignoreWarnings

    @byorgey
    byorgey committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    6a98dca View commit details
    Browse the repository at this point in the history

  10. link to blog post with more info

    @byorgey
    byorgey committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    f5b3882 View commit details
    Browse the repository at this point in the history

  11. add Haddock comment

    @byorgey
    byorgey committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    c3db0ba View commit details
    Browse the repository at this point in the history

  12. improve Haddocks

    @byorgey
    byorgey committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    f0095be View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2023

  1. add some explanatory comments to classic.world

    @byorgey
    byorgey committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    4957aec View commit details
    Browse the repository at this point in the history

  2. Update src/Swarm/Util/Erasable.hs 

    Co-authored-by: Karl Ostmo <[email protected]>
    @byorgey @kostmo
    byorgey and kostmo authored Aug 13, 2023
    Configuration menu
    Copy the full SHA
    2dc91ce View commit details
    Browse the repository at this point in the history

  3. fix flag in README

    @byorgey
    byorgey committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    f14bb1b View commit details
    Browse the repository at this point in the history

  4. mention 'seed' variable

    @byorgey
    byorgey committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    f67fa49 View commit details
    Browse the repository at this point in the history

  5. update scenario authoring guide to mention world DSL 

    Also link to a new README for the world DSL.
    @byorgey
    byorgey committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    d7631f8 View commit details
    Browse the repository at this point in the history

  6. add README re: world DSL

    @byorgey
    byorgey committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    d765208 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. simplify implementation of runCTerm 

    Thanks to a suggestion by @wasabi315 at https://byorgey.wordpress.com/2023/07/13/compiling-to-intrinsically-typed-combinators/#comment-41148
    @byorgey
    byorgey committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    351db28 View commit details
    Browse the repository at this point in the history

  2. allow whitespace before world DSL terms!

    @byorgey
    byorgey committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    5c691f9 View commit details
    Browse the repository at this point in the history

  3. fix redundant import warning

    @byorgey
    byorgey committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    e2b46a9 View commit details
    Browse the repository at this point in the history

  4. add reminder to update worlds/README when modifying parser

    @byorgey
    byorgey committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    7ef049c View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. Merge branch 'main' into feature/world-dsl

    @mergify
    mergify[bot] authored Aug 17, 2023
    Configuration menu
    Copy the full SHA
    08ac9c2 View commit details
    Browse the repository at this point in the history