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.

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

fix: Parsing nested generics #1319

Merged
merged 8 commits into from
May 8, 2023
Merged

fix: Parsing nested generics #1319

merged 8 commits into from
May 8, 2023

Conversation

jfecher
Copy link
Contributor

@jfecher jfecher commented May 8, 2023

Related issue(s)

Resolves #1316

Description

Summary of changes

Generics always expect to end with a Token::Greater, however nested generics would use the syntax A<B<T>> where the final token(s) would be a Token::ShiftRight rather 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

  • I have tested the changes locally.
  • I have formatted the changes with Prettier and/or cargo fmt with default settings.
  • I have linked this PR to the issue(s) that it resolves.
  • I have reviewed the changes on GitHub, line by line.
  • I have ensured all changes are covered in the description.

Documentation needs

  • This PR requires documentation updates when merged.

Additional context

BEGIN_COMMIT_OVERRIDE
fix: Fix issue with parsing nested generics (#1319)
END_COMMIT_OVERRIDE

@kevaundray kevaundray enabled auto-merge May 8, 2023 22:02
@kevaundray kevaundray added this pull request to the merge queue May 8, 2023
Merged via the queue into master with commit 36f5b8e May 8, 2023
@kevaundray kevaundray deleted the jf/parse-nested-generics branch May 8, 2023 22:54
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Nested generic syntax broken?
2 participants