Fix bad interaction between menhir and --ignored-promoted-rules (#1917)

Signed-off-by: Jeremie Dimino <[email protected]>
ocaml · Mar 7, 2019 · 9204f6d · 9204f6d
1 parent 6c8874e
commit 9204f6d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -39,6 +39,9 @@
 - Configurator: deprecated `query_expr` and introduced `query_expr_err` which is
   the same but with a better error in case it fails. (#1886, @ejgallego)
 
+- Make sure `(menhir (mode promote) ...)` stanzas are ignored when
+  using `--ignore-promoted-rules` or `-p` (#1917, @diml)
+
 1.7.3 (27/02/2019)
 ------------------
 

diff --git a/src/dune_load.ml b/src/dune_load.ml
@@ -15,7 +15,8 @@ module Dune_file = struct
     let stanzas =
       if ignore_promoted_rules then
         List.filter stanzas ~f:(function
-          | Rule { mode = Promote _; _ } -> false
+          | Rule { mode = Promote _; _ }
+          | Dune_file.Menhir.T { mode = Promote _; _ } -> false
           | _ -> true)
       else
         stanzas