List.exists
(fun (_,_,ty) ->
try
- let s,_ = CicTypeChecker.type_of_aux' metas ctx ty CicUniv.empty_ugraph
+ let s,_ = CicTypeChecker.type_of_aux' metas ctx ty CicUniv.oblivion_ugraph
in s = Cic.Sort(Cic.Prop)
with _ ->
prerr_endline ("ERROR typing " ^ CicPp.ppterm ty); assert false) metas
Founif.matching
metasenv metas context term (S.lift lift_amount c) ugraph
in
- check_metasenv "founif :" metasenv';
+ if Utils.debug_metas then
+ check_metasenv "founif :" metasenv';
Some (Cic.Rel(1+lift_amount),subst',metasenv',ugraph',candidate)
in
let c, other =
can be either Founif.matching or Inference.unification
*)
(* XXX termty unused *)
-let rec find_all_matches ?(unif_fun=Founif.unification)
+let rec find_all_matches ?(unif_fun=Founif.unification) ?(demod=false)
metasenv context ugraph lift_amount term termty =
let module C = Cic in
let module U = Utils in
let module M = CicMetaSubst in
let module HL = HelmLibraryObjects in
(* prerr_endline ("matching " ^ CicPp.ppterm term); *)
- let cmp = !Utils.compare_terms in
+ let cmp x y =
+ let r = !Utils.compare_terms x y in
+(*
+ prerr_endline (
+ CicPp.ppterm x ^ " " ^
+ Utils.string_of_comparison r ^ " " ^
+ CicPp.ppterm y );
+*)
+ r
+ in
let check = match termty with C.Implicit None -> false | _ -> true in
function
| [] -> []
let c' = apply_subst s c
and other' = apply_subst s other in
let order = cmp c' other' in
- if order <> U.Lt && order <> U.Le then
+ if (demod && order = U.Gt) ||
+ (not demod && (order <> U.Lt && order <> U.Le))
+ then
res::(find_all_matches ~unif_fun metasenv context ugraph
lift_amount term termty tl)
else
find_all_matches ~unif_fun metasenv context ugraph
- lift_amount term termty tl
+ lift_amount term termty tl
with
| Founif.MatchingFailure
| CicUnification.UnificationFailure _
;;
let find_all_matches
- ?unif_fun metasenv context ugraph lift_amount term termty l
+ ?unif_fun ?demod metasenv context ugraph lift_amount term termty l
=
find_all_matches
- ?unif_fun metasenv context ugraph lift_amount term termty l
+ ?unif_fun ?demod metasenv context ugraph lift_amount term termty l
(*prerr_endline "CANDIDATES:";
List.iter (fun (_,x)->prerr_endline (Founif.string_of_equality x)) l;
prerr_endline ("MATCHING:" ^ CicPp.ppterm term ^ " are " ^ string_of_int
let _, _, (ty, left, right, _), tmetas, _ = Equality.open_equality target in
let _, context, ugraph = env in
let metasenv = tmetas in
- check_for_duplicates metasenv "subsumption_aux_all";
+ if Utils.debug_metas then
+ check_for_duplicates metasenv "subsumption_aux_all";
let predicate, unif_fun =
if use_unification then
Unification, Founif.unification
;;
let unification_all x y z =
- prerr_endline "unification_all"; subsumption_aux_all true x y z
+ subsumption_aux_all true x y z
;;
let rec demodulation_aux bag ?from ?(typecheck=false)
let module S = CicSubstitution in
let module M = CicMetaSubst in
let module HL = HelmLibraryObjects in
- check_for_duplicates metasenv "in input a demodulation aux";
+ if Utils.debug_metas then
+ check_for_duplicates metasenv "in input a demodulation aux";
let candidates =
get_candidates
~env:(metasenv,context,ugraph) (* Unification *) Matching table term
- in let candidates = List.filter (fun _,x -> not (not_unit_eq context x)) candidates
- in
+ in
+(* let candidates = List.filter (fun _,x -> not (not_unit_eq context x)) candidates in *)
let res =
match term with
| C.Meta _ -> None
| C.Meta (i, l) -> res, lifted_term
| term ->
let termty, ugraph =
-(* C.Implicit None, ugraph *)
- CicTypeChecker.type_of_aux' metasenv context term ugraph
+ C.Implicit None, ugraph
+(* CicTypeChecker.type_of_aux' metasenv context term ugraph *)
in
let candidates = get_candidates Unification table term in
(* List.iter (fun (_,e) -> debug_print (lazy (Equality.string_of_equality e))) candidates; *)
| None -> do_right ()
;;
-type next = L | R
-type solved = Yes of Equality.goal | No of Equality.goal list
-
(* returns all the 1 step demodulations *)
module C = Cic;;
module S = CicSubstitution;;
let termty, ugraph = C.Implicit None, ugraph in
let res =
find_all_matches
- metasenv context ugraph lift_amount term termty candidates
+ ~unif_fun:Founif.matching ~demod:true
+ metasenv context ugraph lift_amount term termty candidates
in
match term with
| C.Appl l ->
(res, [], List.map (S.lift 1) l) l
in
res
- | C.Prod (nn, s, t)
- | C.Lambda (nn, s, t) ->
- let context = (Some (nn, C.Decl s))::context in
- let mk s t =
- match term with
- | Cic.Prod _ -> Cic.Prod (nn,s,t) | _ -> Cic.Lambda (nn,s,t)
- in
- res @
- List.map
- (fun (rel, subst, m, ug, c) ->
- mk (S.lift 1 s) rel, subst, m, ug, c)
- (demodulation_all_aux
- metasenv context ugraph table (lift_amount+1) t)
- (* we could demodulate also in s, but then t may be badly
- * typed... *)
| t -> res
;;
-let solve_demodulating bag env table initgoal steps =
+let demod_all steps bag env table goal =
let _, context, ugraph = env in
- let solved goal res side =
- let newg = build_newgoal bag context goal side Equality.Demodulation res in
- match newg with
- | (goalproof,m,Cic.Appl[Cic.MutInd(uri,n,ens);eq_ty;left;right])
- when LibraryObjects.is_eq_URI uri ->
- (try
- let _ =
- Founif.unification [] m context left right CicUniv.empty_ugraph
- in
- Yes newg
- with CicUnification.UnificationFailure _ -> No [newg])
- | _ -> No [newg]
+ let is_visited l (_,_,t) =
+ List.exists (fun (_,_,s) -> Equality.meta_convertibility s t) l
in
- let solved goal res_list side =
- let newg = List.map (fun x -> solved goal x side) res_list in
- try
- List.find (function Yes _ -> true | _ -> false) newg
- with Not_found ->
- No (List.flatten (List.map (function No s -> s | _-> assert false) newg))
+ let rec aux steps visited bag = function
+ | _ when steps = 0 -> visited, bag, []
+ | [] -> visited, bag, []
+ | goal :: rest when is_visited visited goal -> aux steps visited bag rest
+ | goal :: rest ->
+ let visited = goal :: visited in
+ let _,menv,t = goal in
+ let res = demodulation_all_aux menv context ugraph table 0 t in
+ let steps = if res = [] then steps-1 else steps in
+ let new_goals =
+ List.map (build_newg bag context goal Equality.Demodulation) res
+ in
+ let visited, bag, res = aux steps visited bag (new_goals @ rest) in
+ visited, bag, goal :: res
in
- let rec first f acc l =
- match l with
- | [] -> acc,None
- | x::tl ->
- match f acc x with
- | acc,None -> first f acc tl
- | acc,Some x as ok -> ok
+ aux steps [] bag [goal]
+;;
+
+
+let solve_demodulating bag env table initgoal steps =
+ let proof,menv,eq,ty,left,right = open_goal initgoal in
+ let uri =
+ match eq with
+ | Cic.MutInd (u,_,_) -> u
+ | _ -> assert false
in
- let rec aux steps next visited goal =
- if steps = 0 then visited, None else
- let goalproof,menv,_,_,left,right = open_goal goal in
- if (List.mem (left,right,next) visited || List.mem (right,left,next) visited)
- then visited, None else
- let do_step t =
- demodulation_all_aux menv context ugraph table 0 t
+ let _, context, ugraph = env in
+ let v1, bag, l_demod = demod_all steps bag env table ([],menv,left) in
+ let v2, bag, r_demod = demod_all steps bag env table ([],menv,right) in
+ let is_solved left right ml mr =
+ let m = ml @ (List.filter
+ (fun (x,_,_) -> not (List.exists (fun (y,_,_) -> x=y)ml)) mr)
in
- let visited = (left,right,next) :: visited in
- match next with
- | L ->
- (match do_step left with
- | _::_ as res ->
- (match solved goal res Utils.Right with
- | No newgoals ->
- (match first (aux (steps - 1) L) visited newgoals with
- | _,Some g as success -> success
- | visited,None -> aux steps R visited goal)
- | Yes newgoal -> visited, Some newgoal)
- | [] -> aux steps R visited goal)
- | R ->
- (match do_step right with
- | _::_ as res ->
- (match solved goal res Utils.Left with
- | No newgoals ->
- (match first (aux (steps - 1) L) visited newgoals with
- | visited, Some g as success -> success
- | visited, None as failure -> failure)
- | Yes newgoal -> visited, Some newgoal)
- | [] -> visited, None)
+ try
+ let s,_,_ =
+ Founif.unification [] m context left right CicUniv.empty_ugraph in
+ Some (bag, m,s,Equality.Exact (Equality.refl_proof uri ty left))
+ with CicUnification.UnificationFailure _ ->
+ let solutions =
+ unification_all env table (Equality.mk_tmp_equality
+ (0,(Cic.Implicit None,left,right,Utils.Incomparable),m))
+ in
+ if solutions = [] then None
+ else
+ let s, e, swapped = List.hd solutions in
+ let _,p,(ty,l,r,_),me,id = Equality.open_equality e in
+ let bag, p =
+ if swapped then Equality.symmetric bag ty l id uri me else bag, p
+ in
+ Some (bag, m,s, p)
in
- let _, res = aux steps L [] initgoal in
- res
+ let newgoal =
+ HExtlib.list_findopt
+ (fun (pr,mr,r) _ ->
+ try
+ let pl,ml,l,bag,m,s,p =
+ match
+ HExtlib.list_findopt (fun (pl,ml,l) _ ->
+ match is_solved l r ml mr with
+ | None -> None
+ | Some (bag,m,s,p) -> Some (pl,ml,l,bag,m,s,p)
+ ) l_demod
+ with Some x -> x | _ -> raise Not_found
+ in
+ let pl =
+ List.map
+ (fun (rule,pos,id,subst,pred) ->
+ let pred =
+ match pred with
+ | Cic.Lambda (name,src,tgt) ->
+ Cic.Lambda (name,src,
+ Cic.Appl[eq;ty;tgt;CicSubstitution.lift 1 right])
+ | _ -> assert false
+ in
+ rule,pos,id,subst,pred)
+ pl
+ in
+ let pr =
+ List.map
+ (fun (rule,pos,id,subst,pred) ->
+ let pred =
+ match pred with
+ | Cic.Lambda (name,src,tgt) ->
+ Cic.Lambda (name,src,
+ Cic.Appl[eq;ty;CicSubstitution.lift 1 l;tgt])
+ | _ -> assert false
+ in
+ rule,pos,id,subst,pred)
+ pr
+ in
+ Some (bag,pr@pl@proof,m,s,p)
+ with Not_found -> None)
+ r_demod
+ in
+ newgoal
;;
-let get_stats () = "" ;;
+
+