(Part of previous two commits)

[helm.git] / matita / components / grafite_engine / grafiteTypes.ml

diff --git a/matita/components/grafite_engine/grafiteTypes.ml b/matita/components/grafite_engine/grafiteTypes.ml
index 7f264d6fa0a623479e6eed5d0b65bdf8139b295f..27a5cb61ef179e731572db093c7db67d999ac495 100644 (file)
--- a/matita/components/grafite_engine/grafiteTypes.ml
+++ b/matita/components/grafite_engine/grafiteTypes.ml
@@ -31,52 +31,25 @@ exception Command_error of string
 
 let command_error msg = raise (Command_error msg)
 
-class status = fun (b : string) ->
+class virtual status = fun (b : string) ->
  let fake_obj =
   NUri.uri_of_string "cic:/matita/dummy.decl",0,[],[],
    NCic.Constant([],"",None,NCic.Implicit `Closed,(`Provided,`Theorem,`Regular))
  in
   object
-   val moo_content_rev = ([] : GrafiteMarshal.moo)
-   val objects = ([] : UriManager.uri list)
+   (* Warning: #stack and #obj are meaningful iff #ng_mode is `ProofMode *)
+   inherit ([Continuationals.Stack.t] NTacStatus.status fake_obj (Continuationals.Stack.empty))
+   inherit NCicLibrary.dumpable_status
+   inherit NCicLibrary.status
+   inherit NCicExtraction.status
+   inherit GrafiteParser.status
+   inherit TermContentPres.status
    val baseuri = b
    val ng_mode = (`CommandMode : [`CommandMode | `ProofMode])
-   method moo_content_rev = moo_content_rev
-   method set_moo_content_rev v = {< moo_content_rev = v >}
-   method objects = objects
-   method set_objects v = {< objects = v >}
    method baseuri = baseuri
    method set_baseuri v = {< baseuri = v >}
    method ng_mode = ng_mode;
    method set_ng_mode v = {< ng_mode = v >}
-   (* Warning: #stack and #obj are meaningful iff #ng_mode is `ProofMode *)
-   inherit ([Continuationals.Stack.t] NTacStatus.status fake_obj (Continuationals.Stack.empty))
  end
 
-let add_moo_content cmds status =
-  let content = status#moo_content_rev in
-  let content' =
-    List.fold_right
-      (fun cmd acc ->
-(*         prerr_endline ("adding to moo command: " ^ GrafiteAstPp.pp_command cmd); *)
-        match cmd with
-        | GrafiteAst.Default _ 
-        | GrafiteAst.Index _
-        | GrafiteAst.Coercion _ ->
-            if List.mem cmd content then acc
-            else cmd :: acc
-        | _ -> cmd :: acc)
-      cmds content
-  in
-(*   prerr_endline ("new moo content: " ^ String.concat " " (List.map
-    GrafiteAstPp.pp_command content')); *)
-   status#set_moo_content_rev content'
-
-let dump_status status = 
-  HLog.message "status.aliases:\n";
-  HLog.message "status.proof_status:"; 
-  HLog.message "status.options\n";
-  HLog.message "status.coercions\n";
-  HLog.message "status.objects:\n";
-  List.iter 
-    (fun u -> HLog.message (UriManager.string_of_uri u)) status#objects 
+module Serializer = NCicLibrary.Serializer(struct type dumpable_s = status end)