Merge 5.2.0minus-4 #120
Merged
Merge 5.2.0minus-4 #120
Conversation
This file contains hidden or 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
liam923
commented
Nov 29, 2024
liam923
commented
Nov 29, 2024
goldfirere
approved these changes
Dec 2, 2024
Contributor
goldfirere
left a comment
There was a problem hiding this comment.
I've reviewed the last 6 commits.
| at_modalities_expr: | ||
| | AT modalities {$2} | ||
| | AT error { expecting $loc($2) "modality expression" } | ||
| // | AT error { expecting $loc($2) "modality expression" } |
Contributor
Author
There was a problem hiding this comment.
Merlin's error recovery when parsing works differently than in the compiler. You'll notice there's other similar things commented out.
Contributor
|
I've read the questions in the top post and am OK with these changes. Specifically about jkind annotations: the change was to drop automatically printing user-written jkind annotations on |
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.
Imports compiler changes for version 5.2.0minus-4. The first three commits are the result of running the import script (and committing conflicts), so they should be skipped when reviewing.
Beyond general review, there are a few things for which I would like special attention from certain people:
Printtyp.tree_of_type_decl. This led to test changes in (only)tests/test-dirs/type-enclosing/jane-street.t/run.t.Ptyp_of_type.constructor_argument. I assumed thatca_jkindis the kind forca_typeand can therefore be ignored. (For context, this function is converting from a typed tree to a parse tree for Merlin'sconstructcommand.)