Rebase jane on upstream #43
Merged
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.
The jane branch was previously about 7 months behind upstream, so this rebase catches us up. Rebases were getting unwieldy due to the divergence of upstream and poor commit history of jane, so squashing these commits into one made it easier to resolve conflicts, especially in places where fixes to earlier merge conflicts depended on changes introduced in later commits.
Notable changes in this commit:
Initial patches to parser for janestreet specific extensions (local_, global_)
Support for include functor
Support for polymorphic function parameters
Support for comprehensions
Support for immutable arrays
Support for layout annotations
Support for exclave_ syntax
Support for unboxed float literals and float#
Support for explicit strengthening
Mode for rewriting local-mode attributes into their keyword form
Changes authored by:
antalsz
ccasin
cwong-ocaml
goldfirere
Julow
riaqn
rleshchinskiy
stedolan
tdelvecchio-jsc