fix: Parsing nested generics #1319
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
kevaundray
reviewed
May 8, 2023
Co-authored-by: kevaundray <[email protected]>
kevaundray
reviewed
May 8, 2023
…ng/noir into jf/parse-nested-generics
kevaundray
reviewed
May 8, 2023
Co-authored-by: kevaundray <[email protected]>
kevaundray
approved these changes
May 8, 2023
TomAFrench
added a commit
that referenced
this pull request
May 17, 2023
* master: (66 commits) feat(nargo)!: retire print-acir in favour of flag (#1328) chore(ssa): enable cse for assert (#1350) chore(ssa refactor): Add basic instruction simplification (#1329) chore(noir): Release 0.6.0 (#1279) feat: enable to_radix for any field element (#1343) chore(ssa refactor): Simplify inlining pass and fix inlining failure (#1337) chore!: Update to acvm 0.11.0 (#1322) feat: Add ECDSA secp256k1 builtin test (#1294) chore: add support for encoding/decoding inputs from JSON (#1325) feat: Issue an error when attempting to use a `return` expression (#1330) chore(ssa refactor): Fix inlining bug (#1335) fix: to-bits and to-radix for > 128 bits (#1312) chore(parser): Parser error optimisation (#1292) chore(ssa refactor): Implement function inlining (#1293) chore: fix installation link in readme (#1326) chore: fix installation link in readme (#1326) feat(stdlib): Add keccak (#1249) fix: Parsing nested generics (#1319) chore(ssa refactor): Document some SSA-gen functions (#1321) fix: Assigning to tuple fields (#1318) ...
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.
Related issue(s)
Resolves #1316
Description
Summary of changes
Generics always expect to end with a
Token::Greater, however nested generics would use the syntaxA<B<T>>where the final token(s) would be aToken::ShiftRightrather than two separate greater-than tokens.Changing the type parser to also handle right shifts would be difficult as the shift would have to terminate two levels of nesting in the recursive parser. I opted instead for the other route of changing the lexer to always issue two greater-than tokens rather than combining them. From there I needed to add a few special cases in expression operators and the assign-operator shorthands.
Dependency additions / changes
Test additions / changes
Added a small regression test line in the generics test.
Checklist
cargo fmtwith default settings.Documentation needs
Additional context
BEGIN_COMMIT_OVERRIDE
fix: Fix issue with parsing nested generics (#1319)
END_COMMIT_OVERRIDE