snapshot

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

diff --git a/helm/matita/matitaTypes.ml b/helm/matita/matitaTypes.ml
index 70f912ae08fd586abe7fad584cdcfb4845010886..2bc5e726bdaeaca73e7d51d5f77cad52e6c52277 100644 (file)
--- a/helm/matita/matitaTypes.ml
+++ b/helm/matita/matitaTypes.ml
@@ -78,13 +78,23 @@ class type disambiguator =
   end
 
 type hist_metadata =
-  Cic.annobj *
-  (Cic.id, Cic.term) Hashtbl.t *
-  (Cic.id, Cic.id option) Hashtbl.t *
-  (Cic.id, string) Hashtbl.t *
-  (Cic.id, Cic2acic.anntypes) Hashtbl.t *
-  (Cic.id, Cic.conjecture) Hashtbl.t *
-  (Cic.id, Cic.hypothesis) Hashtbl.t
+  (                                         (** proof object part *)
+    (Cic.annobj *                             (** annotated object    *)
+    (Cic.id, Cic.term) Hashtbl.t *            (** ids_to_terms        *)
+    (Cic.id, Cic.id option) Hashtbl.t *       (** ids_to_father_ids   *)
+    (Cic.id, string) Hashtbl.t *              (** ids_to_inner_sorts  *)
+    (Cic.id, Cic2acic.anntypes) Hashtbl.t *   (** ids_to_inner_types  *)
+    (Cic.id, Cic.conjecture) Hashtbl.t *      (** ids_to_conjectures  *)
+    (Cic.id, Cic.hypothesis) Hashtbl.t)       (** ids_to_hypotheses   *)
+    *                                       (** sequents part *)
+    ((int *                                   (** sequent (meta) index *)
+      (Cic.annconjecture *                    (** annotated conjecture *)
+      (Cic.id, Cic.term) Hashtbl.t *          (** ids_to_terms *)
+      (Cic.id, Cic.id option) Hashtbl.t *     (** ids_to_father_ids *)
+      (Cic.id, string) Hashtbl.t *            (** ids_to_inner_sorts *)
+      (Cic.id, Cic.hypothesis) Hashtbl.t))    (** ids_to_hypotheses *)
+        list)
+  )
 
 class type proof =
   object
@@ -98,7 +108,7 @@ class type proof =
 
 type proof_handler =
   { get_proof: unit -> proof; (* return current proof or fail *)
-    set_proof: proof option -> unit;  (* set a proof option as current proof *)
+    abort_proof: unit -> unit;(* abort current proof, cleaning up garbage *)
     has_proof: unit -> bool;  (* check if a current proof is available or not *)
     new_proof: proof -> unit; (* as a set_proof but takes care also to register
                               observers *)
@@ -125,7 +135,6 @@ type mml_of_cic_object =
   (string, string) Hashtbl.t -> (string, Cic2acic.anntypes) Hashtbl.t ->
     Gdome.document
 
-  (** TODO Zack to be reviewed and unified with proof_viewer above *)
 class type sequent_viewer =
   object
     inherit GMathViewAux.multi_selection_math_view
@@ -139,15 +148,13 @@ class type sequent_viewer =
     method get_selected_hypotheses: Cic.hypothesis list
 
       (** load a sequent and render it into parent widget *)
-    method load_sequent: Cic.metasenv -> Cic.conjecture -> unit
+    method load_sequent: Gdome.document -> hist_metadata -> int -> unit
   end
 
 class type proof_viewer =
   object
     inherit GMathViewAux.single_selection_math_view
 
-      (** @return the annotated cic term and the ids_to_inner_types and
-      * ids_to_inner_sorts maps *)
     method load_proof: Gdome.document -> hist_metadata -> unit
 
   end