(** raised when an environment is not enough informative to decide *)
exception Try_again
-let debug = false
+type aliases = bool * DisambiguateTypes.environment
+
+let debug = true
let debug_print = if debug then prerr_endline else ignore
(*
(CicPp.ppobj obj) msg);
Ko,ugraph
-let resolve (env: environment) (item: domain_item) ?(num = "") ?(args = []) () =
+let resolve (env: codomain_item Environment.t) (item: domain_item) ?(num = "") ?(args = []) () =
try
snd (Environment.find item env) env num args
with Not_found ->
| CicNotationPt.AttributedTerm (`Loc loc, term) -> aux loc context term
| term -> aux dummy_floc context term
-let interpretate_path ~context ~env path =
- interpretate_term ~context ~env ~uri:None ~is_path:true path
+let interpretate_path ~context path =
+ interpretate_term ~context ~env:Environment.empty ~uri:None ~is_path:true path
let interpretate_obj ~context ~env ~uri ~is_path obj =
assert (context = []);
(fun (i,res) (name,_,_,_) ->
i + 1,(name,name,Cic.MutInd (uri,i,[]))::res
) (0,[]) tyl) in
- let con_env = DisambiguateTypes.env_of_list name_to_uris env in
+ let con_env = DisambiguateTypes.singleton_env_of_list name_to_uris env in
let undebrujin t =
snd
(List.fold_right
| None -> []
| Some t -> domain_rev_of_term ~loc context t
-let domain_of_term ~context ast =
- rev_uniq (domain_rev_of_term context ast)
+let domain_of_term ~context ast = rev_uniq (domain_rev_of_term context ast)
let domain_of_obj ~context ast =
assert (context = []);
module type Disambiguator =
sig
val disambiguate_term :
+ ?fresh_instances:bool ->
dbd:Mysql.dbd ->
context:Cic.context ->
metasenv:Cic.metasenv ->
?initial_ugraph:CicUniv.universe_graph ->
- aliases:environment -> (* previous interpretation status *)
+ aliases:aliases -> (* previous interpretation status *)
CicNotationPt.term ->
(environment * (* new interpretation status *)
Cic.metasenv * (* new metasenv *)
Cic.term*
- CicUniv.universe_graph) list (* disambiguated term *)
+ CicUniv.universe_graph) list * (* disambiguated term *)
+ bool
val disambiguate_obj :
+ ?fresh_instances:bool ->
dbd:Mysql.dbd ->
- aliases:environment -> (* previous interpretation status *)
+ aliases:aliases -> (* previous interpretation status *)
uri:UriManager.uri option -> (* required only for inductive types *)
GrafiteAst.obj ->
(environment * (* new interpretation status *)
Cic.metasenv * (* new metasenv *)
Cic.obj *
- CicUniv.universe_graph) list (* disambiguated obj *)
+ CicUniv.universe_graph) list * (* disambiguated obj *)
+ bool
end
module Make (C: Callbacks) =
uris
let disambiguate_thing ~dbd ~context ~metasenv
- ?(initial_ugraph = CicUniv.empty_ugraph) ~aliases:current_env
+ ?(initial_ugraph = CicUniv.empty_ugraph) ~aliases
~uri ~pp_thing ~domain_of_thing ~interpretate_thing ~refine_thing thing
=
- debug_print "NEW DISAMBIGUATE INPUT";
+ debug_print "DISAMBIGUATE INPUT";
+ let current_env, multi_aliases_env =
+ match aliases with
+ | false, e -> Environment.hd e, None
+ | true, e -> Environment.empty, Some e
+ in
let disambiguate_context = (* cic context -> disambiguate context *)
List.map
(function None -> Cic.Anonymous | Some (name, _) -> name)
let thing_dom = domain_of_thing ~context:disambiguate_context thing in
debug_print (sprintf "DISAMBIGUATION DOMAIN: %s"
(string_of_domain thing_dom));
+ debug_print (sprintf "DISAMBIGUATION ENVIRONMENT: %s"
+ (DisambiguatePp.pp_environment (snd aliases)));
let current_dom =
Environment.fold (fun item _ dom -> item :: dom) current_env []
in
let lookup_choices =
let id_choices = Hashtbl.create 1023 in
fun item ->
- let choices =
- match item with
- | Id id ->
- (try
- Hashtbl.find id_choices id
- with Not_found ->
- let choices = choices_of_id dbd id in
- Hashtbl.add id_choices id choices;
- choices)
- | Symbol (symb, _) ->
- List.map DisambiguateChoices.mk_choice
- (CicNotationRew.lookup_interpretations symb)
-(* DisambiguateChoices.lookup_symbol_choices symb *)
- | Num instance -> DisambiguateChoices.lookup_num_choices ()
- in
- if choices = [] then raise (No_choices item);
- choices
+ let choices =
+ let lookup_in_library () =
+ match item with
+ | Id id -> choices_of_id dbd id
+ | Symbol (symb, _) ->
+ List.map DisambiguateChoices.mk_choice
+ (CicNotationRew.lookup_interpretations symb)
+ | Num instance ->
+ DisambiguateChoices.lookup_num_choices ()
+ in
+ match multi_aliases_env with
+ | None -> lookup_in_library ()
+ | Some e ->
+ (try
+ Environment.find item e
+ with Not_found -> lookup_in_library ())
+ in
+ if choices = [] then raise (No_choices item);
+ choices
in
-
(*
(* <benchmark> *)
let _ =
match aux current_env todo_dom base_univ with
| [] -> raise NoWellTypedInterpretation
| [ e,me,t,u ] ->
- debug_print "UNA SOLA SCELTA";
- (* Experimental: we forget the environment [e] since we are able
- to recompute it. In this way we are forced to do more work
- later (since we have less aliases), but we have more freedom
- (since we have less aliases) in the future disambiguations. *)
- [ current_env,me,t,u]
+ debug_print "SINGLE INTERPRETATION";
+ [ e,me,t,u ], false
| l ->
- debug_print (sprintf "PIU' SCELTE (%d)" (List.length l));
+ debug_print (sprintf "MANY INTERPRETATIONS (%d)" (List.length l));
let choices =
List.map
(fun (env, _, _, _) ->
l
in
let choosed = C.interactive_interpretation_choice choices in
- List.map (List.nth l) choosed
+ (List.map (List.nth l) choosed), true
in
(*
(if benchmark then
!choices_avg
(float_of_int (!domain_size - 1) *. !choices_avg *. (float_of_int res_size) +. !choices_avg)));
*)
- res
+ let choices, b = res in
+ (List.map
+ (fun (env, metasenv, t, ugraph) ->
+ Environment.fold Environment.cons env (snd aliases),
+ metasenv, t, ugraph)
+ choices),
+ b
with
CicEnvironment.CircularDependency s ->
failwith "Disambiguate: circular dependency"
- let disambiguate_term ~dbd ~context ~metasenv
+ let disambiguate_term ?(fresh_instances=false) ~dbd ~context ~metasenv
?(initial_ugraph = CicUniv.empty_ugraph) ~aliases term
=
- disambiguate_thing ~dbd ~context ~metasenv ~initial_ugraph ~aliases
- ~uri:None ~pp_thing:CicNotationPp.pp_term ~domain_of_thing:domain_of_term
- ~interpretate_thing:interpretate_term ~refine_thing:refine_term term
-
- let disambiguate_obj ~dbd ~aliases ~uri obj =
- disambiguate_thing ~dbd ~context:[] ~metasenv:[] ~aliases ~uri
- ~pp_thing:GrafiteAstPp.pp_obj ~domain_of_thing:domain_of_obj
- ~interpretate_thing:interpretate_obj ~refine_thing:refine_obj
- obj
+ let term =
+ if fresh_instances then CicNotationUtil.freshen_term term else term
+ in
+ disambiguate_thing ~dbd ~context ~metasenv ~initial_ugraph ~aliases
+ ~uri:None ~pp_thing:CicNotationPp.pp_term
+ ~domain_of_thing:domain_of_term ~interpretate_thing:interpretate_term
+ ~refine_thing:refine_term term
+
+ let disambiguate_obj ?(fresh_instances=false) ~dbd ~aliases ~uri obj =
+ let obj =
+ if fresh_instances then CicNotationUtil.freshen_obj obj else obj
+ in
+ disambiguate_thing ~dbd ~context:[] ~metasenv:[] ~aliases ~uri
+ ~pp_thing:GrafiteAstPp.pp_obj ~domain_of_thing:domain_of_obj
+ ~interpretate_thing:interpretate_obj ~refine_thing:refine_obj
+ obj
end
module Trivial =
=
let ast = CicNotationParser.parse_level2_ast (Stream.of_string term) in
try
- Disambiguator.disambiguate_term ~dbd ~context ~metasenv ast
- ?initial_ugraph ~aliases
+ fst (Disambiguator.disambiguate_term ~dbd ~context ~metasenv ast
+ ?initial_ugraph ~aliases:(false, aliases))
with Exit -> raise (Ambiguous_term term)
end
projects / helm.git / blobdiff