Use of standard OCaml syntax

[helm.git] / matita / components / ng_library / nCicLibrary.mli

diff --git a/matita/components/ng_library/nCicLibrary.mli b/matita/components/ng_library/nCicLibrary.mli
index 14a0685b4a6a74633a13e8abc7cb093e89fc8887..14090cdcb9614d0b65ff01fd676d37c24bba87dc 100644 (file)
--- a/matita/components/ng_library/nCicLibrary.mli
+++ b/matita/components/ng_library/nCicLibrary.mli
@@ -16,22 +16,28 @@ exception IncludedFileNotCompiled of string * string
 
 type timestamp
 
-class status :
+class virtual status :
  object ('self)
+  inherit NCic.status
   method timestamp: timestamp
   method set_timestamp: timestamp -> 'self
+  (*CSC: bug here, we are not copying the NCicExtraction and OCamlExtraction part of the status *)
  end
 
 (* it also checks it and add it to the environment *)
-val add_obj: #status as 'status -> NCic.obj -> 'status
+val add_obj: (#status as 'status) -> NCic.obj -> 'status
 val add_constraint: 
-  #status as 'status -> NCic.universe -> NCic.universe -> 'status
+  (#status as 'status) -> acyclic:bool ->
+  NCic.universe -> NCic.universe -> 'status
 val aliases_of: NUri.uri -> NReference.reference list
 val resolve: string -> NReference.reference list
+(*
 (* warning: get_obj may raise (NCicEnvironment.ObjectNotFoud l) *)
-val get_obj: NUri.uri -> NCic.obj (* changes the current timestamp *)
+val get_obj: #NCic.status -> NUri.uri -> NCic.obj (* changes the current timestamp *)
+*)
 
 val time_travel: #status -> unit
+val replace: #status -> unit
 
 val init: unit -> unit
 
@@ -50,8 +56,8 @@ class dumpable_status :
   method set_dumpable_status: #g_dumpable_status -> 'self
  end
 
-val get_already_included: #dumpable_status -> NUri.uri list
-val dump_obj: #dumpable_status as 'status -> obj -> 'status
+val get_transitively_included: #dumpable_status -> NUri.uri list
+val dump_obj: (#dumpable_status as 'status) -> obj -> 'status
 
 module type SerializerType =
  sig
@@ -60,7 +66,7 @@ module type SerializerType =
   type 'a register_type =
    'a ->
     refresh_uri_in_universe:(NCic.universe -> NCic.universe) ->
-    refresh_uri_in_term:(NCic.term -> NCic.term) ->
+    refresh_uri_in_term:(NCic.status -> NCic.term -> NCic.term) ->
     refresh_uri_in_reference:(NReference.reference -> NReference.reference) ->
     alias_only:bool ->
      dumpable_status -> dumpable_status
@@ -73,7 +79,7 @@ module type SerializerType =
   val dependencies_of: baseuri:NUri.uri -> string list
  end
 
-module Serializer(D: sig type dumpable_s val get: dumpable_s -> dumpable_status  val set: dumpable_s -> dumpable_status -> dumpable_s end) :
+module Serializer(D: sig type dumpable_s = private #dumpable_status end) :
   SerializerType with type dumpable_status = D.dumpable_s
 
 val refresh_uri: NUri.uri -> NUri.uri