open MatitaTypes
exception Ambiguous_input
+exception DisambiguationError of string Lazy.t list list
type choose_uris_callback =
id:string -> UriManager.uri list -> UriManager.uri list
(* implement module's API *)
-let disambiguate_thing ~aliases
- ~(f:?fresh_instances:bool -> aliases:Disambiguate.aliases -> 'a -> 'b)
- ~(set_aliases: DisambiguateTypes.environment -> 'b -> 'b)
+let disambiguate_thing ~aliases ~universe
+ ~(f:?fresh_instances:bool ->
+ aliases:DisambiguateTypes.environment ->
+ universe:DisambiguateTypes.multiple_environment option ->
+ 'a -> 'b)
+ ~(drop_aliases: 'b -> 'b)
+ ~(drop_aliases_and_clear_diff: 'b -> 'b)
(thing: 'a)
=
- let library = true, DisambiguateTypes.empty_environment in
- let multi_aliases = true, aliases in
- let mono_aliases = false, aliases in
+ assert (universe <> None);
+ let library = false, DisambiguateTypes.Environment.empty, None in
+ let multi_aliases=false, DisambiguateTypes.Environment.empty, universe in
+ let mono_aliases = true, aliases, None in
let passes = (* <fresh_instances?, aliases, coercions?> *)
[ (false, mono_aliases, false);
(false, multi_aliases, false);
(true, library, true);
]
in
- let try_pass (fresh_instances, aliases, use_coercions) =
+ let try_pass (fresh_instances, (_, aliases, universe), use_coercions) =
CoercDb.use_coercions := use_coercions;
- f ~fresh_instances ~aliases thing
+ f ~fresh_instances ~aliases ~universe thing
in
- let set_aliases (_,(use_multi_aliases,_),_) (_, user_asked as res) =
- if not use_multi_aliases then
- res
+ let set_aliases (instances,(use_mono_aliases,_,_),_) (_, user_asked as res) =
+ if use_mono_aliases && not instances then
+ drop_aliases res
else if user_asked then
- res (* one shot aliases *)
+ drop_aliases res (* one shot aliases *)
else
- set_aliases aliases res
+ drop_aliases_and_clear_diff res
in
- let rec aux =
+ let rec aux errors =
function
- | [ pass ] -> set_aliases pass (try_pass pass)
+ | [ pass ] ->
+ (try
+ set_aliases pass (try_pass pass)
+ with Disambiguate.NoWellTypedInterpretation newerrors ->
+ raise (DisambiguationError (errors @ [newerrors])))
| hd :: tl ->
(try
set_aliases hd (try_pass hd)
- with Disambiguate.NoWellTypedInterpretation -> aux tl)
+ with Disambiguate.NoWellTypedInterpretation newerrors ->
+ aux (errors @ [newerrors]) tl)
| [] -> assert false
in
let saved_use_coercions = !CoercDb.use_coercions in
try
- let res = aux passes in
+ let res = aux [] passes in
CoercDb.use_coercions := saved_use_coercions;
res
with exn ->
CoercDb.use_coercions := saved_use_coercions;
raise exn
-let set_aliases aliases (choices, user_asked) =
- (List.map (fun (_, a, b, c) -> aliases, a, b, c) choices),
+type disambiguator_thing =
+ { do_it :
+ 'a 'b.
+ aliases:DisambiguateTypes.environment ->
+ universe:DisambiguateTypes.multiple_environment option ->
+ f:(?fresh_instances:bool ->
+ aliases:DisambiguateTypes.environment ->
+ universe:DisambiguateTypes.multiple_environment option ->
+ 'a -> 'b * bool) ->
+ drop_aliases:('b * bool -> 'b * bool) ->
+ drop_aliases_and_clear_diff:('b * bool -> 'b * bool) -> 'a -> 'b * bool
+ }
+
+let disambiguate_thing =
+ let profiler = HExtlib.profile "disambiguate_thing" in
+ { do_it =
+ fun ~aliases ~universe ~f ~drop_aliases ~drop_aliases_and_clear_diff thing
+ -> profiler.HExtlib.profile
+ (disambiguate_thing ~aliases ~universe ~f ~drop_aliases
+ ~drop_aliases_and_clear_diff) thing
+ }
+
+let drop_aliases (choices, user_asked) =
+ (List.map (fun (d, a, b, c) -> d, a, b, c) choices),
user_asked
-let disambiguate_term ~dbd ~context ~metasenv ?initial_ugraph ~aliases term =
+let drop_aliases_and_clear_diff (choices, user_asked) =
+ (List.map (fun (_, a, b, c) -> [], a, b, c) choices),
+ user_asked
+
+let disambiguate_term ?fresh_instances ~dbd ~context ~metasenv ?initial_ugraph
+ ~aliases ~universe term
+ =
+ assert (fresh_instances = None);
let f =
Disambiguator.disambiguate_term ~dbd ~context ~metasenv ?initial_ugraph
in
- disambiguate_thing ~aliases ~f ~set_aliases term
+ disambiguate_thing.do_it ~aliases ~universe ~f ~drop_aliases
+ ~drop_aliases_and_clear_diff term
-let disambiguate_obj ~dbd ~aliases ~uri obj =
+let disambiguate_obj ?fresh_instances ~dbd ~aliases ~universe ~uri obj =
+ assert (fresh_instances = None);
let f = Disambiguator.disambiguate_obj ~dbd ~uri in
- disambiguate_thing ~aliases ~f ~set_aliases obj
-
+ disambiguate_thing.do_it ~aliases ~universe ~f ~drop_aliases
+ ~drop_aliases_and_clear_diff obj