Merge tag 'upstream/8.5_beta2+dfsg' into test

Upstream version 8.5~beta2+dfsg

1 files changed, 13 insertions, 2 deletions

diff --git a/plugins/extraction/ocaml.ml b/plugins/extraction/ocaml.ml
index 30ac3d3f..8c482b4b 100644
--- a/plugins/extraction/ocaml.ml
+++ b/plugins/extraction/ocaml.ml
@@ -634,7 +634,12 @@ and pp_module_type params = function
       str "functor (" ++ name ++ str ":" ++ typ ++ str ") ->" ++ fnl () ++ def
   | MTsig (mp, sign) ->
       push_visible mp params;
-      let l = List.map pp_specif sign in
+      let try_pp_specif l x =
+	try pp_specif x :: l with Failure "empty phrase" -> l
+      in
+      (* We cannot use fold_right here due to side effects in pp_specif *)
+      let l = List.fold_left try_pp_specif [] sign in
+      let l = List.rev l in
       pop_visible ();
       str "sig " ++ fnl () ++
       v 1 (str " " ++ prlist_with_sep fnl2 identity l) ++
@@ -707,7 +712,12 @@ and pp_module_expr params = function
       str "functor (" ++ name ++ str ":" ++ typ ++ str ") ->" ++ fnl () ++ def
   | MEstruct (mp, sel) ->
       push_visible mp params;
-      let l = List.map pp_structure_elem sel in
+      let try_pp_structure_elem l x =
+	try pp_structure_elem x :: l with Failure "empty phrase" -> l
+      in
+      (* We cannot use fold_right here due to side effects in pp_structure_elem *)
+      let l = List.fold_left try_pp_structure_elem [] sel in
+      let l = List.rev l in
       pop_visible ();
       str "struct " ++ fnl () ++
       v 1 (str " " ++ prlist_with_sep fnl2 identity l) ++
@@ -736,6 +746,7 @@ let pp_decl d = try pp_decl d with Failure "empty phrase" -> mt ()
 let ocaml_descr = {
   keywords = keywords;
   file_suffix = ".ml";
+  file_naming = file_of_modfile;
   preamble = preamble;
   pp_struct = pp_struct;
   sig_suffix = Some ".mli";