X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matitaB%2Fcomponents%2Fng_disambiguation%2FgrafiteDisambiguate.mli;h=c9735dbf9d576c295ca208a9b1ee137cd0d50a39;hb=070bda8035e9ae0d3bfe69110d184bb82183cf46;hp=c75cfb3a53bdeee1871d9c5997420ca2dfee01e2;hpb=a2412e41cda18a25d780ae631ee02d6ae05c52b1;p=helm.git

diff --git a/matitaB/components/ng_disambiguation/grafiteDisambiguate.mli b/matitaB/components/ng_disambiguation/grafiteDisambiguate.mli
index c75cfb3a5..c9735dbf9 100644
--- a/matitaB/components/ng_disambiguation/grafiteDisambiguate.mli
+++ b/matitaB/components/ng_disambiguation/grafiteDisambiguate.mli
@@ -28,53 +28,65 @@ type db
 class type g_status =
  object
   inherit Interpretations.g_status
+  inherit NCicLibrary.g_status
   method disambiguate_db: db
  end
 
 class virtual status :
+  string option ->
  object ('self)
   inherit g_status
   inherit Interpretations.status
+  inherit NCicLibrary.status
   method set_disambiguate_db: db -> 'self
+  method reset_disambiguate_db: unit -> 'self
   method set_disambiguate_status: #g_status -> 'self
  end
 
-val eval_with_new_aliases:
+(* val eval_with_new_aliases:
  #status as 'status -> ('status -> 'a) ->
-  (DisambiguateTypes.domain_item * GrafiteAst.alias_spec) list * 'a
+  ((Stdpp.location * DisambiguateTypes.domain_item) * GrafiteAst.alias_spec) list * 'a
+*)
 
-val set_proof_aliases:
+val get_interpr : db -> GrafiteAst.alias_spec DisambiguateTypes.InterprEnv.t 
+
+val add_to_interpr:
+ #status as 'status ->
+  (Stdpp.location * GrafiteAst.alias_spec) list -> 'status 
+
+val add_to_disambiguation_univ:
  #status as 'status ->
-  implicit_aliases:bool -> (* implicit ones are made explicit *)
-  GrafiteAst.inclusion_mode ->
-  (DisambiguateTypes.domain_item * GrafiteAst.alias_spec) list -> 'status
+  (DisambiguateTypes.domain_item * GrafiteAst.alias_spec) list -> 'status 
 
 val aliases_for_objs:
- #NCic.status -> NUri.uri list ->
+ #NCicLibrary.status -> NUri.uri list ->
   (DisambiguateTypes.domain_item * GrafiteAst.alias_spec) list
 
 (* args: print function, message (may be empty), status *) 
 val dump_aliases: (string -> unit) -> string -> #status -> unit
 
+(* reports the first source of ambiguity and its possible interpretations *)
+exception Ambiguous_input of (Stdpp.location * GrafiteAst.alias_spec list)
+
 exception BaseUriNotSetYet
 
 val disambiguate_nterm :
  #status as 'status ->
  NCic.term option -> NCic.context -> NCic.metasenv -> NCic.substitution ->
  NotationPt.term Disambiguate.disambiguator_input ->
-   NotationPt.term * NCic.metasenv * NCic.substitution * 'status * NCic.term
+   NCic.metasenv * NCic.substitution * 'status * NCic.term
 
 val disambiguate_nobj :
  #status as 'status -> ?baseuri:string ->
  (NotationPt.term NotationPt.obj) Disambiguate.disambiguator_input ->
-  'status * NCic.obj
+ 'status * NCic.obj
 
 type pattern = 
   NotationPt.term Disambiguate.disambiguator_input option * 
   (string * NCic.term) list * NCic.term option
 
 val disambiguate_npattern:
- #NCic.status -> GrafiteAst.npattern Disambiguate.disambiguator_input -> pattern
+ #NCicEnvironment.status -> GrafiteAst.npattern Disambiguate.disambiguator_input -> pattern
 
 val disambiguate_cic_appl_pattern:
  #status ->