Add support for leading | and & in types
#306
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Kampfkarren
reviewed
Jul 9, 2024
Kampfkarren
reviewed
Jul 9, 2024
Kampfkarren
reviewed
Jul 9, 2024
| ) -> ParserResult<ast::TypeInfo> { | ||
| let mut is_union = false; | ||
| let mut is_intersection = false; | ||
|
|
||
| let mut types = Punctuated::new(); | ||
|
|
||
| let leading = if simple_type.is_some() { |
There was a problem hiding this comment.
I'm not sure what I would use or_else on here
Kampfkarren
reviewed
Jul 9, 2024
Kampfkarren
reviewed
Jul 9, 2024
full-moon/src/ast/parsers.rs
Outdated
| let mut current_type = simple_type; | ||
|
|
||
| loop { | ||
| let Ok(current_token) = state.current() else { | ||
| return ParserResult::NotFound; | ||
| let ty = if current_type.is_some() { |
There was a problem hiding this comment.
this doesn't work because of the return
Kampfkarren
reviewed
Jul 9, 2024
chriscerie
reviewed
Jul 9, 2024
Co-authored-by: Chris Chang <[email protected]>
chriscerie
reviewed
Jul 10, 2024
Kampfkarren
reviewed
Jul 27, 2024
Kampfkarren
reviewed
Jul 27, 2024
Kampfkarren
reviewed
Jul 27, 2024
Kampfkarren
reviewed
Jul 27, 2024
Kampfkarren
reviewed
Jul 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR changes
TypeInfo::UnionandTypeInfo::Intersectionto both use a separate struct:TypeUnionandTypeIntersection. It also changes the structure of these types from being linked lists intoVecs (usingPunctuated). This also results in some new visitor methods:visit_type_union,visit_type_union_end,visit_type_intersection, andvisit_type_intersection_end.This PR also adds the ability to parse leading
|and&in types, such as:This involved adding a
leadingfield to theTypeUnionandTypeIntersectionstructs, which contains an optionalTokenReference.Tests were updated to accommodate the changes, and leading
|and&was added to thetypestest.