Skip to content

Commit

Permalink
fix: parsing of <= operator
Browse files Browse the repository at this point in the history
Signed-off-by: Corentin Leruth <[email protected]>
  • Loading branch information
tatchi authored and rgrinberg committed Jan 28, 2023
1 parent 786ecf4 commit c556899
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 12 deletions.
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/dune_rules/blang.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1 @@
$ dune build
File "dune", line 20, characters 12-22:
20 | (libraries lte414caml))
^^^^^^^^^^
Error: Library "lte414caml" in _build/default is hidden (unsatisfied
'enabled_if').
-> required by _build/default/.main.eobjs/byte/dune__exe__Main.cmi
-> required by _build/default/.main.eobjs/native/dune__exe__Main.cmx
-> required by _build/default/main.exe
-> required by alias all
-> required by alias default
[1]

0 comments on commit c556899

Please sign in to comment.