Add support for OCaml 5.1 #428

tmattio · 2023-06-16T14:27:10Z

Update trunk AST for pvb_constraint
Add migration from 501 to 500
Bump the 501 AST magic numbers
Binary AST reader: use latest possible AST version

When the magic numbers aren't unique, before this commit, the binary AST reader would read into the first AST version matching the magic number. With this commit, it takes the last such version. That's important for trunk support.

Fix inline tests' dependency on OCaml version

Done by making the expected output also dependent on the OCaml version

This is cherry-picking 4ebc7d4 to 9d95d42. (with a small difference from 4ebc7d4 to remove the README update)

I've squashed the commits to make the history cleaner as most of the commits seemed to be fixes of the intial commit, but I can keep the history intact if you prefer.

I'll rebase trunk-support on top of main once merged.

pitag-ha

Thanks for taking this on! There seem to be a few important commits from trunk-support missing (see below).

CHANGES.md

pitag-ha · 2023-06-16T16:26:37Z

astlib/ast_501.ml

+  and poly_constraint (*IF_CURRENT = Parsetree.poly_constraint *) =
+    {
+      locally_abstract_univars:string loc list;
+      typ:core_type;
+    }
+
+  and value_binding (*IF_CURRENT = Parsetree.value_binding *) =
+    {
+      pvb_pat: pattern;
+      pvb_expr: expression;
+      pvb_constraint: poly_constraint option;


This is the version from before the compiler Parsetree fix for coercions, isn't it?

pitag-ha · 2023-06-16T16:31:27Z

ppxlib.opam

@@ -21,7 +21,7 @@ doc: "https://ocaml-ppx.github.io/ppxlib/"
 bug-reports: "https://github.com/ocaml-ppx/ppxlib/issues"
 depends: [
  "dune" {>= "2.7"}
-  "ocaml" {>= "4.04.1" & < "5.1.0"}
+  "ocaml" {>= "4.04.1" & < "5.2.0"}


We also need a "not compatible with ocaml.5.1.0~alpha1" constraint here.

tmattio · 2023-06-17T10:15:57Z

Thanks for the review @pitag-ha and you're right I had omitted commits that came after the support for 5.2 that fixed 5.1. I added e072b1c and 1966c31.

So the only commits from trunk-support that are included now should be:

Do any of these seem relevant for 5.1?

pitag-ha

Looks almost good, thanks! We just need to run and promote the tests to fix them on 5.1. Could you do that?

CHANGES.md

astlib/migrate_501_500.ml

CHANGES.md

* Update trunk AST for pvb_constraint * Add migration from 501 to 500 * Bump the 501 AST magic numbers * Binary AST reader: use latest possible AST version When the magic numbers aren't unique, before this commit, the binary AST reader would read into the first AST version matching the magic number. With this commit, it takes the last such version. That's important for trunk support. * Fix inline tests' dependency on OCaml version Done by making the expected output also dependent on the OCaml version * Add a add tests to test both round-trips as well as a test comparing parsing on 5.0.0 with parsing on 5.1.0 and then down migrating. This last test will need to be updated when bumping the AST. Co-authored-by: Samuel Hym <samuel.hym@rustyne.lautre.net> Co-authored-by: Florian Angeletti <florian.angeletti@inria.fr> Co-authored-by: Sonja Heinze <sonjaleaheinze@gmail.com> Co-authored-by: Paul-Elliot <peada@free.fr> Signed-off-by: Thibaut Mattio <thibaut.mattio@gmail.com>

tmattio · 2023-06-19T15:46:23Z

Looks almost good, thanks! We just need to run and promote the tests to fix them on 5.1. Could you do that?

Done

pitag-ha

Thank you, looks all good (up to the still running CI)! Once the CI finishes and passes, let's merge this and then cut a release right away.

tmattio · 2023-06-20T08:39:52Z

The cluster is having a hard time running the jobs - macOS x86 and Debian s390x have been hanging since yesterday.

Seeing all the other jobs are passing and we don't have an immediate solution for unlocking the hanging jobs, I'm merging now.

@pitag-ha

CHANGES: - Adopt the OCaml Code of Conduct on the repo (ocaml-ppx/ppxlib#426, @pitag-ha) - Clean up misleading attribute hints when declared for proper context. (ocaml-ppx/ppxlib#425, @ceastlund) - Ast_pattern now has ebool, pbool helper, and a new map.(ocaml-ppx/ppxlib#402, @Burnleydev1) - multiple errors are now reported in `metaquot`. (ocaml-ppx/ppxlib#397, @Burnleydev1) - Add `Attribute.declare_with_attr_loc` (ocaml-ppx/ppxlib#396, @dvulakh) - Add "ns" and "res" as reserved namespaces(ocaml-ppx/ppxlib#388, @davesnx) - Make quoter `let` binding non-recursive (ocaml-ppx/ppxlib#401, @sim642) - Fix failure of 'lift_map_with_context' in traverse by compile-time evaluation of 'fst' and 'snd' (ocaml-ppx/ppxlib#390, @smuenzel) - Driver: Bias the mapping from magic to version towards the current version, as it is usually the common case and it helps when magic numbers are ambiguous (such as on development versions) (ocaml-ppx/ppxlib#409, @shym) - Remove unnecessary test dependencies towards base and stdio (ocaml-ppx/ppxlib#421, @kit-ty-kate) - Update description to reflect that `ppxlib` contains more than a library (ocaml-ppx/ppxlib#422, @pitag-ha) - Add support for OCaml 5.1, excluding OCaml `5.1.0~alpha1` (ocaml-ppx/ppxlib#428, @shym, @Octachron , @pitag-ha, @panglesd) - Driver: Fix `-locations-check` option for coercions with ground (ocaml-ppx/ppxlib#428, @Octachron)

@pitag-ha

CHANGES: - Adopt the OCaml Code of Conduct on the repo (ocaml-ppx/ppxlib#426, @pitag-ha) - Clean up misleading attribute hints when declared for proper context. (ocaml-ppx/ppxlib#425, @ceastlund) - Ast_pattern now has ebool, pbool helper, and a new map.(ocaml-ppx/ppxlib#402, @Burnleydev1) - multiple errors are now reported in `metaquot`. (ocaml-ppx/ppxlib#397, @Burnleydev1) - Add `Attribute.declare_with_attr_loc` (ocaml-ppx/ppxlib#396, @dvulakh) - Add "ns" and "res" as reserved namespaces(ocaml-ppx/ppxlib#388, @davesnx) - Make quoter `let` binding non-recursive (ocaml-ppx/ppxlib#401, @sim642) - Fix failure of 'lift_map_with_context' in traverse by compile-time evaluation of 'fst' and 'snd' (ocaml-ppx/ppxlib#390, @smuenzel) - Driver: Bias the mapping from magic to version towards the current version, as it is usually the common case and it helps when magic numbers are ambiguous (such as on development versions) (ocaml-ppx/ppxlib#409, @shym) - Remove unnecessary test dependencies towards base and stdio (ocaml-ppx/ppxlib#421, @kit-ty-kate) - Update description to reflect that `ppxlib` contains more than a library (ocaml-ppx/ppxlib#422, @pitag-ha) - Add support for OCaml 5.1, excluding OCaml `5.1.0~alpha1` (ocaml-ppx/ppxlib#428, @shym, @Octachron , @pitag-ha, @panglesd) - Driver: Fix `-locations-check` option for coercions with ground (ocaml-ppx/ppxlib#428, @Octachron)

@pitag-ha

CHANGES: - Adopt the OCaml Code of Conduct on the repo (ocaml-ppx/ppxlib#426, @pitag-ha) - Clean up misleading attribute hints when declared for proper context. (ocaml-ppx/ppxlib#425, @ceastlund) - Ast_pattern now has ebool, pbool helper, and a new map.(ocaml-ppx/ppxlib#402, @Burnleydev1) - multiple errors are now reported in `metaquot`. (ocaml-ppx/ppxlib#397, @Burnleydev1) - Add `Attribute.declare_with_attr_loc` (ocaml-ppx/ppxlib#396, @dvulakh) - Add "ns" and "res" as reserved namespaces(ocaml-ppx/ppxlib#388, @davesnx) - Make quoter `let` binding non-recursive (ocaml-ppx/ppxlib#401, @sim642) - Fix failure of 'lift_map_with_context' in traverse by compile-time evaluation of 'fst' and 'snd' (ocaml-ppx/ppxlib#390, @smuenzel) - Driver: Bias the mapping from magic to version towards the current version, as it is usually the common case and it helps when magic numbers are ambiguous (such as on development versions) (ocaml-ppx/ppxlib#409, @shym) - Remove unnecessary test dependencies towards base and stdio (ocaml-ppx/ppxlib#421, @kit-ty-kate) - Update description to reflect that `ppxlib` contains more than a library (ocaml-ppx/ppxlib#422, @pitag-ha) - Add support for OCaml 5.1, excluding OCaml `5.1.0~alpha1` (ocaml-ppx/ppxlib#428, @shym, @Octachron , @pitag-ha, @panglesd) - Driver: Fix `-locations-check` option for coercions with ground (ocaml-ppx/ppxlib#428, @Octachron)

tmattio requested review from ceastlund, panglesd and pitag-ha as code owners June 16, 2023 14:27

tmattio force-pushed the support-510-squashed branch 2 times, most recently from 6423a07 to 23b43c6 Compare June 16, 2023 14:34

pitag-ha reviewed Jun 16, 2023

View reviewed changes

tmattio force-pushed the support-510-squashed branch from 7196c02 to 82c0c79 Compare June 17, 2023 10:12

pitag-ha reviewed Jun 19, 2023

View reviewed changes

CHANGES.md Outdated Show resolved Hide resolved

CHANGES.md Outdated Show resolved Hide resolved

astlib/migrate_501_500.ml Outdated Show resolved Hide resolved

tmattio commented Jun 19, 2023

View reviewed changes

CHANGES.md Show resolved Hide resolved

tmattio force-pushed the support-510-squashed branch from 90206cc to 16802bd Compare June 19, 2023 15:46

pitag-ha approved these changes Jun 19, 2023

View reviewed changes

tmattio merged commit f0320c4 into ocaml-ppx:main Jun 20, 2023
4 of 5 checks passed

tmattio mentioned this pull request Jun 20, 2023

[new release] ppxlib and ppxlib-bench (0.30.0) ocaml/opam-repository#23965

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for OCaml 5.1 #428

Add support for OCaml 5.1 #428

tmattio commented Jun 16, 2023

pitag-ha left a comment

pitag-ha Jun 16, 2023

pitag-ha Jun 16, 2023

tmattio commented Jun 17, 2023 •

edited

Loading

pitag-ha left a comment

tmattio commented Jun 19, 2023

pitag-ha left a comment

tmattio commented Jun 20, 2023

Add support for OCaml 5.1 #428

Add support for OCaml 5.1 #428

Conversation

tmattio commented Jun 16, 2023

pitag-ha left a comment

Choose a reason for hiding this comment

pitag-ha Jun 16, 2023

Choose a reason for hiding this comment

pitag-ha Jun 16, 2023

Choose a reason for hiding this comment

tmattio commented Jun 17, 2023 • edited Loading

pitag-ha left a comment

Choose a reason for hiding this comment

tmattio commented Jun 19, 2023

pitag-ha left a comment

Choose a reason for hiding this comment

tmattio commented Jun 20, 2023

tmattio commented Jun 17, 2023 •

edited

Loading