X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matitaB%2Fcomponents%2Fng_disambiguation%2FnCicDisambiguate.mli;h=3423d79214c89045a13bab2c0dcb5632c323302b;hb=bbb6dd07ecb430bf06bb52c2506626106449a5af;hp=715be6a85993b5881c5d3d31f8af87ac14eb3fc4;hpb=cacbe3c6493ddce76c4c13379ade271d8dd172e8;p=helm.git

diff --git a/matitaB/components/ng_disambiguation/nCicDisambiguate.mli b/matitaB/components/ng_disambiguation/nCicDisambiguate.mli
index 715be6a85..3423d7921 100644
--- a/matitaB/components/ng_disambiguation/nCicDisambiguate.mli
+++ b/matitaB/components/ng_disambiguation/nCicDisambiguate.mli
@@ -17,41 +17,35 @@ val disambiguate_term :
   metasenv:NCic.metasenv -> 
   subst:NCic.substitution ->
   expty:NCic.term option ->
-  mk_implicit: (bool -> 'alias) ->
-  description_of_alias:('alias -> string) ->
-  fix_instance:(DisambiguateTypes.domain_item -> 'alias list -> 'alias list) ->
-  mk_choice:('alias -> NCic.term DisambiguateTypes.codomain_item) ->
-  aliases:'alias DisambiguateTypes.Environment.t ->
-  universe:'alias list DisambiguateTypes.Environment.t option ->
+  mk_implicit: (bool -> GrafiteAst.alias_spec) ->
+  description_of_alias:(GrafiteAst.alias_spec -> string) ->
+  fix_instance:(DisambiguateTypes.domain_item -> GrafiteAst.alias_spec list -> GrafiteAst.alias_spec list) ->
+  mk_choice:(GrafiteAst.alias_spec -> NCic.term DisambiguateTypes.codomain_item) ->
+  aliases:GrafiteAst.alias_spec DisambiguateTypes.InterprEnv.t ->
+  universe:GrafiteAst.alias_spec list DisambiguateTypes.Environment.t ->
   lookup_in_library:(
     DisambiguateTypes.interactive_user_uri_choice_type ->
     DisambiguateTypes.input_or_locate_uri_type ->
     DisambiguateTypes.Environment.key ->
-    'alias list) ->
+    GrafiteAst.alias_spec list) ->
   NotationPt.term Disambiguate.disambiguator_input ->
-  ((DisambiguateTypes.domain_item * 'alias) list *
-   NCic.metasenv *                  
-   NCic.substitution *
-   NCic.term) list * 
-  bool
+  (GrafiteAst.alias_spec,NotationPt.term,NCic.metasenv,NCic.substitution,NCic.term,unit) Disambiguate.disamb_result
   
 val disambiguate_obj :
   #NCicCoercion.status ->
-  mk_implicit:(bool -> 'alias) ->
-  description_of_alias:('alias -> string) ->
-  fix_instance:(DisambiguateTypes.domain_item -> 'alias list -> 'alias list) ->
-  mk_choice:('alias -> NCic.term DisambiguateTypes.codomain_item) ->
-  aliases:'alias DisambiguateTypes.Environment.t ->
-  universe:'alias list DisambiguateTypes.Environment.t option ->
+  mk_implicit:(bool -> GrafiteAst.alias_spec) ->
+  description_of_alias:(GrafiteAst.alias_spec -> string) ->
+  fix_instance:(DisambiguateTypes.domain_item -> GrafiteAst.alias_spec list -> GrafiteAst.alias_spec list) ->
+  mk_choice:(GrafiteAst.alias_spec -> NCic.term DisambiguateTypes.codomain_item) ->
+  aliases:GrafiteAst.alias_spec DisambiguateTypes.InterprEnv.t ->
+  universe:GrafiteAst.alias_spec list DisambiguateTypes.Environment.t ->
   lookup_in_library:(
     DisambiguateTypes.interactive_user_uri_choice_type ->
     DisambiguateTypes.input_or_locate_uri_type ->
     DisambiguateTypes.Environment.key ->
-     'alias list) ->
+     GrafiteAst.alias_spec list) ->
   uri:NUri.uri ->
   string * int * NotationPt.term NotationPt.obj ->
-  ((DisambiguateTypes.Environment.key * 'alias) list * NCic.metasenv *
-   NCic.substitution * NCic.obj)
-  list * bool
+  (GrafiteAst.alias_spec,NotationPt.term NotationPt.obj,NCic.metasenv,NCic.substitution,NCic.obj,unit) Disambiguate.disamb_result
 
-val disambiguate_path: #NCic.status -> NotationPt.term -> NCic.term
+val disambiguate_path: #NCicEnvironment.status -> NotationPt.term -> NCic.term