Pretty printing of ocaml files slightly improved.

diff --git a/matita/components/ng_extraction/common.ml b/matita/components/ng_extraction/common.ml
index 57a27e92b58fa29727eb05c2020420c9fc507643..fffc09974da6bdf965a028a93324faf9157e9f13 100644 (file)
--- a/matita/components/ng_extraction/common.ml
+++ b/matita/components/ng_extraction/common.ml
@@ -32,8 +32,6 @@ let pr_binding = function
 
 let fnl () = stras (1000000,"") ++ fnl ()
 
-let fnl2 () = fnl () ++ fnl ()
-
 let space_if = function true -> str " " | false -> mt ()
 
 let is_invalid_id s =

diff --git a/matita/components/ng_extraction/common.mli b/matita/components/ng_extraction/common.mli
index 4bde847ac77e76fdf2b75778d594b253483b7d7d..2cf44e003d93fd4f2b1c4e93883444a4a2070294 100644 (file)
--- a/matita/components/ng_extraction/common.mli
+++ b/matita/components/ng_extraction/common.mli
@@ -19,7 +19,6 @@ open OcamlExtractionTable
     we attach a big virtual size to [fnl] newlines. *)
 
 val fnl : unit -> std_ppcmds
-val fnl2 : unit -> std_ppcmds
 val space_if : bool -> std_ppcmds
 
 val pp_par : bool -> std_ppcmds -> std_ppcmds

diff --git a/matita/components/ng_extraction/ocaml.ml b/matita/components/ng_extraction/ocaml.ml
index a612c58d49be21fe889ae22165c1ee4c79f9faa5..001845e35e046eb449ca8c4554d874c2701be0f5 100644 (file)
--- a/matita/components/ng_extraction/ocaml.ml
+++ b/matita/components/ng_extraction/ocaml.ml
@@ -438,7 +438,7 @@ and pp_fix status par env i (ids,bl) args =
 let pp_val status e typ =
  let status,res = pp_type status false [] typ in
   status,
-  hov 4 (str "(** val " ++ e ++ str " :" ++ spc ()++res++ str " **)") ++ fnl2 ()
+  hov 4 (str "(** val " ++ e ++ str " :" ++ spc ()++res++ str " **)") ++ fnl ()
 
 (*s Pretty-printing of [Dfix] *)
 
@@ -461,7 +461,7 @@ let pp_Dfix status (rv,c,t) =
         let status,res = pp_val status names.(i) t.(i) in
         let status,res2 = pp status false (i+1) in
         status,
-       (if init then mt () else fnl2 ()) ++ res ++
+       (if init then mt () else fnl ()) ++ res ++
        str (if init then "let rec " else "and ") ++ names.(i) ++ def ++ res2
   in pp status true 0
 

diff --git a/matita/components/ng_extraction/ocamlExtraction.ml b/matita/components/ng_extraction/ocamlExtraction.ml
index 0022599a8dd4c503508a7f6ddceeaa025faf9fd0..da7eee5acda96d889b57e25a8ff94dd3f7cb32f9 100644 (file)
--- a/matita/components/ng_extraction/ocamlExtraction.ml
+++ b/matita/components/ng_extraction/ocamlExtraction.ml
@@ -14,7 +14,7 @@ let print_ocaml_of_obj0 status ((_uri,_,_,_,_) as obj) =
    map_status status
     (fun status ml ->
       let status,cmds = Ocaml.pp_decl status ml in
-      print_ppcmds ~in_ml:true status (cmds ++ fnl ());
+      print_ppcmds ~in_ml:true status (cmds ++ fnl () ++ fnl ());
       status,()) res in
   status
  with