feat(dune): support + prefixes for PPX CLI flags

Signed-off-by: Antonio Nuno Monteiro <[email protected]>
ocaml · Dec 21, 2024 · e85775d · e85775d
1 parent d999826
commit e85775d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/dune_rules/preprocess.ml b/src/dune_rules/preprocess.ml
@@ -12,9 +12,12 @@ module Pps_and_flags = struct
     and+ syntax_version = Dune_lang.Syntax.get_exn Stanza.syntax in
     let pps, more_flags =
       List.partition_map l ~f:(fun s ->
-        match String_with_vars.is_prefix ~prefix:"-" s with
-        | Yes -> Right s
-        | No | Unknown _ ->
+        match
+          ( String_with_vars.is_prefix ~prefix:"-" s
+          , String_with_vars.is_prefix ~prefix:"+" s )
+        with
+        | Yes, _ | _, Yes -> Right s
+        | (No | Unknown _), _ ->
           let loc = String_with_vars.loc s in
           (match String_with_vars.text_only s with
            | None ->

diff --git a/test/blackbox-tests/test-cases/ppx/ppx-flags-plus.t b/test/blackbox-tests/test-cases/ppx/ppx-flags-plus.t
@@ -33,10 +33,3 @@ Create ppx1 and exe:
   $ touch the_exe.ml
 
   $ dune build ./the_exe.exe
-  File "dune", line 9, characters 30-35:
-  9 |  (preprocess (pps ppx --alert ++foo)))
-                                    ^^^^^
-  Error: Library "++foo" not found.
-  -> required by _build/default/.merlin-conf/exe-the_exe
-  -> required by _build/default/the_exe.exe
-  [1]