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 ->
+ (Token.flocation 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 ->
'a -> 'b)
- ~(drop_aliases: 'b -> 'b)
+ ~(drop_aliases: ?minimize_instances:bool -> 'b -> 'b)
~(drop_aliases_and_clear_diff: 'b -> 'b)
(thing: 'a)
=
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?> *)
+ let passes = (* <fresh_instances?, aliases, coercions?> *)
+ if !only_one_pass then
+ [ (false, mono_aliases, false) ]
+ else
[ (false, mono_aliases, false);
(false, multi_aliases, false);
(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
if use_mono_aliases && not instances then
drop_aliases res
else if user_asked then
- drop_aliases res (* one shot aliases *)
+ drop_aliases ~minimize_instances:true res (* one shot aliases *)
else
drop_aliases_and_clear_diff res
in
aliases:DisambiguateTypes.environment ->
universe:DisambiguateTypes.multiple_environment option ->
'a -> 'b * bool) ->
- drop_aliases:('b * bool -> 'b * bool) ->
+ drop_aliases:(?minimize_instances:bool -> 'b * bool -> 'b * bool) ->
drop_aliases_and_clear_diff:('b * bool -> 'b * bool) -> 'a -> 'b * bool
}
~drop_aliases_and_clear_diff) thing
}
-let drop_aliases (choices, user_asked) =
- (List.map (fun (d, a, b, c) -> d, a, b, c) choices),
+let drop_aliases ?(minimize_instances=false) (choices, user_asked) =
+ let module D = DisambiguateTypes in
+ let minimize d =
+ if not minimize_instances then
+ d
+ else
+ let rec aux =
+ function
+ [] -> []
+ | (D.Symbol (s,n),((descr,_) as ci)) as he::tl when n > 0 ->
+ if
+ List.for_all
+ (function
+ (D.Symbol (s2,_),(descr2,_)) -> s2 <> s || descr = descr2
+ | _ -> true
+ ) d
+ then
+ (D.Symbol (s,0),ci)::(aux tl)
+ else
+ he::(aux tl)
+ | (D.Num n,((descr,_) as ci)) as he::tl when n > 0 ->
+ if
+ List.for_all
+ (function (D.Num _,(descr2,_)) -> descr = descr2 | _ -> true) d
+ then
+ (D.Num 0,ci)::(aux tl)
+ else
+ he::(aux tl)
+ | he::tl -> he::(aux tl)
+ in
+ aux d
+ in
+ (List.map (fun (d, a, b, c) -> minimize d, a, b, c) choices),
user_asked
let drop_aliases_and_clear_diff (choices, user_asked) =