open Printf
+let debug = false;;
+let debug_print s =
+ if debug then prerr_endline (Lazy.force s);;
+
exception Ambiguous_input
(* the integer is an offset to be added to each location *)
exception DisambiguationError of
- int * (Token.flocation option * string Lazy.t) list list
+ int *
+ ((Stdpp.location list * string * string) list *
+ (DisambiguateTypes.domain_item * string) list *
+ (Stdpp.location * string) Lazy.t * bool) list list
(** parameters are: option name, error message *)
exception Unbound_identifier of string
type choose_uris_callback =
id:string -> UriManager.uri list -> UriManager.uri list
-type choose_interp_callback = (string * string) list list -> int list
+type choose_interp_callback =
+ string -> int ->
+ (Stdpp.location list * string * string) list list -> int list
let mono_uris_callback ~id =
if Helm_registry.get_opt_default Helm_registry.get_bool ~default:true
else
raise Ambiguous_input
-let mono_interp_callback _ = raise Ambiguous_input
+let mono_interp_callback _ _ _ = raise Ambiguous_input
let _choose_uris_callback = ref mono_uris_callback
let _choose_interp_callback = ref mono_interp_callback
let interactive_interpretation_choice interp =
!_choose_interp_callback interp
- let input_or_locate_uri ~(title:string) ?id =
+ let input_or_locate_uri ~(title:string) ?id () = None
(* Zack: I try to avoid using this callback. I therefore assume that
* the presence of an identifier that can't be resolved via "locate"
* query is a syntax error *)
- let msg = match id with Some id -> id | _ -> "_" in
- raise (Unbound_identifier msg)
end
module Disambiguator = Disambiguate.Make (Callbacks)
(* implement module's API *)
+let only_one_pass = ref false;;
+
let disambiguate_thing ~aliases ~universe
~(f:?fresh_instances:bool ->
- aliases:DisambiguateTypes.environment ->
- universe:DisambiguateTypes.multiple_environment option ->
+ aliases:'term DisambiguateTypes.environment ->
+ universe:'term DisambiguateTypes.multiple_environment option ->
'a -> 'b)
~(drop_aliases: ?minimize_instances:bool -> 'b -> 'b)
~(drop_aliases_and_clear_diff: 'b -> 'b)
let library = false, DisambiguateTypes.Environment.empty, None in
let multi_aliases = false, DisambiguateTypes.Environment.empty, universe in
let mono_aliases = true, aliases, Some DisambiguateTypes.Environment.empty in
- let passes = (* <fresh_instances?, aliases, coercions?> *)
- [ (false, mono_aliases, false);
- (false, multi_aliases, false);
- (true, mono_aliases, false);
+ let passes = (* <fresh_instances?, aliases, coercions?> *)
+ if !only_one_pass then
+ [ (true, mono_aliases, false) ]
+ else
+ [ (true, mono_aliases, false);
(true, multi_aliases, false);
(true, mono_aliases, true);
(true, multi_aliases, true);
+ (true, library, false);
+ (* for demo to reduce the number of interpretations *)
(true, library, true);
]
in
f ~fresh_instances ~aliases ~universe thing
in
let set_aliases (instances,(use_mono_aliases,_,_),_) (_, user_asked as res) =
- if use_mono_aliases && not instances then
- drop_aliases res
+ if use_mono_aliases then
+ drop_aliases ~minimize_instances:true res (* one shot aliases *)
else if user_asked then
drop_aliases ~minimize_instances:true res (* one shot aliases *)
else
drop_aliases_and_clear_diff res
in
- let rec aux errors =
- function
- | [ pass ] ->
+ let rec aux i errors passes =
+ debug_print (lazy ("Pass: " ^ string_of_int i));
+ match passes with
+ [ pass ] ->
(try
set_aliases pass (try_pass pass)
with Disambiguate.NoWellTypedInterpretation (offset,newerrors) ->
(try
set_aliases hd (try_pass hd)
with Disambiguate.NoWellTypedInterpretation (_offset,newerrors) ->
- aux (errors @ [newerrors]) tl)
+ aux (i+1) (errors @ [newerrors]) tl)
| [] -> assert false
in
let saved_insert_coercions = !CicRefine.insert_coercions in
try
- let res = aux [] passes in
+ let res = aux 1 [] passes in
CicRefine.insert_coercions := saved_insert_coercions;
res
with exn ->
type disambiguator_thing =
{ do_it :
- 'a 'b.
- aliases:DisambiguateTypes.environment ->
- universe:DisambiguateTypes.multiple_environment option ->
+ 'a 'b 'term.
+ aliases:'term DisambiguateTypes.environment ->
+ universe:'term DisambiguateTypes.multiple_environment option ->
f:(?fresh_instances:bool ->
- aliases:DisambiguateTypes.environment ->
- universe:DisambiguateTypes.multiple_environment option ->
+ aliases:'term DisambiguateTypes.environment ->
+ universe:'term DisambiguateTypes.multiple_environment option ->
'a -> 'b * bool) ->
drop_aliases:(?minimize_instances:bool -> 'b * bool -> 'b * bool) ->
drop_aliases_and_clear_diff:('b * bool -> 'b * bool) -> 'a -> 'b * bool
in
aux d
in
- (List.map (fun (d, a, b, c) -> minimize d, a, b, c) choices),
+ (List.map (fun (d, a, b, c, e) -> minimize d, a, b, c, e) choices),
user_asked
let drop_aliases_and_clear_diff (choices, user_asked) =
- (List.map (fun (_, a, b, c) -> [], a, b, c) choices),
+ (List.map (fun (_, a, b, c, d) -> [], a, b, c, d) choices),
user_asked
-let disambiguate_term ?fresh_instances ~dbd ~context ~metasenv ?initial_ugraph
- ~aliases ~universe term
+let disambiguate_term ?fresh_instances ~context ~metasenv ~subst ?goal ?initial_ugraph ~aliases ~universe ~lookup_in_library term
=
assert (fresh_instances = None);
let f =
- Disambiguator.disambiguate_term ~dbd ~context ~metasenv ?initial_ugraph
+ Disambiguator.disambiguate_term ~lookup_in_library ~context ~metasenv ~subst ?goal ?initial_ugraph
in
disambiguate_thing.do_it ~aliases ~universe ~f ~drop_aliases
~drop_aliases_and_clear_diff term
-let disambiguate_obj ?fresh_instances ~dbd ~aliases ~universe ~uri obj =
+let disambiguate_obj ?fresh_instances ~aliases ~universe ~uri ~lookup_in_library obj =
assert (fresh_instances = None);
- let f = Disambiguator.disambiguate_obj ~dbd ~uri in
+ let f = Disambiguator.disambiguate_obj ~lookup_in_library ~uri in
disambiguate_thing.do_it ~aliases ~universe ~f ~drop_aliases
~drop_aliases_and_clear_diff obj
+
+let disambiguate_thing ~context = assert false