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

Conversation

gzanitti
Copy link
Collaborator

No description provided.

gzanitti and others added 30 commits June 28, 2024 17:58
@gzanitti
Impl parsing
3a33d6e
@gzanitti
Format error
3ede469
@gzanitti
Conflicts solved
693c011
@gzanitti
Missed conflict
afb17ad
@gzanitti
Missed conflict
6e05d81
@gzanitti
Match fixed
b7dfeb2
@gzanitti
Test
2fe457b
@gzanitti
Grammar improvements
88fab39
@gzanitti
Merge remote-tracking branch 'upstream/main' into impl_parsing
7817c69
@gzanitti
Types in grammar based on PR powdr-labs#1545
c41a89c
@gzanitti @chriseth
Update ast/src/parsed/mod.rs
049226b 
Co-authored-by: chriseth <[email protected]>
@gzanitti
Minor fixes
1a91bdb
@gzanitti
Merge remote-tracking branch 'upstream/main' into impl_parsing
e3df4ab
@gzanitti
Basic overlap
ec70fe8
@gzanitti
Trait overlapping and named types
58b5a2f
@gzanitti
Conflict solved
545aef6
@gzanitti
Error msg
b4949a9
@gzanitti
Error msg
ccd8ae6
@gzanitti
More checks & better error reporting
287f9b1
@gzanitti
Minor fix
955f1d1
@gzanitti
Merge remote-tracking branch 'upstream/main' into check_traits_overla…
fcce19a 
…pping
@gzanitti
WIP
5e10258
@gzanitti
clippy and minor fix
f1cb39f
@gzanitti
Useless test removed
e497f2f
@gzanitti
More tests and minor fix (clippy)
48fa76a
@gzanitti
More tests before impl unification
b9ff12d
@gzanitti
One more test
5fe17da
@gzanitti
Impls handling
02df478
@gzanitti
Merge remote-tracking branch 'upstream/main' into check_traits_overla…
9c027c3 
…pping
@gzanitti
WIP
dedd1dd
@gzanitti gzanitti requested a review from chriseth August 7, 2024 13:45
chriseth
chriseth reviewed Aug 7, 2024
View reviewed changes
parser/src/powdr.lalrpop Outdated Show resolved Hide resolved
@gzanitti gzanitti mentioned this pull request Sep 2, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chriseth chriseth chriseth left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gzanitti @chriseth