- LexiconAst merged into GrafiteAst

[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 d68331fecfb1603f9aef86362ed6b0b5605b797b..573fa28c9adbc639b54b6f03c84af5bdd52019c7 100644 (file)
--- a/matita/components/grafite_engine/grafiteTypes.ml
+++ b/matita/components/grafite_engine/grafiteTypes.ml
@@ -37,34 +37,18 @@ class status = fun (b : string) ->
    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 GrafiteParser.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' = 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_status = status end)