Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tools/caml-tex printing of sub message locations 

List printer fields explicitly to avoid the same problem from happening again
master
Jules Aguillon 2019-03-11 12:28:54 +01:00
parent d926fdb9f8
commit a241675676
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
testsuite/tests/tool-caml-tex/redirections.reference
View File

@ -18,9 +18,10 @@
\camlexample{toplevel}
\caml\camlinput\?[@@@warning "+A"];;
\endcamlinput\endcaml
\caml\camlinput\?1 + \<2.\> ;;
\caml\camlinput\?1 \<+\> \<2.\> ;;
\endcamlinput\camlerror\:Error: This expression has type float but an expression was expected of type
\: int
\: Hint: Did you mean to use \textasciigrave\-+.\textquotesingle\-?
\endcamlerror\endcaml
\caml\camlinput\?let f \<x\> = () ;;
\endcamlinput\camlwarn\:Warning 27: unused variable x.

6
tools/caml_tex.ml
View File

@ -132,10 +132,12 @@ module Toplevel = struct
if startchar >= 0 then
locs := (startchar, endchar) :: !locs
(** Record the main location instead of printing it *)
(** Record locations in the main error and suberrors without printing them *)
let printer_register_locs =
{ Location.batch_mode_printer with
pp_main_loc = (fun _ _ _ loc -> register_loc loc) }
pp_main_loc = (fun _ _ _ loc -> register_loc loc);
pp_submsg_loc = (fun _ _ _ loc -> register_loc loc);
}
(** Capture warnings and keep them in a list *)
let warnings = ref []