Merge pull request ocaml#1409 from voodoos/alert-variant-test

Handle `=` in compiler flags

Author: voodoos

CHANGES.md

@@ -7,6 +7,7 @@ git version
     - locate: look for original source files before looking for preprocessed
       files (#1219 by @ddickstein, fixes #894)
     - fix handlink of ppx's under Windows (#1413)
+    - handle `=` syntax in compiler flags (#1409)
   + test suite
     - make `merlin-wrapper` create a default `.merlin` file  only when there is
       no `dune-project` to let tests use `dune ocaml-merlin` reader. (#1425)

src/utils/marg.ml

@@ -76,9 +76,16 @@ let parse_all ~warning global_spec local_spec =
     match parse_one ~warning global_spec local_spec args global local with
     | Some (args, global, local) -> normal_parsing args global local
     | None -> match args with
-      | arg :: args ->
-        warning ("unknown flag " ^ arg);
-        resume_parsing args global local
+      | arg :: args -> begin
+        (* We split on the first '=' to check if the argument was
+           of the form name=value *)
+        try
+          let name, value = Misc.cut_at arg '=' in
+          normal_parsing (name::value::args) global local
+        with Not_found ->
+          warning ("unknown flag " ^ arg);
+          resume_parsing args global local
+        end
       | [] -> (global, local)
   and resume_parsing args global local =
     let args = match args with

tests/test-dirs/alerts.t/run.t

@@ -35,3 +35,28 @@
     "value": [],
     "notifications": []
   }
+
+  $ cat > .merlin <<EOF
+  > S .
+  > B .
+  > FLG -nopervasives -alert=-deprecated
+  > EOF
+
+  $ $MERLIN single errors -filename main.ml < main.ml
+  {
+    "class": "return",
+    "value": [],
+    "notifications": []
+  }
+
+The compiler accept both
+  $ $OCAMLC -c main.ml
+  File "main.ml", line 2, characters 8-12:
+  2 | let x = sqrt 3.
+              ^^^^
+  Alert deprecated: Lib.sqrt
+  I am deprecated
+
+  $ $OCAMLC -alert -deprecated -c main.ml
+
+  $ $OCAMLC -alert=-deprecated -c main.ml