(* the integer is an offset to be added to each location *)
exception NoWellTypedInterpretation of
- int * (Token.flocation option * string Lazy.t) list
+ int *
+ ((Token.flocation list * string * string) list *
+ (DisambiguateTypes.domain_item * DisambiguateTypes.codomain_item) list *
+ Token.flocation option * string Lazy.t * bool) list
exception PathNotWellFormed
(** raised when an environment is not enough informative to decide *)
| CicNotationPt.LetRec (kind, defs, body) ->
let context' =
List.fold_left
- (fun acc ((name, _), _, _) ->
+ (fun acc (_, (name, _), _, _) ->
CicNotationUtil.cic_name_of_name name :: acc)
context defs
in
in
let inductiveFuns =
List.map
- (fun ((name, typ), body, decr_idx) ->
- let cic_body = aux ~localize loc context' body in
+ (fun (params, (name, typ), body, decr_idx) ->
+ let add_binders kind t =
+ List.fold_right
+ (fun var t -> CicNotationPt.Binder (kind, var, t)) params t
+ in
+ let cic_body =
+ aux ~localize loc context' (add_binders `Lambda body) in
let cic_type =
- aux_option ~localize loc context (Some `Type) typ in
+ aux_option ~localize loc context (Some `Type)
+ (HExtlib.map_option (add_binders `Pi) typ) in
let name =
match CicNotationUtil.cic_name_of_name name with
| Cic.Anonymous ->
let context,res =
List.fold_left
(fun (context,res) (name,t) ->
- Cic.Name name :: context,
- (name, interpretate_term context env None false t)::res
+ let t =
+ match t with
+ None -> CicNotationPt.Implicit
+ | Some t -> t in
+ let name = CicNotationUtil.cic_name_of_name name in
+ name::context,(name, interpretate_term context env None false t)::res
) ([],[]) params
in
context,List.rev res in
let add_params =
- List.fold_right
- (fun (name,ty) t -> Cic.Prod (Cic.Name name,ty,t)) params in
+ List.fold_right (fun (name,ty) t -> Cic.Prod (name,ty,t)) params in
let name_to_uris =
snd (
List.fold_left
let context,res =
List.fold_left
(fun (context,res) (name,t) ->
- (Cic.Name name :: context),
- (name, interpretate_term context env None false t)::res
+ let t =
+ match t with
+ None -> CicNotationPt.Implicit
+ | Some t -> t in
+ let name = CicNotationUtil.cic_name_of_name name in
+ name::context,(name, interpretate_term context env None false t)::res
) ([],[]) params
in
context,List.rev res in
let add_params =
List.fold_right
- (fun (name,ty) t -> Cic.Prod (Cic.Name name,ty,t)) params in
+ (fun (name,ty) t -> Cic.Prod (name,ty,t)) params in
let ty' = add_params (interpretate_term context env None false ty) in
let fields' =
snd (
List.fold_left
- (fun (context,res) (name,ty,_coercion) ->
+ (fun (context,res) (name,ty,_coercion,arity) ->
let context' = Cic.Name name :: context in
context',(name,interpretate_term context env None false ty)::res
) (context,[]) fields) in
concl fields' in
let con' = add_params con in
let tyl = [name,true,ty',["mk_" ^ name,con']] in
- let field_names = List.map (fun (x,_,y) -> x,y) fields in
+ let field_names = List.map (fun (x,_,y,z) -> x,y,z) fields in
Cic.InductiveDefinition
(tyl,[],List.length params,[`Class (`Record field_names)])
| CicNotationPt.Theorem (flavour, name, ty, bo) ->
| `Exists -> [ loc, Symbol ("exists", 0) ]
| _ -> []
in
- let type_dom = domain_rev_of_term_option loc context typ in
+ let type_dom = domain_rev_of_term_option ~loc context typ in
let body_dom =
domain_rev_of_term ~loc
(CicNotationUtil.cic_name_of_name var :: context) body
in
where_dom @ type_dom @ body_dom
| CicNotationPt.LetRec (kind, defs, where) ->
- let context' =
+ let add_defs context =
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
+ (fun acc (_, (var, _), _, _) ->
+ CicNotationUtil.cic_name_of_name var :: acc
+ ) context defs in
+ let where_dom = domain_rev_of_term ~loc (add_defs context) where in
let defs_dom =
List.fold_left
- (fun dom ((_, typ), body, _) ->
+ (fun dom (params, (_, typ), body, _) ->
+ let context' =
+ add_defs
+ (List.fold_left
+ (fun acc (var,_) -> CicNotationUtil.cic_name_of_name var :: acc)
+ context params)
+ in
domain_rev_of_term ~loc context' body @
- domain_rev_of_term_option loc context typ)
- [] defs
+ domain_rev_of_term_option ~loc context typ @
+ List.rev
+ (snd
+ (List.fold_left
+ (fun (context,res) (var,ty) ->
+ CicNotationUtil.cic_name_of_name var :: context,
+ res @ domain_rev_of_term_option ~loc context ty)
+ (add_defs context,[]) params))
+ ) [] defs
in
where_dom @ defs_dom
| CicNotationPt.Ident (name, subst) ->
| CicNotationPt.Magic _
| CicNotationPt.Variable _ -> assert false
-and domain_rev_of_term_option loc context = function
+and domain_rev_of_term_option ~loc context = function
| None -> []
| Some t -> domain_rev_of_term ~loc context t
let dom =
List.fold_left
(fun dom (_,ty) ->
- domain_rev_of_term [] ty @ dom
+ match ty with
+ None -> dom
+ | Some ty -> domain_rev_of_term [] ty @ dom
) dom params
in
List.filter
(fun (_,name) ->
- not ( List.exists (fun (name',_) -> name = Id name') params
+ not ( List.exists (fun (name',_) ->
+ match CicNotationUtil.cic_name_of_name name' with
+ Cic.Anonymous -> false
+ | Cic.Name name' -> name = Id name') params
|| List.exists (fun (name',_,_,_) -> name = Id name') tyl)
) dom
| CicNotationPt.Record (params,_,ty,fields) ->
let dom =
List.flatten
- (List.rev_map (fun (_,ty,_) -> domain_rev_of_term [] ty) fields) in
+ (List.rev_map (fun (_,ty,_,_) -> domain_rev_of_term [] ty) fields) in
let dom =
- List.fold_left
- (fun dom (_,ty) ->
- domain_rev_of_term [] ty @ dom
- ) (dom @ domain_rev_of_term [] ty) params
+ List.fold_right
+ (fun (_,ty) dom ->
+ match ty with
+ None -> dom
+ | Some ty -> dom @ domain_rev_of_term [] ty
+ ) params (dom @ domain_rev_of_term [] ty)
in
List.filter
(fun (_,name) ->
- not ( List.exists (fun (name',_) -> name = Id name') params
- || List.exists (fun (name',_,_) -> name = Id name') fields)
+ not ( List.exists (fun (name',_) ->
+ match CicNotationUtil.cic_name_of_name name' with
+ Cic.Anonymous -> false
+ | Cic.Name name' -> name = Id name') params
+ || List.exists (fun (name',_,_,_) -> name = Id name') fields)
) dom
in
rev_uniq domain_rev
(* dom1 \ dom2 *)
let domain_diff dom1 dom2 =
(* let domain_diff = Domain.diff *)
- let is_in_dom2 =
- List.fold_left (fun pred elt -> (fun elt' -> elt' = elt || pred elt'))
- (fun _ -> false) dom2
+ let is_in_dom2 elt =
+ List.exists
+ (function
+ | Symbol (symb, 0) ->
+ (match elt with
+ Symbol (symb',_) when symb = symb' -> true
+ | _ -> false)
+ | Num i ->
+ (match elt with
+ Num _ -> true
+ | _ -> false)
+ | item -> elt = item
+ ) dom2
in
List.filter (fun (_,elt) -> not (is_in_dom2 elt)) dom1
match item with
| Id id -> choices_of_id dbd id
| Symbol (symb, _) ->
- List.map DisambiguateChoices.mk_choice
+ (try
+ List.map DisambiguateChoices.mk_choice
(TermAcicContent.lookup_interpretations symb)
+ with
+ TermAcicContent.Interpretation_not_found -> [])
| Num instance ->
DisambiguateChoices.lookup_num_choices ()
in
(match test_env aliases [] base_univ with
| Ok (thing, metasenv),new_univ ->
[ aliases, diff, metasenv, thing, new_univ ], []
- | Ko (loc,msg),_ | Uncertain (loc,msg),_ -> [],[loc,msg])
+ | Ko (loc,msg),_
+ | Uncertain (loc,msg),_ -> [],[aliases,diff,loc,msg,true])
| (locs,item) :: remaining_dom ->
debug_print (lazy (sprintf "CHOOSED ITEM: %s"
(string_of_domain_item item)));
| Some choices -> choices in
match choices with
[] ->
- [], [Some (List.hd locs),
- lazy ("No choices for " ^ string_of_domain_item item)]
+ [], [aliases, diff,
+ Some (List.hd locs),
+ lazy ("No choices for " ^ string_of_domain_item item),
+ true]
| [codomain_item] ->
(* just one choice. We perform a one-step look-up and
if the next set of choices is also a singleton we
remaining_dom new_univ)
| Uncertain (loc,msg),new_univ ->
(match remaining_dom with
- | [] -> [], [loc,msg]
+ | [] -> [], [new_env,new_diff,loc,msg,true]
| _ ->
aux new_env new_diff lookup_in_todo_dom
remaining_dom new_univ)
- | Ko (loc,msg),_ -> [], [loc,msg])
+ | Ko (loc,msg),_ -> [], [new_env,new_diff,loc,msg,true])
| _::_ ->
+ let mark_not_significant (successes, failures) =
+ successes,
+ List.map
+ (fun (env, diff, loc, msg, _b) ->
+ env, diff, loc, msg, false)
+ failures in
+ let classify_errors outcome =
+ if List.exists (function `Ok _ -> true | _ -> false) outcome
+ then
+ List.fold_right
+ (fun res acc ->
+ match res with
+ | `Ok res -> res @@ acc
+ | `Ko res -> mark_not_significant res @@ acc)
+ outcome ([],[])
+ else
+ List.fold_right
+ (fun res acc ->
+ match res with
+ | `Ok res | `Ko res -> res @@ acc)
+ outcome ([],[]) in
let rec filter univ = function
- | [] -> [],[]
+ | [] -> []
| codomain_item :: tl ->
debug_print(lazy (sprintf "%s CHOSEN" (fst codomain_item)));
let new_env = Environment.add item codomain_item aliases in
let new_diff = (item,codomain_item)::diff in
(match test_env new_env remaining_dom univ with
| Ok (thing, metasenv),new_univ ->
- (match remaining_dom with
- | [] -> [ new_env, new_diff, metasenv, thing, new_univ ], []
- | _ -> aux new_env new_diff None remaining_dom new_univ
- ) @@
- filter univ tl
+ let res =
+ (match remaining_dom with
+ | [] -> [new_env,new_diff,metasenv,thing,new_univ], []
+ | _ ->
+ aux new_env new_diff None remaining_dom new_univ
+ )
+ in
+ `Ok res :: filter univ tl
| Uncertain (loc,msg),new_univ ->
- (match remaining_dom with
- | [] -> [],[loc,msg]
- | _ -> aux new_env new_diff None remaining_dom new_univ
- ) @@
- filter univ tl
- | Ko (loc,msg),_ -> ([],[loc,msg]) @@ filter univ tl)
+ let res =
+ (match remaining_dom with
+ | [] -> [],[new_env,new_diff,loc,msg,true]
+ | _ ->
+ aux new_env new_diff None remaining_dom new_univ
+ )
+ in
+ `Ok res :: filter univ tl
+ | Ko (loc,msg),_ ->
+ let res = [],[new_env,new_diff,loc,msg,true] in
+ `Ko res :: filter univ tl)
in
- filter base_univ choices
+ classify_errors (filter base_univ choices)
in
+ let aux' aliases diff lookup_in_todo_dom todo_dom base_univ =
+ match test_env aliases todo_dom base_univ with
+ | Ok _,_
+ | Uncertain _,_ ->
+ aux aliases diff lookup_in_todo_dom todo_dom base_univ
+ | Ko (loc,msg),_ -> ([],[aliases,diff,loc,msg,true]) in
let base_univ = initial_ugraph in
try
let res =
- match aux aliases [] None todo_dom base_univ with
- | [],errors -> raise (NoWellTypedInterpretation (0,errors))
+ match aux' aliases [] None todo_dom base_univ with
+ | [],errors ->
+ let errors =
+ List.map
+ (fun (env,diff,loc,msg,significant) ->
+ let env' =
+ HExtlib.filter_map
+ (fun (locs,domain_item) ->
+ try
+ let description =
+ fst (Environment.find domain_item env)
+ in
+ Some (locs,descr_of_domain_item domain_item,description)
+ with
+ Not_found -> None)
+ thing_dom
+ in
+ env',diff,loc,msg,significant
+ ) errors
+ in
+ raise (NoWellTypedInterpretation (0,errors))
| [_,diff,metasenv,t,ugraph],_ ->
debug_print (lazy "SINGLE INTERPRETATION");
[diff,metasenv,t,ugraph], false
projects / helm.git / blobdiff