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

Update parsetree #95

Merged
merged 6 commits into from
Dec 30, 2024
Merged

Update parsetree #95

merged 6 commits into from
Dec 30, 2024

Conversation

tdelvecchio-jsc
Copy link

@tdelvecchio-jsc tdelvecchio-jsc commented Dec 20, 2024

Only updates the standard parser and normalization logic; does not actually fix styling of the new syntax. In particular, this updates through:

  • Removal of jane_syntax, adding more syntax to the parsetree directly rather than encoding in attributes
    • kind annotations on types
    • layout annotations on type parameters
    • labelled tuples
    • comprehensions
    • strengthening
    • currying
    • unboxed numbers
    • unboxed tuples
  • Addition of signature modalities
  • Addition of function return mode annotations
  • Addition of directives
  • Addition of pexp_hole
  • Addition of functor modes

The first commit changes the repatch scripts to

  1. account for some changes to the compiler, including changes to directory structure and files
  2. improve the repatching code to give better merge conflicts than just ".rej" files

The second commit runs the repatch script and accepts the result directly. The third commit fixes the conflicts and resulting build errors from the changes.

Later PRs will add support for styling some of the new features.

Tested on internal code; successfully builds with no diff.

tdelvecchio-jsc and others added 3 commits December 20, 2024 15:34
Signed-off-by: Thomas Del Vecchio <[email protected]>
Signed-off-by: David Vulakh <[email protected]>
this function had just one remaining use site, having to do with
currying attributes

Signed-off-by: David Vulakh <[email protected]>
Copy link

@dvulakh dvulakh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thanks for seeing this change to completion.

@tdelvecchio-jsc tdelvecchio-jsc merged commit b33dfd2 into jane Dec 30, 2024
4 checks passed
@tdelvecchio-jsc tdelvecchio-jsc deleted the update-parsetree branch December 30, 2024 16:00
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.

2 participants