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

Model parsing from JSON #32

Merged
merged 36 commits into from
Nov 21, 2023
Merged

Model parsing from JSON #32

merged 36 commits into from
Nov 21, 2023

Commits on Oct 30, 2023

  1. Add parsers directory

    @lixitrixi
    lixitrixi committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    c132b2b View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. Initial parser code

    @lixitrixi
    lixitrixi committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    25478f7 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. Compact syntax and supporting Model constructor

    @lixitrixi
    lixitrixi committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    67eab45 View commit details
    Browse the repository at this point in the history

  2. Format code

    @lixitrixi
    lixitrixi committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    8960e0c View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. Update crate structure and imports

    @lixitrixi
    lixitrixi committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    9477ca4 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Add Conjure Error and edit crate structure (broken)

    @lixitrixi
    lixitrixi committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    63868fd View commit details
    Browse the repository at this point in the history

  2. Possible import fix (@niklasdewally) 

    Co-authored-by: Niklas Dewally <niklas@dewally.com>
    @lixitrixi @niklasdewally
    lixitrixi and niklasdewally authored Nov 8, 2023
    Configuration menu
    Copy the full SHA
    2fede22 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'conjure-cp:main' into main

    @lixitrixi
    lixitrixi authored Nov 8, 2023
    Configuration menu
    Copy the full SHA
    a179204 View commit details
    Browse the repository at this point in the history

  4. Clearly separate packages and workspace

    @lixitrixi
    lixitrixi committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    bea115d View commit details
    Browse the repository at this point in the history

  5. Add default run target

    @lixitrixi
    lixitrixi committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    1c2e40f View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2023

  1. Merge branch 'workspace-refactor' into json-parsing

    @lixitrixi
    lixitrixi committed Nov 12, 2023
    Configuration menu
    Copy the full SHA
    dda39b0 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. Merge refactoring of project structure

    @lixitrixi
    lixitrixi committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    e301bb1 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/main' into main

    @lixitrixi
    lixitrixi committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    6ae8037 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into json-parsing

    @lixitrixi
    lixitrixi committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    4a5cac1 View commit details
    Browse the repository at this point in the history

  4. Resolve import conflicts

    @lixitrixi
    lixitrixi committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    6f62229 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. Update Error code to use thiserror

    @lixitrixi
    lixitrixi committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    fb5726c View commit details
    Browse the repository at this point in the history

  2. Parse JSON in main

    @lixitrixi
    lixitrixi committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    6f5480f View commit details
    Browse the repository at this point in the history

  3. Assert manual and parsed models are equal

    @lixitrixi
    lixitrixi committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    42222ff View commit details
    Browse the repository at this point in the history

  4. Format model output strings

    @lixitrixi
    lixitrixi committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    a3706ae View commit details
    Browse the repository at this point in the history

  5. Update output formatting

    @lixitrixi
    lixitrixi committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    b86588b View commit details
    Browse the repository at this point in the history

  6. Fix format fails

    @lixitrixi
    lixitrixi committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    a395036 View commit details
    Browse the repository at this point in the history

  7. Use thiserror to create From<> impl

    @lixitrixi
    lixitrixi committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    4a571d1 View commit details
    Browse the repository at this point in the history

  8. Update gitignore

    @lixitrixi
    lixitrixi committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    98f09dc View commit details
    Browse the repository at this point in the history

  9. Update error and clean parsing code

    @lixitrixi
    lixitrixi committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    4354d92 View commit details
    Browse the repository at this point in the history

  10. Parse variable domains

    @lixitrixi
    lixitrixi committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    d628d20 View commit details
    Browse the repository at this point in the history

  11. Add integration test foundation

    @lixitrixi
    lixitrixi committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    d7da76b View commit details
    Browse the repository at this point in the history

  12. Cargo format

    @lixitrixi
    lixitrixi committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    bb7b7a4 View commit details
    Browse the repository at this point in the history

  13. Parser syntax tweaks

    @lixitrixi
    lixitrixi committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    32b0bbf View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2023

  1. Complete integration tests

    @lixitrixi
    lixitrixi committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    58fbcfa View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. Attempt CI fix

    @lixitrixi
    lixitrixi committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    2c95df3 View commit details
    Browse the repository at this point in the history

  2. Silence test failures (for now)

    @lixitrixi
    lixitrixi committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    149229a View commit details
    Browse the repository at this point in the history

  3. Cargo format

    @lixitrixi
    lixitrixi committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    58ba655 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into json-parsing

    @lixitrixi
    lixitrixi authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    e9d0407 View commit details
    Browse the repository at this point in the history

  5. Fix i32/i64 discrepancy

    @lixitrixi
    lixitrixi committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    0c6810d View commit details
    Browse the repository at this point in the history

  6. Fix build dependency versions

    @lixitrixi
    lixitrixi committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    dc055c1 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into json-parsing

    @lixitrixi
    lixitrixi authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    7ae4d3a View commit details
    Browse the repository at this point in the history