feature: make `modes` field an Ordered_set_lang instance #6611

anmonteiro · 2022-12-01T06:48:24Z

Allows writing (modes :standard melange) which will be useful when converting libraries in existing repositories.

Signed-off-by: Antonio Nuno Monteiro [email protected]

rgrinberg · 2022-12-01T14:56:34Z

This feature is fine on its own but I wonder if it addresses the real problem. You would still need edit a ton of files to get started with melange. Maybe it would make sense to sense the modes in the env stanza as well?

anmonteiro · 2022-12-17T19:37:29Z

Maybe it would make sense to sense the modes in the env stanza as well?

is this an example of your suggestion?

(env 
 (development
   (modes :standard melange))

I'm not so sure about that. I was thinking that the melange adoption would be rather incremental, as we'd want to verify each library that it would work.

rgrinberg · 2022-12-19T18:13:32Z

I'm not so sure about that. I was thinking that the melange adoption would be rather incremental, as we'd want to verify each library that it would work.

Yeah, I guess we should ask @jchavarri what feature would be useful.

Anyway, this PR looks good to me. If @jchavarri says it's useful, we can merge.

jchavarri · 2022-12-19T18:44:55Z

Afaiu, the difference is that instead of (modes byte native melange) one could write (modes :standard melange), right?

In that case, I am not sure it would be very useful. It allows to save some characters and maybe it's more "idiomatic" and natural for expert Dune users. For newcomers, it might be more magical and lead to confusion.

For that reason, I tend to prefer explicitness, so the longer option might be clearer (imo). @davesnx what do you think? as you've also been early tester of Melange+Dune integration.

anmonteiro · 2022-12-20T01:42:54Z

I don’t think that’s the question, though. This is a common dune idiom.

The question is whether we want a way to opt-in in all installed libraries to melange mode or not.

This PR is useful on its own as it allows an incremental approach through a dune idiom

davesnx · 2022-12-20T08:43:53Z

The question is whether we want a way to opt-in in all installed libraries to melange mode or not.

While migrating from BuckleScript or ReScript to Melange it's very helpful if melange mode would propagate to installed libs, since would be a blocker for some users. To solve it we found was patch the package or adding subdir on a dune at the root, which both solutions work but seem incomplete and not in par with jsoo (which I understand the differences, but not everyone might do).

jchavarri · 2022-12-22T08:50:02Z

The question is whether we want a way to opt-in in all installed libraries to melange mode or not.

@anmonteiro Could you expand on this please? I think I don't understand how this PR enables that opt-in process more than using explicit modes.

anmonteiro · 2022-12-22T09:14:27Z

It doesn’t, but it makes it a tad shorter to write. Users might not always remember to write byte native, and want to rely on the dune default for :standard.

rgrinberg · 2023-01-29T00:59:35Z

LGTM. @anmonteiro can you guard this behind 3.7? It will be a bit annoying, but I think we can manage it this way:

for >= 3.7, we just use the new code that you have
for old versions, we parse with the old parse. If the old parser succeeds, we just use its result. If not, then we try using OSL. If that succeeds, we tell the user to upgrade to 3.7

Then it should be good to go.

rgrinberg · 2023-01-29T00:59:57Z

I think this needs a CHANGES entry

rgrinberg · 2023-02-16T01:52:37Z

Moved it to 3.8.0 to give you more time to work on it

anmonteiro · 2023-02-21T00:26:36Z

src/dune_rules/dune_file.ml

+        (fun exn ->
+          try_
+            ( ordered_mode_field ~stanza_loc project >>| fun modes ->
+              if dune_version >= expected_version then `New modes else `Upgrade


this might be too complicated for its own good, but I wanted to return the first error message if we fail parsing the OSL for old versions of the dune language.

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

@rgrinberg

CHANGES: - When a rule's action is interrupted, delete any leftover directory targets. This is consistent with how we treat file targets. (@rgrinberg, 7564) - Fix plugin loading with findlib. The functionality was broken in 3.7.0. (ocaml/dune#7556, @anmonteiro) - Introduce a `public_headers` field on libraries. This field is like `install_c_headers`, but it allows to choose the extension and choose the paths for the installed headers. (ocaml/dune#7512, @rgrinberg) - Load the host context `findlib.conf` when cross-compiling (ocaml/dune#7428, fixes ocaml/dune#1701, @rgrinberg, @anmonteiro) - Resolve `ppx_runtime_libraries` in the target context when cross compiling (ocaml/dune#7450, fixes ocaml/dune#2794, @anmonteiro) - Use `$PKG_CONFIG`, when set, to find the `pkg-config` binary (ocaml/dune#7469, fixes ocaml/dune#2572, @anmonteiro) - Preliminary support for Coq compiled intefaces (`.vos` files) enabled via `(mode vos)` in `coq.theory` stanzas. This can be used in combination with `dune coq top` to obtain fast re-building of dependencies (with no checking of proofs) prior to stepping into a file. (ocaml/dune#7406, @rlepigre) - Fix dune crashing on MacOS in watch mode whenever `$PATH` contains `$PWD` (ocaml/dune#7441, fixes ocaml/dune#6907, @rgrinberg) - Fix `dune install` when cross compiling (ocaml/dune#7410, fixes ocaml/dune#6191, @anmonteiro, @rizo) - Find `pps` dependencies in the host context when cross-compiling, (ocaml/dune#7410, fixes ocaml/dune#4156, @anmonteiro) - Dune in watch mode no longer builds concurrent rules in serial (ocaml/dune#7395 @rgrinberg, @jchavarri) - `dune coq top` now correctly respects the project root when called from a subdirectory. However, absolute filenames passed to `dune coq top` are no longer supported (due to being buggy) (ocaml/dune#7357, fixes ocaml/dune#7344, @rlepigre and @Alizter) - Added a `--no-build` option to `dune coq top` for avoiding rebuilds (ocaml/dune#7380, fixes ocaml/dune#7355, @Alizter) - RPC: Ignore SIGPIPE when clients suddenly disconnect (ocaml/dune#7299, ocaml/dune#7319, fixes ocaml/dune#6879, @rgrinberg) - Always clean up the UI on exit. (ocaml/dune#7271, fixes ocaml/dune#7142 @rgrinberg) - Bootstrap: remove reliance on shell. Previously, we'd use the shell to get the number of processors. (ocaml/dune#7274, @rgrinberg) - Bootstrap: correctly detect the number of processors by allowing `nproc` to be looked up in `$PATH` (ocaml/dune#7272, @Alizter) - Speed up file copying on macos by using `clonefile` when available (@rgrinberg, ocaml/dune#7210) - Adds support for loading plugins in toplevels (ocaml/dune#6082, fixes ocaml/dune#6081, @ivg, @richardlford) - Support commands that output 8-bit and 24-bit colors in the terminal (ocaml/dune#7188, @Alizter) - Speed up rule generation for libraries and executables with many modules (ocaml/dune#7187, @jchavarri) - Add `--watch-exclusions` to Dune build options (ocaml/dune#7216, @jonahbeckford) - Do not re-render UI on every frame if the UI doesn't change (ocaml/dune#7186, fix ocaml/dune#7184, @rgrinberg) - Make coq_db creation in scope lazy (@ejgallego, ocaml/dune#7133) - Non-user proccesses such as version control or config checking are now run silently. (ocaml/dune#6994, fixes ocaml/dune#4066, @Alizter) - Add the `--display-separate-messages` flag to separate the error messages produced by commands with a blank line. (ocaml/dune#6823, fixes ocaml/dune#6158, @esope) - Accept the Ordered Set Language for the `modes` field in `library` stanzas (ocaml/dune#6611, @anmonteiro). - dune install now respects --display quiet mode (ocaml/dune#7116, fixes ocaml/dune#4573, fixes ocaml/dune#7106, @Alizter) - Stub shared libraries (dllXXX_stubs.so) in Dune-installed libraries could not be used as dependencies of libraries in the workspace (eg when compiling to bytecode and/or Javascript). This is now fixed. (ocaml/dune#7151, @nojb) - Allow the main module of a library with `(stdlib ...)` to depend on other libraries (ocaml/dune#7154, @anmonteiro). - Bytecode executables built for JSOO are linked with `-noautolink` and no longer depend on the shared stubs of their dependent libraries (ocaml/dune#7156, @nojb) - Added a new user action `(concurrent )` which is like `(progn )` but runs the actions concurrently. (ocaml/dune#6933, @Alizter) - Allow `(stdlib ...)` to be used with `(wrapped false)` in library stanzas (ocaml/dune#7139, @anmonteiro). - Allow parallel execution of inline tests partitions (ocaml/dune#7012, @hhugo) - Support `(link_flags ...)` in `(cinaps ...)` stanza. (ocaml/dune#7423, fixes ocaml/dune#7416, @nojb) - Allow `(package ...)` in any position within `(rule ...)` stanza (ocaml/dune#7445, @Leonidas-from-XIV) - Always include `opam` files in the generated `.install` file. Previously, it would not be included whenever `(generate_opam_files true)` was set and the `.install` file wasn't yet generated. (ocaml/dune#7547, @rgrinberg)

@rleshchinskiy

CHANGES: - Fix string quoting in the json file written by `--trace-file` (ocaml/dune#7773, @rleshchinskiy) - Read `pkg-config` arguments from the `PKG_CONFIG_ARGN` environment variable (ocaml/dune#1492, ocaml/dune#7734, @anmonteiro) - Correctly set `MANPATH` in `dune exec`. Previously, we would use the `bin/` directory of the context. (ocaml/dune#7655, @rgrinberg) - Allow overriding the `ocaml` binary with findlib configuration (ocaml/dune#7648, @rgrinberg) - merlin: ignore instrumentation settings for preprocessing. (ocaml/dune#7606, fixes ocaml/dune#7465, @Alizter) - When a rule's action is interrupted, delete any leftover directory targets. This is consistent with how we treat file targets. (ocaml/dune#7564, @rgrinberg) - Fix plugin loading with findlib. The functionality was broken in 3.7.0. (ocaml/dune#7556, @anmonteiro) - Introduce a `public_headers` field on libraries. This field is like `install_c_headers`, but it allows to choose the extension and choose the paths for the installed headers. (ocaml/dune#7512, @rgrinberg) - Load the host context `findlib.conf` when cross-compiling (ocaml/dune#7428, fixes ocaml/dune#1701, @rgrinberg, @anmonteiro) - Add a `coqdoc_flags` field to the `coq.theory` stanza allowing the user to pass extra arguments to `coqdoc`. (ocaml/dune#7676, fixes ocaml/dune#7954 @Alizter) - Resolve `ppx_runtime_libraries` in the target context when cross compiling (ocaml/dune#7450, fixes ocaml/dune#2794, @anmonteiro) - Use `$PKG_CONFIG`, when set, to find the `pkg-config` binary (ocaml/dune#7469, fixes ocaml/dune#2572, @anmonteiro) - Modules that were declared in `(modules_without_implementation)`, `(private_modules)` or `(virtual_modules)` but not declared in `(modules)` will cause Dune to emit a warning which will become an error in 3.9. (ocaml/dune#7608, fixes ocaml/dune#7026, @Alizter) - Preliminary support for Coq compiled intefaces (`.vos` files) enabled via `(mode vos)` in `coq.theory` stanzas. This can be used in combination with `dune coq top` to obtain fast re-building of dependencies (with no checking of proofs) prior to stepping into a file. (ocaml/dune#7406, @rlepigre) - Fix dune crashing on MacOS in watch mode whenever `$PATH` contains `$PWD` (ocaml/dune#7441, fixes ocaml/dune#6907, @rgrinberg) - Fix `dune install` when cross compiling (ocaml/dune#7410, fixes ocaml/dune#6191, @anmonteiro, @rizo) - Find `pps` dependencies in the host context when cross-compiling, (ocaml/dune#7410, fixes ocaml/dune#4156, @anmonteiro) - Dune in watch mode no longer builds concurrent rules in serial (ocaml/dune#7395 @rgrinberg, @jchavarri) - Dune can now detect Coq theories from outside the workspace. This allows for composition with installed theories (not necessarily installed with Dune). (ocaml/dune#7047, @Alizter, @ejgallego) - `dune coq top` now correctly respects the project root when called from a subdirectory. However, absolute filenames passed to `dune coq top` are no longer supported (due to being buggy) (ocaml/dune#7357, fixes ocaml/dune#7344, @rlepigre and @Alizter) - Added a `--no-build` option to `dune coq top` for avoiding rebuilds (ocaml/dune#7380, fixes ocaml/dune#7355, @Alizter) - RPC: Ignore SIGPIPE when clients suddenly disconnect (ocaml/dune#7299, ocaml/dune#7319, fixes ocaml/dune#6879, @rgrinberg) - Always clean up the UI on exit. (ocaml/dune#7271, fixes ocaml/dune#7142 @rgrinberg) - Bootstrap: remove reliance on shell. Previously, we'd use the shell to get the number of processors. (ocaml/dune#7274, @rgrinberg) - Bootstrap: correctly detect the number of processors by allowing `nproc` to be looked up in `$PATH` (ocaml/dune#7272, @Alizter) - Speed up file copying on macos by using `clonefile` when available (@rgrinberg, ocaml/dune#7210) - Adds support for loading plugins in toplevels (ocaml/dune#6082, fixes ocaml/dune#6081, @ivg, @richardlford) - Support commands that output 8-bit and 24-bit colors in the terminal (ocaml/dune#7188, @Alizter) - Speed up rule generation for libraries and executables with many modules (ocaml/dune#7187, @jchavarri) - Add `--watch-exclusions` to Dune build options (ocaml/dune#7216, @jonahbeckford) - Do not re-render UI on every frame if the UI doesn't change (ocaml/dune#7186, fix ocaml/dune#7184, @rgrinberg) - Make coq_db creation in scope lazy (@ejgallego, ocaml/dune#7133) - Non-user proccesses such as version control or config checking are now run silently. (ocaml/dune#6994, fixes ocaml/dune#4066, @Alizter) - Add the `--display-separate-messages` flag to separate the error messages produced by commands with a blank line. (ocaml/dune#6823, fixes ocaml/dune#6158, @esope) - Accept the Ordered Set Language for the `modes` field in `library` stanzas (ocaml/dune#6611, @anmonteiro). - dune install now respects --display quiet mode (ocaml/dune#7116, fixes ocaml/dune#4573, fixes ocaml/dune#7106, @Alizter) - Stub shared libraries (dllXXX_stubs.so) in Dune-installed libraries could not be used as dependencies of libraries in the workspace (eg when compiling to bytecode and/or Javascript). This is now fixed. (ocaml/dune#7151, @nojb) - Allow the main module of a library with `(stdlib ...)` to depend on other libraries (ocaml/dune#7154, @anmonteiro). - Bytecode executables built for JSOO are linked with `-noautolink` and no longer depend on the shared stubs of their dependent libraries (ocaml/dune#7156, @nojb) - Added a new user action `(concurrent )` which is like `(progn )` but runs the actions concurrently. (ocaml/dune#6933, @Alizter) - Allow `(stdlib ...)` to be used with `(wrapped false)` in library stanzas (ocaml/dune#7139, @anmonteiro). - Allow parallel execution of inline tests partitions (ocaml/dune#7012, @hhugo) - Support `(link_flags ...)` in `(cinaps ...)` stanza. (ocaml/dune#7423, fixes ocaml/dune#7416, @nojb) - Allow `(package ...)` in any position within `(rule ...)` stanza (ocaml/dune#7445, @Leonidas-from-XIV) - Always include `opam` files in the generated `.install` file. Previously, it would not be included whenever `(generate_opam_files true)` was set and the `.install` file wasn't yet generated. (ocaml/dune#7547, @rgrinberg) - Fix regression where Merlin was unable to handle filenames with uppercase letters under Windows. (ocaml/dune#7577, @nojb) - On nix+macos, pass `-f` to the codesign hook to avoid errors when the binary is already signed (ocaml/dune#7183, fixes ocaml/dune#6265, @greedy) - Fix bug where RPC clients built with dune-rpc-lwt would crash when closing their connection to the server (ocaml/dune#7581, @gridbugs) - Introduce mdx stanza 0.4 requiring mdx >= 2.3.0 which updates the default list of files to include `*.mld` files (ocaml/dune#7582, @Leonidas-from-XIV) - Fix RPC server on Windows (used for OCaml-LSP). (ocaml/dune#7666, @nojb) - Coq language versions less 0.8 are deprecated, and will be removed in an upcoming Dune version. All users are required to migrate to `(coq lang 0.8)` which provides the right semantics for theories that have been globally installed, such as those coming from opam (@ejgallego, @Alizter) - Bump minimum version of the dune language for the melange syntax extension from 3.7 to 3.8 (ocaml/dune#7665, @jchavarri)

anmonteiro added the melange label Dec 1, 2022

anmonteiro force-pushed the anmonteiro/modes-ordered-set-lang branch from 257acfc to 5ed44f1 Compare December 1, 2022 07:08

anmonteiro mentioned this pull request Dec 8, 2022

melange: add runtime_deps field to library stanza #6643

Closed

rgrinberg requested a review from jchavarri December 19, 2022 18:13

jchavarri approved these changes Dec 22, 2022

View reviewed changes

anmonteiro requested a review from rgrinberg January 10, 2023 02:22

rgrinberg added this to the 3.7.0 milestone Jan 29, 2023

rgrinberg modified the milestones: 3.7.0, 3.8.0 Feb 16, 2023

anmonteiro commented Feb 21, 2023

View reviewed changes

anmonteiro force-pushed the anmonteiro/modes-ordered-set-lang branch 2 times, most recently from fec493c to e2f1ba1 Compare February 21, 2023 01:36

anmonteiro added 6 commits February 21, 2023 10:08

refactor(melange): make modes field an Ordered_set_lang instance

7017552

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

refactor: support old parsing

55b1289

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

add changelog entry

e281581

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

refactor: move to Modes.field and refactor

76cb26c

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

move some logic to Mode_conf.Lib.Set

37b3e40

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

rename: Modes.parser -> Modes.decode

00bfd22

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

rgrinberg force-pushed the anmonteiro/modes-ordered-set-lang branch from 35d8a1c to 00bfd22 Compare February 21, 2023 16:08

rgrinberg changed the title ~~refactor(melange): make modes field an Ordered_set_lang instance~~ feature: make modes field an Ordered_set_lang instance Feb 21, 2023

rgrinberg merged commit 24b31d7 into ocaml:main Feb 21, 2023

anmonteiro deleted the anmonteiro/modes-ordered-set-lang branch March 13, 2023 22:52

emillon mentioned this pull request Apr 18, 2023

[new release] dune (15 packages) (3.8.0~alpha1) ocaml/opam-repository#23683

Closed

emillon mentioned this pull request May 23, 2023

[new release] dune (15 packages) (3.8.0) ocaml/opam-repository#23814

Merged

anmonteiro mentioned this pull request Jun 5, 2023

refactor: remove dead code in OSL decoder #7886

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature: make `modes` field an Ordered_set_lang instance #6611

feature: make `modes` field an Ordered_set_lang instance #6611

anmonteiro commented Dec 1, 2022 •

edited

Loading

rgrinberg commented Dec 1, 2022

anmonteiro commented Dec 17, 2022

rgrinberg commented Dec 19, 2022

jchavarri commented Dec 19, 2022

anmonteiro commented Dec 20, 2022

davesnx commented Dec 20, 2022 •

edited

Loading

jchavarri commented Dec 22, 2022

anmonteiro commented Dec 22, 2022

rgrinberg commented Jan 29, 2023

rgrinberg commented Jan 29, 2023

rgrinberg commented Feb 16, 2023

anmonteiro Feb 21, 2023

feature: make modes field an Ordered_set_lang instance #6611

feature: make modes field an Ordered_set_lang instance #6611

Conversation

anmonteiro commented Dec 1, 2022 • edited Loading

rgrinberg commented Dec 1, 2022

anmonteiro commented Dec 17, 2022

rgrinberg commented Dec 19, 2022

jchavarri commented Dec 19, 2022

anmonteiro commented Dec 20, 2022

davesnx commented Dec 20, 2022 • edited Loading

jchavarri commented Dec 22, 2022

anmonteiro commented Dec 22, 2022

rgrinberg commented Jan 29, 2023

rgrinberg commented Jan 29, 2023

rgrinberg commented Feb 16, 2023

anmonteiro Feb 21, 2023

Choose a reason for hiding this comment

feature: make `modes` field an Ordered_set_lang instance #6611

feature: make `modes` field an Ordered_set_lang instance #6611

anmonteiro commented Dec 1, 2022 •

edited

Loading

davesnx commented Dec 20, 2022 •

edited

Loading