8000 fix: stop using slang parser in regular dune files by gridbugs · Pull Request #9530 · ocaml/dune · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: stop using slang parser in regular dune files #9530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 19, 2023
Merged

fix: stop using slang parser in regular dune files #9530

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 26 additions & 10 deletions src/dune_lang/action.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,15 +258,7 @@ let sw = String_with_vars.decode

let cstrs_dune_file t =
let open Decoder in
[ ( "run"
, let+ args =
(* Although a single [Slang.t] evaluates to a list of strings, individual
terms of the command are represented by individual [Slang.t]s, hence
the [repeat] below. *)
repeat Slang.decode
in
Run args )
; "with-accepted-exit-codes", decode_with_accepted_exit_codes t
[ "with-accepted-exit-codes", decode_with_accepted_exit_codes t
; ( "dynamic-run"
, Syntax.since Action_plugin.syntax (0, 1)
>>> let+ prog = sw
Expand Down Expand Up @@ -361,7 +353,23 @@ let cstrs_dune_file t =
]
;;

let decode_dune_file = Decoder.fix @@ fun t -> Decoder.sum (cstrs_dune_file t)
let decode_dune_file =
let dune_file_specific =
let open Decoder in
[ ( "run"
, (* In regular dune files the "run" action is parsed as a command and
argument list rather than with the slang dsl parser which is still
experimental. *)
let+ prog = sw
and+ args = repeat sw in
let slang =
Slang.Literal prog :: List.map args ~f:(fun arg -> Slang.Literal arg)
in
Run slang )
]
in
Decoder.fix @@ fun t -> Decoder.sum (cstrs_dune_file t @ dune_file_specific)
;;

let decode_pkg =
let cstrs_pkg t =
Expand All @@ -385,6 +393,14 @@ let decode_pkg =
>>> let+ condition = Slang.decode_blang
and+ action = t in
When (condition, action) )
; ( "run"
, let+ args =
(* Although a single [Slang.t] evaluates to a list of strings, individual
terms of the command are represented by individual [Slang.t]s, hence
the [repeat] below. *)
repeat Slang.decode
in
Run args )
]
in
Decoder.fix @@ fun t -> Decoder.sum (cstrs_dune_file t @ cstrs_pkg t)
Expand Down
0