Big commit and major code clean-up:

[helm.git] / helm / ocaml / cic_disambiguation / disambiguate.mli

diff --git a/helm/ocaml/cic_disambiguation/disambiguate.mli b/helm/ocaml/cic_disambiguation/disambiguate.mli
index b659b38ffac13a4828ac69c8bc76364740d1c39f..ca33fa4226db2cdd4c667b1090692eb43634faa6 100644 (file)
--- a/helm/ocaml/cic_disambiguation/disambiguate.mli
+++ b/helm/ocaml/cic_disambiguation/disambiguate.mli
@@ -23,16 +23,15 @@
  * http://helm.cs.unibo.it/
  *)
 
-open DisambiguateTypes
-
 (** {2 Disambiguation interface} *)
 
 exception NoWellTypedInterpretation
+exception PathNotWellFormed
+
+val interpretate_path :
+ context:Cic.name list -> env:DisambiguateTypes.environment -> CicAst.term ->
+  Cic.term
 
-val interpretate:   
-    context:Cic.name list ->
-    env:DisambiguateTypes.environment -> 
-    CicAst.term -> Cic.term
 
 module type Disambiguator =
 sig
@@ -41,15 +40,25 @@ sig
     context:Cic.context ->
     metasenv:Cic.metasenv ->
     ?initial_ugraph:CicUniv.universe_graph -> 
-    aliases:environment ->  (* previous interpretation status *)
+    aliases:DisambiguateTypes.environment ->(* previous interpretation status *)
     CicAst.term ->
-    (environment *                   (* new interpretation status *)
+    (DisambiguateTypes.environment * (* new interpretation status *)
      Cic.metasenv *                  (* new metasenv *)
-     Cic.term*
+     Cic.term *
      CicUniv.universe_graph) list    (* disambiguated term *)
+
+  val disambiguate_obj :
+    dbd:Mysql.dbd ->
+    aliases:DisambiguateTypes.environment ->(* previous interpretation status *)
+    uri:UriManager.uri option ->     (* required only for inductive types *)
+    TacticAst.obj ->
+    (DisambiguateTypes.environment * (* new interpretation status *)
+     Cic.metasenv *                  (* new metasenv *)
+     Cic.obj *
+     CicUniv.universe_graph) list    (* disambiguated obj *)
 end
 
-module Make (C : Callbacks) : Disambiguator
+module Make (C : DisambiguateTypes.Callbacks) : Disambiguator
 
 module Trivial:
 sig
@@ -63,11 +72,10 @@ sig
     ?context:Cic.context ->
     ?metasenv:Cic.metasenv ->
     ?initial_ugraph:CicUniv.universe_graph -> 
-    ?aliases:environment ->         (* previous interpretation status *)
+    ?aliases:DisambiguateTypes.environment ->(* previous interpretation status*)
     string ->
-    (environment *                  (* new interpretation status *)
+    (DisambiguateTypes.environment * (* new interpretation status *)
      Cic.metasenv *                 (* new metasenv *)
      Cic.term *
      CicUniv.universe_graph) list   (* disambiguated term *)
 end
-