diff --git a/CHANGES.md b/CHANGES.md index 3985b9269ea..f0f298f7c00 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,9 @@ Unreleased ---------- +- Fix parsing of the `<=` operator in *blang* expressions of `dune` files. + Previously, the operator would be interpreted as `,`. (#6928, @tatchi) + - Fix `--trace-file` output. Dune now emits a single *complete* event for every executed process. Unterminated *async* events are no longer written. (#6892, @rgrinberg) diff --git a/src/dune_rules/blang.ml b/src/dune_rules/blang.ml index d4fd08273e6..0c160c2e381 100644 --- a/src/dune_rules/blang.ml +++ b/src/dune_rules/blang.ml @@ -68,7 +68,7 @@ let rec to_dyn = [ Op.to_dyn o; String_with_vars.to_dyn s1; String_with_vars.to_dyn s2 ] let ops = - [ ("=", Op.Eq); (">=", Gte); ("<=", Lt); (">", Gt); ("<", Lt); ("<>", Neq) ] + [ ("=", Op.Eq); (">=", Gte); ("<=", Lte); (">", Gt); ("<", Lt); ("<>", Neq) ] let decode_gen decode_string = let open Dune_lang.Decoder in diff --git a/test/blackbox-tests/test-cases/enabled_if/eif-ocaml_version_lte.t/dune b/test/blackbox-tests/test-cases/enabled_if/eif-ocaml_version_lte.t/dune new file mode 100644 index 00000000000..72d30f9dd07 --- /dev/null +++ b/test/blackbox-tests/test-cases/enabled_if/eif-ocaml_version_lte.t/dune @@ -0,0 +1,20 @@ +(library + (name lte414caml) + (modules lte414caml) + (enabled_if + (<= %{ocaml_version} %{ocaml_version}))) + +(rule + (with-stdout-to + lte414caml.ml + (echo ""))) + +(rule + (with-stdout-to + main.ml + (echo ""))) + +(executable + (name main) + (modules main) + (libraries lte414caml)) diff --git a/test/blackbox-tests/test-cases/enabled_if/eif-ocaml_version_lte.t/dune-project b/test/blackbox-tests/test-cases/enabled_if/eif-ocaml_version_lte.t/dune-project new file mode 100644 index 00000000000..37f995d6492 --- /dev/null +++ b/test/blackbox-tests/test-cases/enabled_if/eif-ocaml_version_lte.t/dune-project @@ -0,0 +1 @@ +(lang dune 3.0) diff --git a/test/blackbox-tests/test-cases/enabled_if/eif-ocaml_version_lte.t/run.t b/test/blackbox-tests/test-cases/enabled_if/eif-ocaml_version_lte.t/run.t new file mode 100644 index 00000000000..4d24f7e3614 --- /dev/null +++ b/test/blackbox-tests/test-cases/enabled_if/eif-ocaml_version_lte.t/run.t @@ -0,0 +1 @@ + $ dune build