Skip to content

refactor(menhir): share rule mode expansion #67

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

Draft
anmonteiro wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor(menhir): share rule mode expansion #67

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
18 changes: 8 additions & 10 deletions src/dune_rules/menhir/menhir_rules.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@ module Run (P : PARAMS) = struct
(Expander.expand_and_eval_set expander flags ~standard:env.Menhir_env.flags)
;;

let expand_rule_mode mode =
let open Memo.O in
let* expander = expander in
Rule_mode_expand.expand_path ~expander ~dir mode
;;

(* ------------------------------------------------------------------------ *)

(* If there is no [base] clause, then a stanza that mentions several modules
Expand Down Expand Up @@ -307,11 +313,7 @@ module Run (P : PARAMS) = struct
Module_compilation.ocamlc_i ~deps cctx mock_module ~output:(inferred_mli base)
in
let* explain_flags = explain_flags base stanza
and* mode =
let sctx = Compilation_context.super_context cctx in
let* expander = Super_context.expander sctx ~dir in
Rule_mode_expand.expand_path ~expander ~dir stanza.mode
in
and* mode = expand_rule_mode stanza.mode in
(* 3. A second invocation of Menhir reads the inferred [.mli] file. *)
menhir
[ Command.Args.dyn expanded_flags
Expand All @@ -335,11 +337,7 @@ module Run (P : PARAMS) = struct
let open Memo.O in
let* expanded_flags = expand_flags stanza.flags
and* explain_flags = explain_flags base stanza
and* mode =
let sctx = Compilation_context.super_context cctx in
let* expander = Super_context.expander sctx ~dir in
Rule_mode_expand.expand_path ~expander ~dir stanza.mode
in
and* mode = expand_rule_mode stanza.mode in
menhir
[ Command.Args.dyn expanded_flags
; S explain_flags
Expand Down
Loading