some improvements

[helm.git] / helm / software / matita / matitac.ml

diff --git a/helm/software/matita/matitac.ml b/helm/software/matita/matitac.ml
index be6546e8d237437e803f29558289be92929e1c8c..fc1a95e1606aba56cb321cc95a6b6d3289a63cb1 100644 (file)
--- a/helm/software/matita/matitac.ml
+++ b/helm/software/matita/matitac.ml
@@ -26,6 +26,8 @@
 (* $Id$ *)
 
 module G = GrafiteAst
+module L = LexiconAst
+module H = HExtlib
 
 (* from transcript *)
 
@@ -57,22 +59,27 @@ let pp_ast_statement =
 (**)
 
 let dump f =
+   let floc = H.dummy_floc in
+   let nl_ast = G.Comment (floc, G.Note (floc, "")) in
    let och = open_out f in
    let atexit () = close_out och in
+   let nl () =  output_string och (pp_ast_statement nl_ast) in
    let rt_base_dir = Filename.dirname Sys.argv.(0) in
    let path = Filename.concat rt_base_dir "matita.ma.templ" in
    let lines = 14 in
    out_preamble och (path, lines);
-   let grafite_parser_cb ast =
-      output_string och (LexiconAstPp.pp_command ast)
+   let grafite_parser_cb fname = 
+      let ast = G.Executable (floc, G.Command (floc, G.Include (floc, fname))) in
+      output_string och (pp_ast_statement ast); nl (); nl ()
    in
    let matita_engine_cb = function
-      | G.Executable (_, G.Macro (_, G.Inline _)) -> ()
-      | ast                                                 ->
-         output_string och (pp_ast_statement ast)
+      | G.Executable (_, G.Macro (_, G.Inline _)) 
+      | G.Executable (_, G.Command (_, G.Include _)) -> ()
+      | ast                                          ->
+         output_string och (pp_ast_statement ast); nl (); nl ()
    in
    let matitac_lib_cb = output_string och in
-(*   GrafiteParser.set_callback grafite_parser_cb; *)
+   GrafiteParser.set_callback grafite_parser_cb;
    MatitaEngine.set_callback matita_engine_cb;
    MatitacLib.set_callback matitac_lib_cb;
    at_exit atexit