1) Matitaweb now disambiguates scripts as it runs them

[helm.git] / matitaB / components / ng_disambiguation / nCicDisambiguate.mli

diff --git a/matitaB/components/ng_disambiguation/nCicDisambiguate.mli b/matitaB/components/ng_disambiguation/nCicDisambiguate.mli
index 715be6a85993b5881c5d3d31f8af87ac14eb3fc4..6f6bbd1a1b6413b2e2b50b0757d4a5e41a483d76 100644 (file)
--- a/matitaB/components/ng_disambiguation/nCicDisambiguate.mli
+++ b/matitaB/components/ng_disambiguation/nCicDisambiguate.mli
@@ -17,19 +17,19 @@ 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 *
+  (NotationPt.term *
    NCic.metasenv *                  
    NCic.substitution *
    NCic.term) list * 
@@ -37,20 +37,21 @@ val disambiguate_term :
   
 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 *
+  (NotationPt.term NotationPt.obj * 
+   NCic.metasenv *
    NCic.substitution * NCic.obj)
   list * bool