make ppx_deriving 4.1 build under 4.05 #154
Merged
Conversation
This file contains 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
This was referenced Oct 24, 2017
Merged
|
(One thing that is missing from the maintenance branch is the wider coverage by travis of OCaml versions. I will send a separate pull-request to add this.) |
|
@gasche I'm sure that you're busy, but is there something that is blocking this PR? I'm trying to fix the versions of the code that I'm using in a program. |
|
@rleonid I was hoping for some sort of feedback by someone else, but then I decided that I would merge anyway this week -- and also consider making a release. I see now that Travis is failing for the missing cppo_ocamlbuild dependency, we also need to fix this first. |
|
My feedback is a big 👍 , does that count? I think that this completes the first 2 points of @avsm 's requests in the issue-that-shall-be-named, and having a separate, non-master, branch is a good way to proceed. Can we do something similar for |
|
That's helpful, thanks. Should I look at ppx-deriving-yojson, or would you for example send a similar PR there? |
|
I've already created a pr, but maybe there should be a similar 4.1-maintenance branch, and the PR can go there instead of master. I guess, one can the branch for my PR and rename it? |
|
Sorry, of course I've seen this PR. If I understand correctly, there isn't anything to "revert" before continuing the temporary cppo-approch in ppx_deriving_json, so I think going on top of master is fine. That said, I do have branch-creation rights over the ocaml-ppx universe, so I would be happy to humor you if you do think that working in a separate branch would be better. |
|
Oh true. No need to humor me. |
|
Note: I want to investigate making changes to this PR as suggested by ocaml-ppx/ppx_deriving_yojson#64. |
|
As a result of the investigation, I propose to merge #159, which is an API change designed to minimize client-side changes (the API changes plays nicer with Parsetree changes foon the same OCaml versions). |
gasche
added a commit
to gasche/opam-repository
that referenced
this pull request
Nov 21, 2017
This is a minor release on top of 4.2 (instead of a minor release on
top of 4.1 as was originally discussed). The goal is to release this
first, ask user feedback on whether it solves their issues, and make
a 4.1 maintenance release if the issues with driverification are still
there.
The changelog is as follows
* Add support for OCaml 4.06.0
ocaml-ppx/ppx_deriving#154, ocaml-ppx/ppx_deriving#155, ocaml-ppx/ppx_deriving#156, ocaml-ppx/ppx_deriving#159
(Gabriel Scherer, Fabian, Leonid Rozenberg)
* Consider { with_path = false } when printing record fields
ocaml-ppx/ppx_deriving#157
(François Pottier)
gasche
added a commit
to gasche/opam-repository
that referenced
this pull request
Nov 21, 2017
This is a minor release on top of 4.2 (instead of a minor release on
top of 4.1 as was originally discussed). The goal is to release this
first, ask user feedback on whether it solves their issues, and make
a 4.1 maintenance release if the issues with driverification are still
there.
The changelog is as follows
* Add support for OCaml 4.06.0
ocaml-ppx/ppx_deriving#154, ocaml-ppx/ppx_deriving#155, ocaml-ppx/ppx_deriving#156, ocaml-ppx/ppx_deriving#159
(Gabriel Scherer, Fabian, Leonid Rozenberg)
* Consider { with_path = false } when printing record fields
ocaml-ppx/ppx_deriving#157
(François Pottier)
gasche
added a commit
to gasche/opam-repository
that referenced
this pull request
Nov 25, 2017
4.1.5 is a maintenance release to include support for OCaml 4.05 and OCaml 4.06 in the ppx_deriving 4.1 branch, which does not contain the driverization work that has been causing issues for some users. * Add support for OCaml 4.05.0 and 4.06.0 (ocaml-ppx/ppx_deriving#154, ocaml-ppx/ppx_deriving#155, ocaml-ppx/ppx_deriving#156, ocaml-ppx/ppx_deriving#159). * Consider { with_path = false } when printing record fields (ocaml-ppx/ppx_deriving#157). * Fix comparison order of fields in records (ocaml-ppx/ppx_deriving#136). * Silence an `unused rec flag` warning in generated code (ocaml-ppx/ppx_deriving#137). * Monomorphize comparison function for builtin types (ocaml-ppx/ppx_deriving#115) * Raise an error when `type nonrec` is encountered (ocaml-ppx/ppx_deriving#116). * Display an error message when dynamic package loading fails. * Add a `with_path` option to `@@deriving` to skip the module path in generated code (ocaml-ppx/ppx_deriving#120).
kit-ty-kate
added a commit
to kit-ty-kate/opam-repository
that referenced
this pull request
Oct 26, 2020
CHANGES: 5.0 (26/10/2020) ---------------- * Migrate to ppxlib ocaml-ppx/ppx_deriving#206, ocaml-ppx/ppx_deriving#210 (Anton Kochkov, Gabriel Scherer, Thierry Martinez) 4.5 --- * Add support for OCaml 4.11. - `Ppx_deriving.string_of_{constant,expression}_opt` to destruct `Pconst_string` in a version-independent way ocaml-ppx/ppx_deriving#220, ocaml-ppx/ppx_deriving#222 (Kate Deplaix, Thierry Martinez, review by Gabriel Scherer) * Stronger type equalities in `Ppx_deriving_runtime` (for instance, `Ppx_deriving_runtime.result` and `Result.result` are now compatible with all OCaml versions) ocaml-ppx/ppx_deriving#223, ocaml-ppx/ppx_deriving#225 (Thierry Martinez, review by Gabriel Scherer) * `Ppx_deriving_runtime.Option` compatibility module ocaml-ppx/ppx_deriving#222 (Thierry Martinez, review by Gabriel Scherer) 4.4.1 ----- * Add support for OCaml 4.10 ocaml-ppx/ppx_deriving#211 (Kate Deplaix, review by Gabriel Scherer) 4.4 --- * Restore support for OCaml 4.02.3 ocaml-ppx/ppx_deriving#188 (ELLIOTTCABLE) * workaround Location.input_filename being empty when using reason-language-server ocaml-ppx/ppx_deriving#196 (Ryan Artecona) * Add support for OCaml 4.08.0 ocaml-ppx/ppx_deriving#193, ocaml-ppx/ppx_deriving#197, ocaml-ppx/ppx_deriving#200 (Gabriel Scherer) 4.3 --- * use Format through Ppx_deriving_runtime to avoid deprecation warning for users of JaneStreet Base (Stephen Bastians and Gabriel Scherer, review by whitequark) * silence a ambiguous-field warning (41) in generated code ocaml-ppx/ppx_deriving#163 (Étienne Millon, review by Gabriel Scherer) * use dune ocaml-ppx/ppx_deriving#170 (Rudi Grinberg, Jérémie Dimino) * silence an unused-value warning for show ocaml-ppx/ppx_deriving#179 (Nathan Rebours) 4.2.1 ----- * Add support for OCaml 4.06.0 ocaml-ppx/ppx_deriving#154, ocaml-ppx/ppx_deriving#155, ocaml-ppx/ppx_deriving#156, ocaml-ppx/ppx_deriving#159 (Gabriel Scherer, Fabian, Leonid Rozenberg) * Consider { with_path = false } when printing record fields ocaml-ppx/ppx_deriving#157 (François Pottier) 4.2 --- * Add support for OCaml 4.05.0. * Use the `ocaml-migrate-parsetree` library to support multiple versions of OCaml. * Fix comparison order of fields in records (ocaml-ppx/ppx_deriving#136). * Silence an `unused rec flag` warning in generated code (ocaml-ppx/ppx_deriving#137). * Monomorphize comparison function for builtin types (ocaml-ppx/ppx_deriving#115) * Raise an error when `type nonrec` is encountered (ocaml-ppx/ppx_deriving#116). * Display an error message when dynamic package loading fails. * Add a `with_path` option to `@@deriving` to skip the module path in generated code (ocaml-ppx/ppx_deriving#120). The homepage for the project has now moved to: <https://github.com/ocaml-ppx/ppx_deriving> 4.1 --- * Fix type error with inheritied polymorphic variant type in [@@deriving map]. * Fix incorrect handling of multi-argument constructors in [@@deriving show]. * Add API hooks for ppx_type_conv. 4.0 --- * Show, eq, ord, map, iter, fold: add support for `Result.result`. * Ppx_deriving.Arg: use Result.result instead of polymorphic variants. * Ppx_deriving.sanitize: parameterize over an opened module. * Add support for `[@@deriving]` in module type declarations. * Add support for loading findlib packages instead of just files in ppx_deriving_main. * Treat types explicitly qualified with Pervasives also as builtin. * Compatibility with statically linked ppx drivers. 3.1 --- * Show, eq, ord: hygienically invoke functions from referenced modules (such as X.pp for X.t when deriving show) to coexist with modules shadowing ones from standard library. * Iter, map, fold: hygienically invoke List and Array functions. 3.0 --- * Implement hygiene: Ppx_deriving.{create_quoter,quote,sanitize,with_quoter}. * Show, eq, ord: add support for `lazy_t`. * Add support for `[@nobuiltin]` attribute. * Add Ppx_deriving.hash_variant. * Remove allow_std_type_shadowing option. * Remove Ppx_deriving.extract_typename_of_type_group. 2.1 --- * Fix breakage occurring with 4.02.2 w.r.t record labels * Fix prefixed attribute names (`[@deriving.foo.attr]` and `[@foo.attr]`). * Add allow_std_type_shadowing option for eq and show. 2.0 --- * Add support for open types. 1.1 --- * New plugin: create. * Show, eq, ord: handle `_`. * Show, eq, ord, map, iter, fold: handle inheriting from a parametric polymorphic variant type. * Make `Ppx_deriving.poly_{fun,arrow}_of_type_decl` construct functions in correct order. This also fixes all derivers with types with more than one parameter. * Add `Ppx_deriving.fold_{left,right}_type_decl`. 1.0 --- * Make deriver names lowercase. * Remove Findlib+dynlink integration. All derivers must now be explicitly required. * Allow shortening [%derive.x:] to [%x:] when deriver x exists. * Make `Ppx_deriving.core_type` field optional to allow ignoring unsupported [%x:] shorthands. * Add support for [@@deriving foo { optional = true }] that does not error out if foo is missing, useful for optional dependencies. * Rename ~name and ~prefix of `Ppx_deriving.attr` and `Ppx_deriving.Arg.payload` to `~deriver`. * Renamed `Ppx_deriving.Arg.payload` to `get_attr`. * Add `Ppx_deriving.Arg.get_expr` and `get_flag`. 0.3 --- * Show, Eq, Ord, Iter, Fold: handle ref. * Show: handle functions. * Show: include break hints in format strings. * Show: pull fprintf into local environment. * Show: add `[@polyprinter]` and `[@opaque]`. * Add `Ppx_deriving.Arg.expr`. 0.2 --- * New plugins: Enum, Iter, Map, Fold. * All plugins: don't concatenate affix if type is named `t`. * Add `[%derive.Foo:]` shorthand. * Show, Eq, Ord: add support for list, array, option. * Show: include full module path in output, including for types with manifest. * A lot of changes in `Ppx_deriving interface`. 0.1 --- * Initial release.
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.
See #153: this is the start of an attempt to provide a 4.1 maintenance release that supports recent OCaml versions -- as a temporary solution to the current breakage for non-driverized users.
I started by creating a branch 4.1-maintenance on the upstream repo, which contains all the commits that went into 4.2 except for the omp-support changes in #141 -- currently it points exactly to 6b75b9e. A first point of potential discussion is whether we should indeed start from all those commits (some of there are small feature requests rather than bugfixes), but I think this is a reasonable basis to start from.
Then I just implemented 4.05-support using ugly preprocessor conditionals. This is the current PR, and it is very simple. I also implemented 4.06-support (which is a bit heavier due, I think, to oversight in the parsetree evolution), which will come as a separate PR.
If there is consensus to merge this PR, this means that users of 4.1-style ppx_deriving will be able to use it under 4.05.0.
It is an explicit design goal of mine that users of 4.2-style ppx_deriving (in particular jbuilder users) would not be affected by a release of a 4.1.1 or 4.1+4.05 maintenance release, but I have not tested for it -- this will have to be tested at the time of (maybe) publishing a 4.1.foo on opam, not from the current PR, but if/when this happens the testing help of jbuilder users will be warmly welcome.