(** raised when an environment is not enough informative to decide *)
exception Try_again
+type aliases = bool * DisambiguateTypes.environment
+
let debug = false
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 ->
(DisambiguateTypes.string_of_domain_item item))
(* TODO move it to Cic *)
-let find_in_environment name context =
+let find_in_environment name (context: Cic.name list) =
let rec aux acc = function
| [] -> raise Not_found
| Cic.Name hd :: tl when hd = name -> acc
in
aux 1 context
-let interpretate_term ~context ~env ~uri ~is_path ast =
+let interpretate_term ~(context: Cic.name list) ~env ~uri ~is_path ast =
assert (uri = None);
- let rec aux loc context = function
- | CicAst.AttributedTerm (`Loc loc, term) ->
+ let rec aux loc (context: Cic.name list) = function
+ | CicNotationPt.AttributedTerm (`Loc loc, term) ->
aux loc context term
- | CicAst.AttributedTerm (_, term) -> aux loc context term
- | CicAst.Appl (CicAst.Symbol (symb, i) :: args) ->
+ | CicNotationPt.AttributedTerm (_, term) -> aux loc context term
+ | CicNotationPt.Appl (CicNotationPt.Symbol (symb, i) :: args) ->
let cic_args = List.map (aux loc context) args in
resolve env (Symbol (symb, i)) ~args:cic_args ()
- | CicAst.Appl terms -> Cic.Appl (List.map (aux loc context) terms)
- | CicAst.Binder (binder_kind, (var, typ), body) ->
- let cic_type = aux_option loc context typ in
- let cic_body = aux loc (var :: context) body in
+ | CicNotationPt.Appl terms -> Cic.Appl (List.map (aux loc context) terms)
+ | CicNotationPt.Binder (binder_kind, (var, typ), body) ->
+ let cic_type = aux_option loc context (Some `Type) typ in
+ let cic_name = CicNotationUtil.cic_name_of_name var in
+ let cic_body = aux loc (cic_name :: context) body in
(match binder_kind with
- | `Lambda -> Cic.Lambda (var, cic_type, cic_body)
- | `Pi | `Forall -> Cic.Prod (var, cic_type, cic_body)
+ | `Lambda -> Cic.Lambda (cic_name, cic_type, cic_body)
+ | `Pi
+ | `Forall -> Cic.Prod (cic_name, cic_type, cic_body)
| `Exists ->
resolve env (Symbol ("exists", 0))
- ~args:[ cic_type; Cic.Lambda (var, cic_type, cic_body) ] ())
- | CicAst.Case (term, indty_ident, outtype, branches) ->
+ ~args:[ cic_type; Cic.Lambda (cic_name, cic_type, cic_body) ] ())
+ | CicNotationPt.Case (term, indty_ident, outtype, branches) ->
let cic_term = aux loc context term in
- let cic_outtype = aux_option loc context outtype in
- let do_branch ((head, args), term) =
+ let cic_outtype = aux_option loc context None outtype in
+ let do_branch ((head, _, args), term) =
let rec do_branch' context = function
| [] -> aux loc context term
| (name, typ) :: tl ->
- let cic_body = do_branch' (name :: context) tl in
+ let cic_name = CicNotationUtil.cic_name_of_name name in
+ let cic_body = do_branch' (cic_name :: context) tl in
let typ =
match typ with
| None -> Cic.Implicit (Some `Type)
| Some typ -> aux loc context typ
in
- Cic.Lambda (name, typ, cic_body)
+ Cic.Lambda (cic_name, typ, cic_body)
in
do_branch' context args
in
let (indtype_uri, indtype_no) =
match indty_ident with
- | Some indty_ident ->
+ | Some (indty_ident, _) ->
(match resolve env (Id indty_ident) () with
| Cic.MutInd (uri, tyno, _) -> (uri, tyno)
| Cic.Implicit _ -> raise Try_again
- | _ -> raise DisambiguateChoices.Invalid_choice)
+ | _ -> raise Invalid_choice)
| None ->
let fst_constructor =
match branches with
- | ((head, _), _) :: _ -> head
- | [] -> raise DisambiguateChoices.Invalid_choice
+ | ((head, _, _), _) :: _ -> head
+ | [] -> raise Invalid_choice
in
(match resolve env (Id fst_constructor) () with
| Cic.MutConstruct (indtype_uri, indtype_no, _, _) ->
(indtype_uri, indtype_no)
| Cic.Implicit _ -> raise Try_again
- | _ -> raise DisambiguateChoices.Invalid_choice)
+ | _ -> raise Invalid_choice)
in
Cic.MutCase (indtype_uri, indtype_no, cic_outtype, cic_term,
(List.map do_branch branches))
- | CicAst.LetIn ((name, typ), def, body) ->
+ | CicNotationPt.Cast (t1, t2) ->
+ let cic_t1 = aux loc context t1 in
+ let cic_t2 = aux loc context t2 in
+ Cic.Cast (cic_t1, cic_t2)
+ | CicNotationPt.LetIn ((name, typ), def, body) ->
let cic_def = aux loc context def in
+ let cic_name = CicNotationUtil.cic_name_of_name name in
let cic_def =
match typ with
| None -> cic_def
| Some t -> Cic.Cast (cic_def, aux loc context t)
in
- let cic_body = aux loc (name :: context) body in
- Cic.LetIn (name, cic_def, cic_body)
- | CicAst.LetRec (kind, defs, body) ->
+ let cic_body = aux loc (cic_name :: context) body in
+ Cic.LetIn (cic_name, cic_def, cic_body)
+ | CicNotationPt.LetRec (kind, defs, body) ->
let context' =
- List.fold_left (fun acc ((name, _), _, _) -> name :: acc)
+ List.fold_left
+ (fun acc ((name, _), _, _) ->
+ CicNotationUtil.cic_name_of_name name :: acc)
context defs
in
let cic_body = aux loc context' body in
List.map
(fun ((name, typ), body, decr_idx) ->
let cic_body = aux loc context' body in
- let cic_type = aux_option loc context typ in
+ let cic_type = aux_option loc context (Some `Type) typ in
let name =
- match name with
+ match CicNotationUtil.cic_name_of_name name with
| Cic.Anonymous ->
- CicTextualParser2.fail loc
+ CicNotationPt.fail loc
"Recursive functions cannot be anonymous"
| Cic.Name name -> name
in
Cic.LetIn (Cic.Name var, Cic.CoFix (!counter, funs), cic))
in
List.fold_right (build_term inductiveFuns) inductiveFuns cic_body
- | CicAst.Ident _
- | CicAst.Uri _ when is_path -> raise PathNotWellFormed
- | CicAst.Ident (name, subst)
- | CicAst.Uri (name, subst) as ast ->
- let is_uri = function CicAst.Uri _ -> true | _ -> false in
+ | CicNotationPt.Ident _
+ | CicNotationPt.Uri _ when is_path -> raise PathNotWellFormed
+ | CicNotationPt.Ident (name, subst)
+ | CicNotationPt.Uri (name, subst) as ast ->
+ let is_uri = function CicNotationPt.Uri _ -> true | _ -> false in
(try
if is_uri ast then raise Not_found;(* don't search the env for URIs *)
let index = find_in_environment name context in
if subst <> None then
- CicTextualParser2.fail loc
- "Explicit substitutions not allowed here";
+ CicNotationPt.fail loc "Explicit substitutions not allowed here";
Cic.Rel index
with Not_found ->
let cic =
try
CicUtil.term_of_uri (UriManager.uri_of_string name)
with UriManager.IllFormedUri _ ->
- CicTextualParser2.fail loc "Ill formed URI"
+ CicNotationPt.fail loc "Ill formed URI"
else
resolve env (Id name) ()
in
(try
List.assoc s ids_to_uris, aux loc context term
with Not_found ->
- raise DisambiguateChoices.Invalid_choice))
+ raise Invalid_choice))
subst
| None -> List.map (fun uri -> uri, Cic.Implicit None) uris)
in
(CicPp.ppterm t)
(String.concat "; "
(List.map
- (fun (s, term) -> s ^ " := " ^ CicAstPp.pp_term term)
+ (fun (s, term) -> s ^ " := " ^ CicNotationPtPp.pp_term term)
subst)));
*)
t
| _ ->
- raise DisambiguateChoices.Invalid_choice
+ raise Invalid_choice
with
CicEnvironment.CircularDependency _ ->
- raise DisambiguateChoices.Invalid_choice))
- | CicAst.Implicit -> Cic.Implicit None
- | CicAst.UserInput -> Cic.Implicit (Some `Hole)
- | CicAst.Num (num, i) -> resolve env (Num i) ~num ()
- | CicAst.Meta (index, subst) ->
+ raise Invalid_choice))
+ | CicNotationPt.Implicit -> Cic.Implicit None
+ | CicNotationPt.UserInput -> Cic.Implicit (Some `Hole)
+ | CicNotationPt.Num (num, i) -> resolve env (Num i) ~num ()
+ | CicNotationPt.Meta (index, subst) ->
let cic_subst =
List.map
(function None -> None | Some term -> Some (aux loc context term))
subst
in
Cic.Meta (index, cic_subst)
- | CicAst.Sort `Prop -> Cic.Sort Cic.Prop
- | CicAst.Sort `Set -> Cic.Sort Cic.Set
- | CicAst.Sort `Type -> Cic.Sort (Cic.Type (CicUniv.fresh())) (* TASSI *)
- | CicAst.Sort `CProp -> Cic.Sort Cic.CProp
- | CicAst.Symbol (symbol, instance) ->
+ | CicNotationPt.Sort `Prop -> Cic.Sort Cic.Prop
+ | CicNotationPt.Sort `Set -> Cic.Sort Cic.Set
+ | CicNotationPt.Sort `Type -> Cic.Sort (Cic.Type (CicUniv.fresh())) (* TASSI *)
+ | CicNotationPt.Sort `CProp -> Cic.Sort Cic.CProp
+ | CicNotationPt.Symbol (symbol, instance) ->
resolve env (Symbol (symbol, instance)) ()
- and aux_option loc context = function
- | None -> Cic.Implicit (Some `Type)
+ | _ -> assert false (* god bless Bologna *)
+ and aux_option loc (context: Cic.name list) annotation = function
+ | None -> Cic.Implicit annotation
| Some term -> aux loc context term
in
match ast with
- | CicAst.AttributedTerm (`Loc loc, term) -> aux loc context term
- | term -> aux CicAst.dummy_floc context term
+ | 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 = []);
assert (is_path = false);
match obj with
- | TacticAst.Inductive (params,tyl) ->
+ | GrafiteAst.Inductive (params,tyl) ->
let uri = match uri with Some uri -> uri | None -> assert false in
let context,params =
let context,res =
List.fold_left
(fun (context,res) (name,t) ->
- (Cic.Name name)::context,
+ Cic.Name name :: context,
(name, interpretate_term context env None false t)::res
) ([],[]) params
in
) tyl
in
Cic.InductiveDefinition (tyl,[],List.length params,[])
- | TacticAst.Record (params,name,ty,fields) ->
+ | GrafiteAst.Record (params,name,ty,fields) ->
let uri = match uri with Some uri -> uri | None -> assert false in
let context,params =
let context,res =
List.fold_left
(fun (context,res) (name,t) ->
- (Cic.Name name)::context,
+ (Cic.Name name :: context),
(name, interpretate_term context env None false t)::res
) ([],[]) params
in
snd (
List.fold_left
(fun (context,res) (name,ty) ->
- let context' = (Cic.Name name)::context in
+ let context' = Cic.Name name :: context in
context',(name,interpretate_term context env None false ty)::res
) (context,[]) fields) in
let concl =
let field_names = List.map fst fields in
Cic.InductiveDefinition
(tyl,[],List.length params,[`Class (`Record field_names)])
- | TacticAst.Theorem (_,name,ty,bo) ->
+ | GrafiteAst.Theorem (flavour, name, ty, bo) ->
+ let attrs = [`Flavour flavour] in
let ty' = interpretate_term [] env None false ty in
- match bo with
+ (match bo with
None ->
- Cic.CurrentProof (name,[],Cic.Implicit None,ty',[],[])
+ Cic.CurrentProof (name,[],Cic.Implicit None,ty',[],attrs)
| Some bo ->
let bo' = Some (interpretate_term [] env None false bo) in
- Cic.Constant (name,bo',ty',[],[])
+ Cic.Constant (name,bo',ty',[],attrs))
+
(* e.g. [5;1;1;1;2;3;4;1;2] -> [2;1;4;3;5] *)
let rev_uniq =
(* "aux" keeps domain in reverse order and doesn't care about duplicates.
* Domain item more in deep in the list will be processed first.
*)
-let rec domain_rev_of_term ?(loc = CicAst.dummy_floc) context = function
- | CicAst.AttributedTerm (`Loc loc, term) ->
+let rec domain_rev_of_term ?(loc = dummy_floc) context = function
+ | CicNotationPt.AttributedTerm (`Loc loc, term) ->
domain_rev_of_term ~loc context term
- | CicAst.AttributedTerm (_, term) -> domain_rev_of_term ~loc context term
- | CicAst.Appl terms ->
+ | CicNotationPt.AttributedTerm (_, term) ->
+ domain_rev_of_term ~loc context term
+ | CicNotationPt.Appl terms ->
List.fold_left
(fun dom term -> domain_rev_of_term ~loc context term @ dom) [] terms
- | CicAst.Binder (kind, (var, typ), body) ->
+ | CicNotationPt.Binder (kind, (var, typ), body) ->
let kind_dom =
match kind with
| `Exists -> [ Symbol ("exists", 0) ]
| _ -> []
in
let type_dom = domain_rev_of_term_option loc context typ in
- let body_dom = domain_rev_of_term ~loc (var :: context) body in
+ let body_dom =
+ domain_rev_of_term ~loc
+ (CicNotationUtil.cic_name_of_name var :: context) body
+ in
body_dom @ type_dom @ kind_dom
- | CicAst.Case (term, indty_ident, outtype, branches) ->
+ | CicNotationPt.Case (term, indty_ident, outtype, branches) ->
let term_dom = domain_rev_of_term ~loc context term in
let outtype_dom = domain_rev_of_term_option loc context outtype in
let get_first_constructor = function
| [] -> []
- | ((head, _), _) :: _ -> [ Id head ]
+ | ((head, _, _), _) :: _ -> [ Id head ]
in
- let do_branch ((head, args), term) =
+ let do_branch ((head, _, args), term) =
let (term_context, args_domain) =
List.fold_left
(fun (cont, dom) (name, typ) ->
- (name :: cont,
+ (CicNotationUtil.cic_name_of_name name :: cont,
(match typ with
| None -> dom
| Some typ -> domain_rev_of_term ~loc cont typ @ dom)))
branches_dom @ outtype_dom @ term_dom @
(match indty_ident with
| None -> get_first_constructor branches
- | Some ident -> [ Id ident ])
- | CicAst.LetIn ((var, typ), body, where) ->
+ | Some (ident, _) -> [ Id ident ])
+ | CicNotationPt.Cast (term, ty) ->
+ let term_dom = domain_rev_of_term ~loc context term in
+ let ty_dom = domain_rev_of_term ~loc context ty in
+ ty_dom @ term_dom
+ | CicNotationPt.LetIn ((var, typ), body, where) ->
let body_dom = domain_rev_of_term ~loc context body in
let type_dom = domain_rev_of_term_option loc context typ in
- let where_dom = domain_rev_of_term ~loc (var :: context) where in
+ let where_dom =
+ domain_rev_of_term ~loc
+ (CicNotationUtil.cic_name_of_name var :: context) where
+ in
where_dom @ type_dom @ body_dom
- | CicAst.LetRec (kind, defs, where) ->
+ | CicNotationPt.LetRec (kind, defs, where) ->
let context' =
- List.fold_left (fun acc ((var, typ), _, _) -> var :: acc)
+ List.fold_left
+ (fun acc ((var, typ), _, _) ->
+ CicNotationUtil.cic_name_of_name var :: acc)
context defs
in
let where_dom = domain_rev_of_term ~loc context' where in
[] defs
in
where_dom @ defs_dom
- | CicAst.Ident (name, subst) ->
+ | CicNotationPt.Ident (name, subst) ->
(try
let index = find_in_environment name context in
if subst <> None then
- CicTextualParser2.fail loc
- "Explicit substitutions not allowed here"
+ CicNotationPt.fail loc "Explicit substitutions not allowed here"
else
[]
with Not_found ->
let dom' = domain_rev_of_term ~loc context term in
dom' @ dom)
[Id name] subst))
- | CicAst.Uri _ -> []
- | CicAst.Implicit -> []
- | CicAst.Num (num, i) -> [ Num i ]
- | CicAst.Meta (index, local_context) ->
+ | CicNotationPt.Uri _ -> []
+ | CicNotationPt.Implicit -> []
+ | CicNotationPt.Num (num, i) -> [ Num i ]
+ | CicNotationPt.Meta (index, local_context) ->
List.fold_left
(fun dom term -> domain_rev_of_term_option loc context term @ dom) []
local_context
- | CicAst.Sort _ -> []
- | CicAst.Symbol (symbol, instance) -> [ Symbol (symbol, instance) ]
- | CicAst.UserInput -> assert false
+ | CicNotationPt.Sort _ -> []
+ | CicNotationPt.Symbol (symbol, instance) -> [ Symbol (symbol, instance) ]
+ | CicNotationPt.UserInput
+ | CicNotationPt.Literal _
+ | CicNotationPt.Layout _
+ | CicNotationPt.Magic _
+ | CicNotationPt.Variable _ -> assert false
and domain_rev_of_term_option loc context = function
| 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 = []);
let domain_rev =
match ast with
- | TacticAst.Theorem (_,_,ty,bo) ->
+ | GrafiteAst.Theorem (_,_,ty,bo) ->
(match bo with
None -> []
| Some bo -> domain_rev_of_term [] bo) @
domain_of_term [] ty
- | TacticAst.Inductive (params,tyl) ->
+ | GrafiteAst.Inductive (params,tyl) ->
let dom =
List.flatten (
List.rev_map
List.flatten (
List.rev_map
(fun (_,ty) -> domain_rev_of_term [] ty) cl) @
- domain_rev_of_term [] ty) tyl)
+ domain_rev_of_term [] ty) tyl) in
+ let dom =
+ List.fold_left
+ (fun dom (_,ty) ->
+ domain_rev_of_term [] ty @ dom
+ ) dom params
in
List.filter
(fun name ->
not ( List.exists (fun (name',_) -> name = Id name') params
|| List.exists (fun (name',_,_,_) -> name = Id name') tyl)
) dom
- | TacticAst.Record (params,_,ty,fields) ->
+ | GrafiteAst.Record (params,_,ty,fields) ->
let dom =
List.flatten
(List.rev_map (fun (_,ty) -> domain_rev_of_term [] ty) fields) in
- let dom' =
+ let dom =
List.filter
(fun name->
not ( List.exists (fun (name',_) -> name = Id name') params
|| List.exists (fun (name',_) -> name = Id name') fields)
) dom
in
- dom' @ domain_rev_of_term [] ty
+ List.fold_left
+ (fun dom (_,ty) ->
+ domain_rev_of_term [] ty @ dom
+ ) (dom @ domain_rev_of_term [] ty) params
in
rev_uniq domain_rev
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 *)
- CicAst.term ->
+ aliases:DisambiguateTypes.environment ->(* previous interpretation status *)
+ universe:DisambiguateTypes.multiple_environment option ->
+ 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:DisambiguateTypes.environment ->(* previous interpretation status *)
+ universe:DisambiguateTypes.multiple_environment option ->
uri:UriManager.uri option -> (* required only for inductive types *)
- TacticAst.obj ->
+ 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 ~universe
~uri ~pp_thing ~domain_of_thing ~interpretate_thing ~refine_thing thing
=
- debug_print "NEW DISAMBIGUATE INPUT";
+ debug_print "DISAMBIGUATE INPUT";
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 aliases));
+ debug_print (sprintf "DISAMBIGUATION UNIVERSE: %s"
+ (match universe with None -> "None" | Some _ -> "Some _"));
let current_dom =
- Environment.fold (fun item _ dom -> item :: dom) current_env []
+ Environment.fold (fun item _ dom -> item :: dom) aliases []
in
let todo_dom = domain_diff thing_dom current_dom in
(* (2) lookup function for any item (Id/Symbol/Num) *)
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, _) -> 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 universe 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 _ =
(* (3) test an interpretation filling with meta uninterpreted identifiers
*)
- let test_env current_env todo_dom ugraph =
+ let test_env aliases todo_dom ugraph =
let filled_env =
List.fold_left
(fun env item ->
(match item with
| Id _ | Num _ -> (fun _ _ _ -> Cic.Implicit (Some `Closed))
| Symbol _ -> (fun _ _ _ -> Cic.Implicit None))) env)
- current_env todo_dom
+ aliases todo_dom
in
try
let cic_thing =
let k,ugraph1 = refine_thing metasenv context uri cic_thing ugraph in
(k , ugraph1 )
with
- | Try_again -> Uncertain,ugraph
- | DisambiguateChoices.Invalid_choice -> Ko,ugraph
+ | Try_again -> Uncertain, ugraph
+ | Invalid_choice -> Ko, ugraph
in
(* (4) build all possible interpretations *)
- let rec aux current_env todo_dom base_univ =
+ let rec aux aliases todo_dom base_univ =
match todo_dom with
| [] ->
- (match test_env current_env [] base_univ with
+ (match test_env aliases [] base_univ with
| Ok (thing, metasenv),new_univ ->
- [ current_env, metasenv, thing, new_univ ]
+ [ aliases, metasenv, thing, new_univ ]
| Ko,_ | Uncertain,_ -> [])
| item :: remaining_dom ->
debug_print (sprintf "CHOOSED ITEM: %s"
| codomain_item :: tl ->
debug_print (sprintf "%s CHOSEN" (fst codomain_item)) ;
let new_env =
- Environment.add item codomain_item current_env
+ Environment.add item codomain_item aliases
in
(match test_env new_env remaining_dom univ with
| Ok (thing, metasenv),new_univ ->
let base_univ = initial_ugraph in
try
let res =
- match aux current_env todo_dom base_univ with
+ match aux aliases todo_dom base_univ with
| [] -> raise NoWellTypedInterpretation
- | [ e,me,t,u ] as l ->
- debug_print "UNA SOLA SCELTA";
- [ e,me,t,u]
+ | [ e,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.add env aliases,
+ metasenv, t, ugraph)
+ choices),
+ b
with
CicEnvironment.CircularDependency s ->
failwith "Disambiguate: circular dependency"
- let disambiguate_term ~dbd ~context ~metasenv
- ?(initial_ugraph = CicUniv.empty_ugraph) ~aliases term
+ let disambiguate_term ?(fresh_instances=false) ~dbd ~context ~metasenv
+ ?(initial_ugraph = CicUniv.empty_ugraph) ~aliases ~universe term
=
- disambiguate_thing ~dbd ~context ~metasenv ~initial_ugraph ~aliases
- ~uri:None ~pp_thing:CicAstPp.pp_term ~domain_of_thing:domain_of_term
- ~interpretate_thing:interpretate_term ~refine_thing:refine_term term
+ let term =
+ if fresh_instances then CicNotationUtil.freshen_term term else term
+ in
+ disambiguate_thing ~dbd ~context ~metasenv ~initial_ugraph ~aliases
+ ~universe ~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:TacticAstPp.pp_obj ~domain_of_thing:domain_of_obj
- ~interpretate_thing:interpretate_obj ~refine_thing:refine_obj
- obj
+ let disambiguate_obj ?(fresh_instances=false) ~dbd ~aliases ~universe ~uri
+ obj
+ =
+ let obj =
+ if fresh_instances then CicNotationUtil.freshen_obj obj else obj
+ in
+ disambiguate_thing ~dbd ~context:[] ~metasenv:[] ~aliases ~universe ~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 input_or_locate_uri ~(title:string) ?id = raise Exit
end
module Disambiguator = Make (Callbacks)
- let disambiguate_string ~dbd ?(context=[]) ?(metasenv=[]) ?initial_ugraph
- ?(aliases=DisambiguateTypes.Environment.empty) term =
- let ast = CicTextualParser2.parse_term (Stream.of_string term) in
+ let disambiguate_string ~dbd ?(context = []) ?(metasenv = []) ?initial_ugraph
+ ?(aliases = DisambiguateTypes.Environment.empty) term
+ =
+ 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 ~universe:None)
with Exit -> raise (Ambiguous_term term)
end
projects / helm.git / blobdiff