Huge reorganization of matita and ocaml.

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

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 0b457dd0ce1bd1cb6f2c872c14ae3d832e9be0b6..29df1c3d189dc622bf68628482eaf9348a2a6a36 100644 (file)
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -73,10 +73,10 @@ let _ =
   cic_math_view#set_href_callback
     (Some (fun uri -> (MatitaMathView.cicBrowser ())#load
       (`Uri (UriManager.uri_of_string uri))));
-  let browser_observer _ = MatitaMathView.refresh_all_browsers () in
-  let sequents_observer status =
+  let browser_observer _ _ = MatitaMathView.refresh_all_browsers () in
+  let sequents_observer _ grafite_status =
     sequents_viewer#reset;
-    match status.proof_status with
+    match grafite_status.proof_status with
     | Incomplete_proof ({ stack = stack } as incomplete_proof) ->
         sequents_viewer#load_sequents incomplete_proof;
         (try
@@ -137,8 +137,8 @@ let _ =
     addDebugItem "print top-level grammar entries"
       CicNotationParser.print_l2_pattern;
     addDebugItem "dump moo to stderr" (fun _ ->
-      let status = (MatitaScript.current ())#status in
-      let moo = status.moo_content_rev in
+      let grafite_status = (MatitaScript.current ())#grafite_status in
+      let moo = grafite_status.moo_content_rev in
       List.iter
         (fun cmd ->
           prerr_endline (GrafiteAstPp.pp_command ~obj_pp:(fun _ -> assert false)
@@ -150,7 +150,7 @@ let _ =
           (List.map (fun (g, _, _) -> string_of_int g)
             (MatitaScript.current ())#proofMetasenv));
         prerr_endline ("stack: " ^ Continuationals.Stack.pp
-          (GrafiteTypes.get_stack (MatitaScript.current ())#status)));
+          (GrafiteTypes.get_stack (MatitaScript.current ())#grafite_status)));
 (*     addDebugItem "ask record choice"
       (fun _ ->
         HLog.debug (string_of_int