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

Traits overlapping #1601

Open
wants to merge 79 commits into
base: main
Choose a base branch
from
Open

Traits overlapping #1601

wants to merge 79 commits into from

Commits on Jun 28, 2024

  1. Impl parsing

    @gzanitti
    gzanitti committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    3a33d6e View commit details
    Browse the repository at this point in the history

  2. Format error

    @gzanitti
    gzanitti committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    3ede469 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Conflicts solved

    @gzanitti
    gzanitti committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    693c011 View commit details
    Browse the repository at this point in the history

  2. Missed conflict

    @gzanitti
    gzanitti committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    afb17ad View commit details
    Browse the repository at this point in the history

  3. Missed conflict

    @gzanitti
    gzanitti committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    6e05d81 View commit details
    Browse the repository at this point in the history

  4. Match fixed

    @gzanitti
    gzanitti committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    b7dfeb2 View commit details
    Browse the repository at this point in the history

  5. Test

    @gzanitti
    gzanitti committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    2fe457b View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Grammar improvements

    @gzanitti
    gzanitti committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    88fab39 View commit details
    Browse the repository at this point in the history

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

    @gzanitti
    gzanitti committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    7817c69 View commit details
    Browse the repository at this point in the history

  3. Types in grammar based on PR powdr-labs#1545

    @gzanitti
    gzanitti committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    c41a89c View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Update ast/src/parsed/mod.rs 

    Co-authored-by: chriseth <[email protected]>
    @gzanitti @chriseth
    gzanitti and chriseth authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    049226b View commit details
    Browse the repository at this point in the history

  2. Minor fixes

    @gzanitti
    gzanitti committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    1a91bdb View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. Merge remote-tracking branch 'upstream/main' into impl_parsing

    @gzanitti
    gzanitti committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    e3df4ab View commit details
    Browse the repository at this point in the history

  2. Basic overlap

    @gzanitti
    gzanitti committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    ec70fe8 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Trait overlapping and named types

    @gzanitti
    gzanitti committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    58b5a2f View commit details
    Browse the repository at this point in the history

  2. Conflict solved

    @gzanitti
    gzanitti committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    545aef6 View commit details
    Browse the repository at this point in the history

  3. Error msg

    @gzanitti
    gzanitti committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    b4949a9 View commit details
    Browse the repository at this point in the history

  4. Error msg

    @gzanitti
    gzanitti committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    ccd8ae6 View commit details
    Browse the repository at this point in the history

  5. More checks & better error reporting

    @gzanitti
    gzanitti committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    287f9b1 View commit details
    Browse the repository at this point in the history

  6. Minor fix

    @gzanitti
    gzanitti committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    955f1d1 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'upstream/main' into check_traits_overla… 

    …pping
    @gzanitti
    gzanitti committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    fcce19a View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. WIP

    @gzanitti
    gzanitti committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    5e10258 View commit details
    Browse the repository at this point in the history

  2. clippy and minor fix

    @gzanitti
    gzanitti committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    f1cb39f View commit details
    Browse the repository at this point in the history

  3. Useless test removed

    @gzanitti
    gzanitti committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    e497f2f View commit details
    Browse the repository at this point in the history

  4. More tests and minor fix (clippy)

    @gzanitti
    gzanitti committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    48fa76a View commit details
    Browse the repository at this point in the history

  5. More tests before impl unification

    @gzanitti
    gzanitti committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    b9ff12d View commit details
    Browse the repository at this point in the history

  6. One more test

    @gzanitti
    gzanitti committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    5fe17da View commit details
    Browse the repository at this point in the history

  7. Impls handling

    @gzanitti
    gzanitti committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    02df478 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'upstream/main' into check_traits_overla… 

    …pping
    @gzanitti
    gzanitti committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    9c027c3 View commit details
    Browse the repository at this point in the history

  9. WIP

    @gzanitti
    gzanitti committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    dedd1dd View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. Statements & conflicts

    @gzanitti
    gzanitti committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    ba32d7c View commit details
    Browse the repository at this point in the history

  2. Extra dot removed

    @gzanitti
    gzanitti committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    fcab5b2 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2024

  1. Wrong test removed

    @gzanitti
    gzanitti committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    37a01c0 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. Merge remote-tracking branch 'upstream/main' into check_traits_overla… 

    …pping
    @gzanitti
    gzanitti committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    2a8dd2c View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. PR updated & improved

    @gzanitti
    gzanitti committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    22cba1f View commit details
    Browse the repository at this point in the history

  2. conflict and tests

    @gzanitti
    gzanitti committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    cceeee9 View commit details
    Browse the repository at this point in the history

  3. removed duplicated rule

    @gzanitti
    gzanitti committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    1344477 View commit details
    Browse the repository at this point in the history

  4. Better error

    @gzanitti
    gzanitti committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    940a34a View commit details
    Browse the repository at this point in the history

  5. Cleaner code

    @gzanitti
    gzanitti committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    943d7eb View commit details
    Browse the repository at this point in the history

  6. Remove comments, clean code, etc

    @gzanitti
    gzanitti committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    a793542 View commit details
    Browse the repository at this point in the history

  7. Improved code organization. Documentation

    @gzanitti
    gzanitti committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    dfbe0e4 View commit details
    Browse the repository at this point in the history

  8. docs

    @gzanitti
    gzanitti committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    3a26f73 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'upstream/main' into check_traits_overla… 

    …pping
    @gzanitti
    gzanitti committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    05bd031 View commit details
    Browse the repository at this point in the history

  10. Fix grammar

    @gzanitti
    gzanitti committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    dc86999 View commit details
    Browse the repository at this point in the history

  11. Fix grammar

    @gzanitti
    gzanitti committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    b2c78ca View commit details
    Browse the repository at this point in the history

  12. space remove

    @gzanitti
    gzanitti committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    a5461e1 View commit details
    Browse the repository at this point in the history

  13. moved out of PILAnalyzer

    @gzanitti
    gzanitti committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    19e5df4 View commit details
    Browse the repository at this point in the history

  14. improved test

    @gzanitti
    gzanitti committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    3a5891d View commit details
    Browse the repository at this point in the history

  15. new test: trait_with_user_defined_enum

    @gzanitti
    gzanitti committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    c6c8854 View commit details
    Browse the repository at this point in the history

  16. new test: trait_with_user_defined_enum2

    @gzanitti
    gzanitti committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    82a4bb2 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. Improvements and documentation

    @gzanitti
    gzanitti committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    088f631 View commit details
    Browse the repository at this point in the history

  2. TypeChecker replaced by Unifier

    @gzanitti
    gzanitti committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    b8e97ee View commit details
    Browse the repository at this point in the history

  3. Minor code change

    @gzanitti
    gzanitti committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    1b8d558 View commit details
    Browse the repository at this point in the history

  4. rollback change

    @gzanitti
    gzanitti committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    2c0be40 View commit details
    Browse the repository at this point in the history

  5. type var check & test

    @gzanitti
    gzanitti committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    b175ff3 View commit details
    Browse the repository at this point in the history

  6. vars inside format

    @gzanitti
    gzanitti committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    a526a2f View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. Code improvements

    @gzanitti
    gzanitti committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    1603cf6 View commit details
    Browse the repository at this point in the history

  2. Tests removed & minor changes

    @gzanitti
    gzanitti committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    ee5f204 View commit details
    Browse the repository at this point in the history

  3. unused_type_var_error fixed

    @gzanitti
    gzanitti committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    4140e18 View commit details
    Browse the repository at this point in the history

  4. Tests with TypeVarManager (temporal)

    @gzanitti
    gzanitti committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    cc99969 View commit details
    Browse the repository at this point in the history

  5. Overlapping of TypeVars fixed. Need to fix TypeVarManager counter/con… 

    …text
    @gzanitti
    gzanitti committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    bf042b1 View commit details
    Browse the repository at this point in the history

  6. TypeVarManager

    @gzanitti
    gzanitti committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    c2f9fd0 View commit details
    Browse the repository at this point in the history

  7. TypeVarManager with Unifier

    @gzanitti
    gzanitti committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    2bba728 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. TypeVarManager functionality moved to Unifier

    @gzanitti
    gzanitti committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    be35795 View commit details
    Browse the repository at this point in the history

  2. Main merged

    @gzanitti
    gzanitti committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    ebb3139 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

  1. Minor changes

    @gzanitti
    gzanitti committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    3a5532e View commit details
    Browse the repository at this point in the history

  2. fn -> pub fn

    @gzanitti
    gzanitti committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    9cb49db View commit details
    Browse the repository at this point in the history

  3. unifier simplification

    @gzanitti
    gzanitti committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    7d181a6 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. Update pil-analyzer/src/pil_analyzer.rs 

    Co-authored-by: chriseth <[email protected]>
    @gzanitti @chriseth
    gzanitti and chriseth authored Aug 8, 2024
    Configuration menu
    Copy the full SHA
    2961171 View commit details
    Browse the repository at this point in the history

  2. Update pil-analyzer/src/pil_analyzer.rs 

    Co-authored-by: chriseth <[email protected]>
    @gzanitti @chriseth
    gzanitti and chriseth authored Aug 8, 2024
    Configuration menu
    Copy the full SHA
    58b4c0b View commit details
    Browse the repository at this point in the history

  3. Cleaner version

    @gzanitti
    gzanitti committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    afb6c1a View commit details
    Browse the repository at this point in the history

  4. General fixes

    @gzanitti
    gzanitti committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    064d340 View commit details
    Browse the repository at this point in the history

  5. Clippy

    @gzanitti
    gzanitti committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    35e1fad View commit details
    Browse the repository at this point in the history

  6. Temporal error fix

    @gzanitti
    gzanitti committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    6ef5fe5 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Main merged

    @gzanitti
    gzanitti committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    2b8d470 View commit details
    Browse the repository at this point in the history

  2. Improved code

    @gzanitti
    gzanitti committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    e692364 View commit details
    Browse the repository at this point in the history

  3. Test fixed

    @gzanitti
    gzanitti committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    62923b0 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. Minor fixes

    @gzanitti
    gzanitti committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    1b5beee View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. conflict

    @gzanitti
    gzanitti committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    df6e98b View commit details
    Browse the repository at this point in the history