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

ocaml.warnerror built-in attribute. 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14753 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Alain Frisch 2014-05-06 16:17:09 +00:00
parent 0736512709
commit 7e2333051a
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
typing/typetexp.ml
View File

@ -88,27 +88,28 @@ let warning_leave_scope () =
let warning_attribute attrs =
let prev_warnings = List.hd !warning_scope in
let process loc txt errflag payload =
match string_of_payload payload with
| Some s ->
if !prev_warnings = None then
prev_warnings := Some (Warnings.backup ());
begin try Warnings.parse_options errflag s
with Arg.Bad _ ->
Location.prerr_warning loc
(Warnings.Attribute_payload
(txt, "Ill-formed list of warnings"))
end
| None ->
Location.prerr_warning loc
(Warnings.Attribute_payload
(txt, "A single string literal is expected"))
in
List.iter
(function
| ({txt = "ocaml.warning"|"warning"; loc}, payload) ->
begin match payload with
| PStr [{pstr_desc=Pstr_eval
({pexp_desc=Pexp_constant(Const_string(s, _))}, _)}] ->
if !prev_warnings = None then
prev_warnings := Some (Warnings.backup ());
begin try Warnings.parse_options false s
with Arg.Bad _ ->
Location.prerr_warning loc
(Warnings.Attribute_payload
("ocaml.warning",
"Ill-formed list of warnings"))
end
| _ ->
Location.prerr_warning loc
(Warnings.Attribute_payload
("ocaml.warning",
"A single string literal is expected"))
end
| ({txt = ("ocaml.warning"|"warning") as txt; loc}, payload) ->
process loc txt false payload
| ({txt = ("ocaml.warnerror"|"warnerror") as txt; loc}, payload) ->
process loc txt true payload
| _ ->
()
)