(* subst, (rule,eq1, eq2,predicate) *)
and goal_proof = (rule * Utils.pos * int * Subst.substitution * Cic.term) list
;;
+(* the hashtbl eq_id -> proof, max_eq_id *)
type equality_bag = (int,equality) Hashtbl.t * int ref
type goal = goal_proof * Cic.metasenv * Cic.term
id w (CicPp.ppterm ty)
(CicPp.ppterm left)
(Utils.string_of_comparison o) (CicPp.ppterm right)
- (String.concat ", " (List.map (fun (i,_,_) -> string_of_int i) m))
-(* "..." *)
+ (String.concat ", " (List.map (fun (i,_,_) -> string_of_int i) m))
+(* "..." *)
| Some (_, context, _) ->
let names = Utils.names_of_context context in
let w, _, (ty, left, right, o), m , id = open_equality eq in
id w (CicPp.pp ty names)
(CicPp.pp left names) (Utils.string_of_comparison o)
(CicPp.pp right names)
-(* (String.concat ", " (List.map (fun (i,_,_) -> string_of_int i) m)) *)
- "..."
+ (String.concat ", " (List.map (fun (i,_,_) -> string_of_int i) m))
+(* "..." *)
;;
let compare (_,_,_,s1,_,_) (_,_,_,s2,_,_) =
let obj, _ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in
match obj with
| Cic.Constant (_, _, _, uris, _) ->
- assert (List.length uris <= List.length termlist);
+ (* assert (List.length uris <= List.length termlist); *)
let rec aux = function
| [], tl -> [], tl
| (uri::uris), (term::tl) ->
;;
let mk_eq_ind uri ty what pred p1 other p2 =
- Cic.Appl [Cic.Const (uri, []); ty; what; pred; p1; other; p2]
+ let ens, args = build_ens uri [ty; what; pred; p1; other; p2] in
+ Cic.Appl (Cic.Const (uri, ens) :: args)
;;
let p_of_sym ens tl =
CicSubstitution.subst (Cic.Rel 1) t
;;
-let head_of_apply = function | Cic.Appl (hd::_) -> hd | t -> t;;
-let tail_of_apply = function | Cic.Appl (_::tl) -> tl | t -> [];;
-let count_args t = List.length (tail_of_apply t);;
-let rec build_nat =
- let u = UriManager.uri_of_string "cic:/matita/nat/nat/nat.ind" in
- function
- | 0 -> Cic.MutConstruct(u,0,1,[])
- | n ->
- Cic.Appl [Cic.MutConstruct(u,0,2,[]);build_nat (n-1)]
-;;
-let tyof context menv t =
- try
- fst(CicTypeChecker.type_of_aux' menv context t CicUniv.empty_ugraph)
- with
- | CicTypeChecker.TypeCheckerFailure _
- | CicTypeChecker.AssertFailure _ -> assert false
-;;
-let rec lambdaof left context = function
- | Cic.Prod (n,s,t) ->
- Cic.Lambda (n,s,lambdaof left context t)
- | Cic.Appl [Cic.MutInd (uri, 0,_);ty;l;r]
- when LibraryObjects.is_eq_URI uri -> if left then l else r
- | t ->
- let names = Utils.names_of_context context in
- prerr_endline ("lambdaof: " ^ (CicPp.pp t names));
- assert false
-;;
-
let canonical t context menv =
+ let remove_cycles t =
+ let is_transitive =
+ function
+ Cic.Appl (Cic.Const (uri_trans,_)::_)
+ when LibraryObjects.is_trans_eq_URI uri_trans ->
+ true
+ | _ -> false in
+ let rec collect =
+ function
+ Cic.Appl (Cic.Const (uri_trans,ens)::tl)
+ when LibraryObjects.is_trans_eq_URI uri_trans ->
+ let ty,l,m,r,p1,p2 = open_trans ens tl in
+ (if is_transitive p1 then fst (collect p1) else [l,p1]) @
+ (if is_transitive p2 then fst (collect p2) else [m,p2]),
+ (r, uri_trans, ty)
+ | t -> assert false in
+ let rec cut_to_last_duplicate l acc =
+ function
+ [] -> List.rev acc
+ | (l',p)::tl when l=l' ->
+if acc <> [] then
+prerr_endline ("!!! RISPARMIO " ^ string_of_int (List.length acc) ^ " PASSI");
+ cut_to_last_duplicate l [l',p] tl
+ | (l',p)::tl ->
+ cut_to_last_duplicate l ((l',p)::acc) tl
+ in
+ let rec rebuild =
+ function
+ (l,_)::_::_ as steps, ((r,uri_trans,ty) as last) ->
+ (match cut_to_last_duplicate l [] steps with
+ (l,p1)::((m,_)::_::_ as tl) ->
+ mk_trans uri_trans ty l m r p1 (rebuild (tl,last))
+ | [l,p1 ; m,p2] -> mk_trans uri_trans ty l m r p1 p2
+ | [l,p1] -> p1
+ | [] -> assert false)
+ | _ -> assert false
+ in
+ if is_transitive t then
+ rebuild (collect t)
+ else
+ t
+ in
let rec remove_refl t =
match t with
| Cic.Appl (((Cic.Const(uri_trans,ens))::tl) as args)
Cic.LetIn (name,remove_refl bo,remove_refl rest)
| _ -> t
in
- let rec canonical context t =
+ let rec canonical_trough_lambda context = function
+ | Cic.Lambda(name,ty,bo) ->
+ let context' = (Some (name,Cic.Decl ty))::context in
+ Cic.Lambda(name,ty,canonical_trough_lambda context' bo)
+ | t -> canonical context t
+
+ and canonical context t =
match t with
| Cic.LetIn(name,bo,rest) ->
+ let bo = canonical_trough_lambda context bo in
let context' = (Some (name,Cic.Def (bo,None)))::context in
- Cic.LetIn(name,canonical context bo,canonical context' rest)
+ Cic.LetIn(name,bo,canonical context' rest)
| Cic.Appl (((Cic.Const(uri_sym,ens))::tl) as args)
when LibraryObjects.is_sym_eq_URI uri_sym ->
(match p_of_sym ens tl with
mk_trans uri_trans ty r m l
(canonical context (mk_sym uri_sym ty m r p2))
(canonical context (mk_sym uri_sym ty l m p1))
- | Cic.Appl (([Cic.Const(uri_feq,ens);ty1;ty2;f;x;y;p])) ->
+ | Cic.Appl (([Cic.Const(uri_feq,ens);ty1;ty2;f;x;y;p]))
+ when LibraryObjects.is_eq_f_URI uri_feq ->
let eq = LibraryObjects.eq_URI_of_eq_f_URI uri_feq in
let eq_f_sym =
Cic.Const (LibraryObjects.eq_f_sym_URI ~eq, [])
in
- Cic.Appl (([eq_f_sym;ty1;ty2;f;x;y;p]))
-
-(*
- let sym_eq = Cic.Const(uri_sym,ens) in
- let eq_f = Cic.Const(uri_feq,[]) in
- let b = Cic.MutConstruct (UriManager.uri_of_string
- "cic:/matita/datatypes/bool/bool.ind",0,1,[])
- in
- let u = ty1 in
- let ctx = f in
- let n = build_nat (count_args p) in
- let h = head_of_apply p in
- let predl = lambdaof true context (tyof context menv h) in
- let predr = lambdaof false context (tyof context menv h) in
- let args = tail_of_apply p in
- let appl =
- Cic.Appl
- ([Cic.Const(UriManager.uri_of_string
- "cic:/matita/paramodulation/rewrite.con",[]);
- eq; sym_eq; eq_f; b; u; ctx; n; predl; predr; h] @
- args)
- in
- appl
-*)
-(*
- | Cic.Appl (((Cic.Const(uri_ind,ens)) as he)::tl)
- when LibraryObjects.is_eq_ind_URI uri_ind ||
- LibraryObjects.is_eq_ind_r_URI uri_ind ->
- let ty, what, pred, p1, other, p2 =
- match tl with
- | [ty;what;pred;p1;other;p2] -> ty, what, pred, p1, other, p2
- | _ -> assert false
- in
- let pred,l,r =
- match pred with
- | Cic.Lambda (name,s,Cic.Appl [Cic.MutInd(uri,0,ens);ty;l;r])
- when LibraryObjects.is_eq_URI uri ->
- Cic.Lambda
- (name,s,Cic.Appl [Cic.MutInd(uri,0,ens);ty;r;l]),l,r
- | _ ->
- prerr_endline (CicPp.ppterm pred);
- assert false
- in
- let l = CicSubstitution.subst what l in
- let r = CicSubstitution.subst what r in
- Cic.Appl
- [he;ty;what;pred;
- canonical (mk_sym uri_sym ty l r p1);other;canonical p2]
-*)
+ let rc = Cic.Appl [eq_f_sym;ty1;ty2;f;x;y;p] in
+ prerr_endline ("CANONICAL " ^ CicPp.ppterm rc);
+ rc
| Cic.Appl [Cic.MutConstruct (uri, 0, 1,_);_;_] as t
when LibraryObjects.is_eq_URI uri -> t
| _ -> Cic.Appl (List.map (canonical context) args))
| Cic.Appl l -> Cic.Appl (List.map (canonical context) l)
| _ -> t
in
- remove_refl (canonical context t)
+ remove_cycles (remove_refl (canonical context t))
;;
-let ty_of_lambda = function
- | Cic.Lambda (_,ty,_) -> ty
- | _ -> assert false
-;;
-
let compose_contexts ctx1 ctx2 =
ProofEngineReduction.replace_lifting
~equality:(=) ~what:[Cic.Implicit(Some `Hole)] ~with_what:[ctx2] ~where:ctx1
;;
let mk_eq uri ty l r =
- Cic.Appl [Cic.MutInd(uri,0,[]);ty;l;r]
+ let ens, args = build_ens uri [ty; l; r] in
+ Cic.Appl (Cic.MutInd(uri,0,ens) :: args)
;;
let mk_refl uri ty t =
- Cic.Appl [Cic.MutConstruct(uri,0,1,[]);ty;t]
+ let ens, args = build_ens uri [ty; t] in
+ Cic.Appl (Cic.MutConstruct(uri,0,1,ens) :: args)
;;
let open_eq = function
;;
let mk_feq uri_feq ty ty1 left pred right t =
- Cic.Appl [Cic.Const(uri_feq,[]);ty;ty1;pred;left;right;t]
+ let ens, args = build_ens uri_feq [ty;ty1;pred;left;right;t] in
+ Cic.Appl (Cic.Const(uri_feq,ens) :: args)
;;
let rec look_ahead aux = function
* ctx is a term with an hole. Cic.Implicit(Some `Hole) is the empty context
* ctx_ty is the type of ctx
*)
- let rec aux uri ty left right ctx_d ctx_ty = function
+ let rec aux uri ty left right ctx_d ctx_ty t =
+ match t with
| Cic.Appl ((Cic.Const(uri_sym,ens))::tl)
when LibraryObjects.is_sym_eq_URI uri_sym ->
let ty,l,r,p = open_sym ens tl in
let c_what = put_in_ctx ctx_c what in
(* now put the proofs in the compound context *)
let p1 = (* p1: dc_what = d_m *)
- if is_not_fixed_lp then
- aux uri ty2 c_what m ctx_d ctx_ty p1
+ if is_not_fixed_lp then
+ aux uri ty2 c_what m ctx_d ctx_ty p1
else
mk_sym uri_sym ctx_ty d_m dc_what
(aux uri ty2 m c_what ctx_d ctx_ty p1)
if avoid_eq_ind then
mk_sym uri_sym ctx_ty dc_what dc_other
(aux uri ty1 what other ctx_dc ctx_ty p2)
- else
+ else
aux uri ty1 other what ctx_dc ctx_ty p2
in
(* if pred = \x.C[x]=m --> t : C[other]=m --> trans other what m
p
;;
-let parametrize_proof p l r ty =
- let uniq l = HExtlib.list_uniq (List.sort Pervasives.compare l) in
+let parametrize_proof p l r =
+ let uniq l = HExtlib.list_uniq (List.sort (fun (i,_) (j,_) -> Pervasives.compare i j) l) in
let mot = CicUtil.metas_of_term_set in
let parameters = uniq (mot p @ mot l @ mot r) in
(* ?if they are under a lambda? *)
HExtlib.list_uniq (List.sort Pervasives.compare parameters)
in
*)
+ (* resorts l such that *hopefully* dependencies can be inferred *)
+ let guess_dependency p l =
+ match p with
+ | Cic.Appl ((Cic.Const(uri_ind,ens))::tl)
+ when LibraryObjects.is_eq_ind_URI uri_ind ||
+ LibraryObjects.is_eq_ind_r_URI uri_ind ->
+ let ty,_,_,_,_,_ = open_eq_ind tl in
+ let metas = CicUtil.metas_of_term ty in
+ let nondep, dep =
+ List.partition (fun (i,_) -> List.exists (fun (j,_) -> j=i) metas) l
+ in
+ nondep@dep
+ | _ -> l
+ in
+ let parameters = guess_dependency p parameters in
let what = List.map (fun (i,l) -> Cic.Meta (i,l)) parameters in
let with_what, lift_no =
List.fold_right (fun _ (acc,n) -> ((Cic.Rel n)::acc),n+1) what ([],1)
match t1,t2 with Cic.Meta (i,_),Cic.Meta(j,_) -> i=j | _ -> false)
~what ~with_what ~where:p
in
- let ty_of_m _ = ty (*function
- | Cic.Meta (i,_) -> List.assoc i menv
- | _ -> assert false *)
- in
+ let ty_of_m _ = Cic.Implicit (Some `Type) in
let args, proof,_ =
List.fold_left
(fun (instance,p,n) m ->
let string_of_id (id_to_eq,_) names id =
if id = 0 then "" else
try
- let (_,p,(_,l,r,_),m,_) = open_equality (Hashtbl.find id_to_eq id) in
+ let (_,p,(t,l,r,_),m,_) = open_equality (Hashtbl.find id_to_eq id) in
match p with
| Exact t ->
Printf.sprintf "%d = %s: %s = %s [%s]" id
(CicPp.pp t names) (CicPp.pp l names) (CicPp.pp r names)
- "..."
-(* (String.concat ", " (List.map (fun (i,_,_) -> string_of_int i) m)) *)
- | Step (_,(step,id1, (_,id2), _) ) ->
- Printf.sprintf "%6d: %s %6d %6d %s = %s [%s]" id
+(* "..." *)
+ (String.concat ", " (List.map (fun (i,_,_) -> string_of_int i) m))
+ | Step (_,(step,id1, (dir,id2), p) ) ->
+ Printf.sprintf "%6d: %s %6d %6d %s =(%s) %s [%s]" id
(string_of_rule step)
- id1 id2 (CicPp.pp l names) (CicPp.pp r names)
-(* (String.concat ", " (List.map (fun (i,_,_) -> string_of_int i) m)) *)
- "..."
+ id1 id2 (CicPp.pp l names) (CicPp.pp t names) (CicPp.pp r names)
+ (String.concat ", " (List.map (fun (i,_,_) -> string_of_int i) m))
+ (*"..."*)
with
Not_found -> assert false
let se = List.map (fun i -> Cic.Meta (i,[])) se in
let lets = get_duplicate_step_in_wfo bag l initial in
let letsno = List.length lets in
- let _,mty,_,_ = open_eq ty in
let lift_list l = List.map (fun (i,t) -> i,CicSubstitution.lift 1 t) l in
let lets,_,h =
List.fold_left
let p,l,r = proof_of_id bag id in
let cic = build_proof_term bag eq h n p in
let real_cic,instance =
- parametrize_proof cic l r (CicSubstitution.lift n mty)
+ parametrize_proof cic l r
in
let h = (id, instance)::lift_list h in
acc@[id,real_cic],n+1,h)
(* List.map (fun i ,_,_ -> i) menv *)
HExtlib.list_uniq
(List.sort Pervasives.compare
- (Utils.metas_of_term left @ Utils.metas_of_term right))
+ (Utils.metas_of_term left @ Utils.metas_of_term right @
+ Utils.metas_of_term ty))
in
let subst, metasenv, newmeta = relocate newmeta menv to_be_relocated in
let ty = Subst.apply_subst subst ty in
let meta_convertibility_aux table t1 t2 =
let module C = Cic in
- let rec aux ((table_l, table_r) as table) t1 t2 =
+ let rec aux ((table_l,table_r) as table) t1 t2 =
match t1, t2 with
+ | C.Meta (m1, tl1), C.Meta (m2, tl2) when m1 = m2 -> table
+ | C.Meta (m1, tl1), C.Meta (m2, tl2) when m1 < m2 -> aux table t2 t1
| C.Meta (m1, tl1), C.Meta (m2, tl2) ->
- let tl1, tl2 = [],[] in
let m1_binding, table_l =
try List.assoc m1 table_l, table_l
with Not_found -> m2, (m1, m2)::table_l
in
if (m1_binding <> m2) || (m2_binding <> m1) then
raise NotMetaConvertible
- else (
- try
- List.fold_left2
- (fun res t1 t2 ->
- match t1, t2 with
- | None, Some _ | Some _, None -> raise NotMetaConvertible
- | None, None -> res
- | Some t1, Some t2 -> (aux res t1 t2))
- (table_l, table_r) tl1 tl2
- with Invalid_argument _ ->
- raise NotMetaConvertible
- )
+ else table_l,table_r
| C.Var (u1, ens1), C.Var (u2, ens2)
| C.Const (u1, ens1), C.Const (u2, ens2) when (UriManager.eq u1 u2) ->
aux_ens table ens1 ens2
true
else
try
- let table = meta_convertibility_aux ([], []) left left' in
+ let table = meta_convertibility_aux ([],[]) left left' in
let _ = meta_convertibility_aux table right right' in
true
with NotMetaConvertible ->
try
- let table = meta_convertibility_aux ([], []) left right' in
+ let table = meta_convertibility_aux ([],[]) left right' in
let _ = meta_convertibility_aux table right left' in
true
with NotMetaConvertible ->
true
else
try
- ignore(meta_convertibility_aux ([], []) t1 t2);
+ ignore(meta_convertibility_aux ([],[]) t1 t2);
true
with NotMetaConvertible ->
false
let is_weak_identity eq =
let _,_,(_,left, right,_),_,_ = open_equality eq in
- left = right || meta_convertibility left right
+ left = right
+ (* doing metaconv here is meaningless *)
;;
let is_identity (_, context, ugraph) eq =
let _,_,(ty,left,right,_),menv,_ = open_equality eq in
- left = right ||
- (* (meta_convertibility left right)) *)
- fst (CicReduction.are_convertible ~metasenv:menv context left right ugraph)
+ (* doing metaconv here is meaningless *)
+ left = right
+(* fst (CicReduction.are_convertible ~metasenv:menv context left right ugraph)
+ * *)
;;
projects / helm.git / blobdiff