-
Notifications
You must be signed in to change notification settings - Fork 100
Minimal 4.13 support #687
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
Merged
Merged
Minimal 4.13 support #687
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
Looks like just the format test failed. |
Julow
approved these changes
Jun 17, 2021
@@ -470,6 +470,10 @@ let rec read_with_constraint env parent (_, frag, constr) = | |||
let frag = Env.Fragment.read_module frag.Location.txt in | |||
let p = Env.Path.read_module env p in | |||
ModuleSubst(frag, p) | |||
#if OCAML_VERSION >= (4,13,0) | |||
| Twith_modtype _ -> failwith "with module type not yet implemented" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to do this before 2.0: #688
@@ -48,7 +48,11 @@ let rec read_pattern env parent doc pat = | |||
| Tpat_constant _ -> [] | |||
| Tpat_tuple pats -> | |||
List.concat (List.map (read_pattern env parent doc) pats) | |||
#if OCAML_VERSION < (4, 13, 0) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 for the tuple
The formatting should be fixed now. |
This was referenced Jun 17, 2021
jonludlam
added a commit
to jonludlam/opam-repository
that referenced
this pull request
Oct 5, 2021
CHANGES: Breaking changes - Remove odoc-parser into a separate repository (@jonludlam, ocaml/odoc#700) Additions - OCaml 4.13 support (@Octachron, ocaml/odoc#687, ocaml/odoc#689) - Better errors/warnings (@Julow, ocaml/odoc#692, ocaml/odoc#717, ocaml/odoc#720, ocaml/odoc#732) - ModuleType 'Alias' support (@jonludlam, ocaml/odoc#703) - Improved test suite (@lubega-simon, ocaml/odoc#697) - Improved documentation (@lubega-simon, @jonludlam, ocaml/odoc#702, ocaml/odoc#733) - Strengthen module types (@jonludlam, ocaml/odoc#731) Bugs fixed - `uwt` now can be documented (@jonludlam, ocaml/odoc#708) - Fix resolution involving deeply nested substitutions (@jonludlam, ocaml/odoc#727) - Fix off-by-one error in error reporting (@asavahista, ocaml/odoc#736)
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.
This PR makes odoc build on OCaml 4.13 but does not handle the new
with module type
feature.This PR mostly adapts the loaders code to the few ASTs change in 4.13 .
There are also few fixed related to the change of typing for
|>
.