Fix incorrect parsing of string contains "verus!{". #72
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
non_verus is defined to accept ANY which might be of low precedency.
When a string literal in non_verus contains "verus!{", VerusParser fails to parse the string and throws an error indicating the string is parsed into verus_macro_use.
This patch modfies non_verus so it accepts string, raw_string, etc., explicitly so string literals with "verus!{" can be correctly parsed.
verus-minimal is changed as well otherwise rustfmt shipped in this crate cannot format the non-verus code correctly.
A companion unit test which should fail without this patch is included.
jaybosamiya
approved these changes
May 29, 2024
There was a problem hiding this comment.
Awesome, thanks for fixing this issue!
This overall looks good to me, modulo the minor comment about the comment which would be nice to add in before we merge this.
Majority of the addition to verus-minimal.pest is copying over string,...ray_byte_string into it; just thinking about longer term maintainability (as a TODO item for myself to take care of after this PR; no changes needed here) is to add some comments on which things need to stay in sync.
Co-authored-by: Jay Bosamiya <[email protected]>
|
Formatting updates. |
|
Overall, looks good to me. Thanks for your first contribution to verusfmt! Will merge it in once CI goes green. (Edit: I can't squash merge from my phone; will merge once I get to my laptop) |
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.
non_verus is defined to accept ANY which might be of low precedency. When a string literal in non_verus contains "verus!{", VerusParser fails to parse the string and throws an error indicating the string is parsed into verus_macro_use.
This patch modfies non_verus so it accepts string, raw_string, etc., explicitly so string literals with "verus!{" can be correctly parsed.
verus-minimal is changed as well otherwise rustfmt shipped in this crate cannot format the non-verus code correctly.
A companion unit test which should fail without this patch is included.