matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't generate -embed-errors for merlin

This commit is contained in:
Jeremie Dimino 2017-03-07 09:39:14 +00:00
parent c848e6ae97
commit 18e3530c0a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gen_rules.ml
View File

@ -770,7 +770,7 @@ module Gen(P : Params) = struct
Hashtbl.add ppx_drivers ~key ~data:(exe, libs); Hashtbl.add ppx_drivers ~key ~data:(exe, libs);
(exe, libs) (exe, libs)
let specific_args_for_ppx_rewriters ~dir ~lib_name (libs : Lib.t list) = let specific_args_for_ppx_rewriters ~dir ~lib_name ~for_merlin (libs : Lib.t list) =
let uses_inline_test = ref false in let uses_inline_test = ref false in
let uses_inline_bench = ref false in let uses_inline_bench = ref false in
let uses_here = ref false in let uses_here = ref false in
@ -799,7 +799,7 @@ module Gen(P : Params) = struct
; S (if !uses_inline_bench (*&& drop_bench*) ; S (if !uses_inline_bench (*&& drop_bench*)
then [ A "-bench-drop-with-deadcode" ] then [ A "-bench-drop-with-deadcode" ]
else []) else [])
; S (if !uses_ppx_driver ; S (if !uses_ppx_driver && not for_merlin
then [ A "-embed-errors"; A "false" ] then [ A "-embed-errors"; A "false" ]
else []) else [])
] ]
@ -840,7 +840,7 @@ module Gen(P : Params) = struct
>>> >>>
Build.run Build.run
(Dep ppx_exe) (Dep ppx_exe)
[ Dyn (specific_args_for_ppx_rewriters ~dir ~lib_name) [ Dyn (specific_args_for_ppx_rewriters ~dir ~lib_name ~for_merlin:false)
; As flags ; As flags
; A "--dump-ast" ; A "--dump-ast"
; A "-o"; Target dst ; A "-o"; Target dst
@ -905,7 +905,7 @@ module Gen(P : Params) = struct
libs >>^ fun libs -> libs >>^ fun libs ->
let specific_flags, _ = let specific_flags, _ =
Arg_spec.expand ~dir:src_dir Arg_spec.expand ~dir:src_dir
[specific_args_for_ppx_rewriters ~dir ~lib_name:libname libs] [specific_args_for_ppx_rewriters ~dir ~lib_name:libname libs ~for_merlin:true]
() ()
in in
let command = let command =