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

Fix PR#7538

master
Leo White 2020-06-12 15:25:13 +01:00
parent cfb1d66387
commit fdbb4e201e
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lambda/translmod.ml
View File

@ -666,7 +666,11 @@ and transl_structure ~scopes loc fields cc rootpath final_env = function
in
Llet(pure_module mb.mb_expr, Pgenval, id, module_body, body), size
end
| Tstr_module {mb_presence=Mp_absent} ->
| Tstr_module ({mb_presence=Mp_absent} as mb) ->
List.iter (Translattribute.check_attribute_on_module mb.mb_expr)
mb.mb_attributes;
List.iter (Translattribute.check_attribute_on_module mb.mb_expr)
mb.mb_expr.mod_attributes;
transl_structure ~scopes loc fields cc rootpath final_env rem
| Tstr_recmodule bindings ->
let ext_fields =
@ -1120,7 +1124,11 @@ let transl_store_structure ~scopes glob map prims aliases str =
transl_store ~scopes rootpath
(add_ident true id subst)
cont rem))
| Tstr_module {mb_presence=Mp_absent} ->
| Tstr_module ({mb_presence=Mp_absent} as mb) ->
List.iter (Translattribute.check_attribute_on_module mb.mb_expr)
mb.mb_attributes;
List.iter (Translattribute.check_attribute_on_module mb.mb_expr)
mb.mb_expr.mod_attributes;
transl_store ~scopes rootpath subst cont rem
| Tstr_recmodule bindings ->
let ids = List.filter_map (fun mb -> mb.mb_id) bindings in
@ -1539,8 +1547,13 @@ let transl_toplevel_item ~scopes item =
transl_module ~scopes Tcoerce_none None od.open_expr,
set_idents 0 ids)
end
| Tstr_module ({mb_presence=Mp_absent} as mb) ->
List.iter (Translattribute.check_attribute_on_module mb.mb_expr)
mb.mb_attributes;
List.iter (Translattribute.check_attribute_on_module mb.mb_expr)
mb.mb_expr.mod_attributes;
lambda_unit
| Tstr_modtype _
| Tstr_module {mb_presence=Mp_absent}
| Tstr_type _
| Tstr_class_type _
| Tstr_attribute _ ->

16
testsuite/tests/warnings/w53.compilers.reference
View File

@ -50,3 +50,19 @@ File "w53.ml", line 41, characters 17-29:
41 | module G' = (A [@ocaml.inline])(struct end) (* rejected *)
^^^^^^^^^^^^
Warning 53 [misplaced-attribute]: the "ocaml.inline" attribute cannot appear in this context
File "w53.ml", line 45, characters 22-29:
45 | module I = Set.Make [@inlined]
^^^^^^^
Warning 53 [misplaced-attribute]: the "inlined" attribute cannot appear in this context
File "w53.ml", line 46, characters 23-36:
46 | module I' = Set.Make [@ocaml.inlined]
^^^^^^^^^^^^^
Warning 53 [misplaced-attribute]: the "ocaml.inlined" attribute cannot appear in this context
File "w53.ml", line 48, characters 23-30:
48 | module J = Set.Make [@@inlined]
^^^^^^^
Warning 53 [misplaced-attribute]: the "inlined" attribute cannot appear in this context
File "w53.ml", line 49, characters 24-37:
49 | module J' = Set.Make [@@ocaml.inlined]
^^^^^^^^^^^^^
Warning 53 [misplaced-attribute]: the "ocaml.inlined" attribute cannot appear in this context