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

diff --git a/matitaB/components/ng_disambiguation/grafiteDisambiguate.mli b/matitaB/components/ng_disambiguation/grafiteDisambiguate.mli
index fcea29e43..c9735dbf9 100644
--- a/matitaB/components/ng_disambiguation/grafiteDisambiguate.mli
+++ b/matitaB/components/ng_disambiguation/grafiteDisambiguate.mli
@@ -28,6 +28,7 @@ type db
 class type g_status =
  object
   inherit Interpretations.g_status
+  inherit NCicLibrary.g_status
   method disambiguate_db: db
  end
 
@@ -36,6 +37,7 @@ class virtual status :
  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
@@ -57,12 +59,15 @@ val add_to_disambiguation_univ:
   (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 :
@@ -81,7 +86,7 @@ type pattern =
   (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 ->