X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fparamodulation%2Finference.ml;h=969d412cef43a28151e995250fdf10d2adc172c4;hb=9e3eb63a93acaca0b4ad59c213e9ea430524d3ae;hp=62308896fd02b6b89bb420bd9c2c501c99273e54;hpb=bf40c378bd2c624405be2118a478a0734eb8d3aa;p=helm.git diff --git a/helm/ocaml/paramodulation/inference.ml b/helm/ocaml/paramodulation/inference.ml index 62308896f..969d412ce 100644 --- a/helm/ocaml/paramodulation/inference.ml +++ b/helm/ocaml/paramodulation/inference.ml @@ -12,13 +12,15 @@ type equality = Cic.term list (* arguments *) and proof = + | NoProof | BasicProof of Cic.term | ProofBlock of Cic.substitution * UriManager.uri * (* name, ty, eq_ty, left, right *) (Cic.name * Cic.term * Cic.term * Cic.term * Cic.term) * - (Utils.pos * equality) * equality - | NoProof + (Utils.pos * equality) * proof + | ProofGoalBlock of proof * equality + | ProofSymBlock of Cic.term Cic.explicit_named_substitution * proof ;; @@ -41,33 +43,108 @@ let string_of_equality ?env = ;; -let rec build_term_proof equality = +let build_proof_term equality = (* Printf.printf "build_term_proof %s" (string_of_equality equality); *) (* print_newline (); *) + + let indent = ref 0 in + + let rec do_build_proof proof = + match proof with + | NoProof -> + Printf.fprintf stderr "WARNING: no proof!\n"; +(* (string_of_equality equality); *) + Cic.Implicit None + | BasicProof term -> term + | ProofGoalBlock (proofbit, equality) -> + print_endline "found ProofGoalBlock, going up..."; + let _, proof, _, _, _ = equality in + do_build_goal_proof proofbit proof + | ProofSymBlock (ens, proof) -> + let proof = do_build_proof proof in + Cic.Appl [ + Cic.Const (HelmLibraryObjects.Logic.sym_eq_URI, ens); (* symmetry *) + proof + ] + | ProofBlock (subst, eq_URI, t', (pos, eq), eqproof) -> +(* Printf.printf "\nsubst:\n%s\n" (print_subst subst); *) +(* print_newline (); *) + + let name, ty, eq_ty, left, right = t' in + let bo = + Cic.Appl [Cic.MutInd (HelmLibraryObjects.Logic.eq_URI, 0, []); + eq_ty; left; right] + in + let t' = Cic.Lambda (name, ty, (* CicSubstitution.lift 1 *) bo) in + (* Printf.printf " ProofBlock: eq = %s, eq' = %s" *) + (* (string_of_equality eq) (string_of_equality eq'); *) + (* print_newline (); *) + +(* let s = String.make !indent ' ' in *) +(* incr indent; *) + +(* print_endline (s ^ "build proof'------------"); *) + + let proof' = + let _, proof', _, _, _ = eq in + do_build_proof proof' + in +(* print_endline (s ^ "END proof'"); *) + +(* print_endline (s ^ "build eqproof-----------"); *) + + let eqproof = do_build_proof eqproof in + +(* print_endline (s ^ "END eqproof"); *) +(* decr indent; *) + + + let _, _, (ty, what, other, _), menv', args' = eq in + let what, other = + if pos = Utils.Left then what, other else other, what + in + CicMetaSubst.apply_subst subst + (Cic.Appl [Cic.Const (eq_URI, []); ty; + what; t'; eqproof; other; proof']) + + and do_build_goal_proof proofbit proof = +(* match proofbit with *) +(* | BasicProof _ -> do_build_proof proof *) +(* | proofbit -> *) + match proof with + | ProofGoalBlock (pb, eq) -> + do_build_proof (ProofGoalBlock (replace_proof proofbit pb, eq)) +(* let _, proof, _, _, _ = eq in *) +(* let newproof = replace_proof proofbit proof in *) +(* do_build_proof newproof *) + +(* | ProofBlock (subst, eq_URI, t', poseq, eqproof) -> *) +(* let eqproof' = replace_proof proofbit eqproof in *) +(* do_build_proof (ProofBlock (subst, eq_URI, t', poseq, eqproof')) *) + | _ -> do_build_proof (replace_proof proofbit proof) (* assert false *) + + and replace_proof newproof = function + | ProofBlock (subst, eq_URI, t', poseq, eqproof) -> + let uri = eq_URI in +(* if eq_URI = HelmLibraryObjects.Logic.eq_ind_URI then *) +(* HelmLibraryObjects.Logic.eq_ind_r_URI *) +(* else *) +(* HelmLibraryObjects.Logic.eq_ind_URI *) +(* in *) + let eqproof' = replace_proof newproof eqproof in + ProofBlock (subst, uri(* eq_URI *), t', poseq, eqproof') +(* ProofBlock (subst, eq_URI, t', poseq, newproof) *) + | ProofGoalBlock (pb, equality) -> + let pb' = replace_proof newproof pb in + ProofGoalBlock (pb', equality) +(* let w, proof, t, menv, args = equality in *) +(* let proof' = replace_proof newproof proof in *) +(* ProofGoalBlock (pb, (w, proof', t, menv, args)) *) + | BasicProof _ -> newproof + | p -> p + in let _, proof, _, _, _ = equality in - match proof with - | NoProof -> - Printf.fprintf stderr "WARNING: no proof for %s\n" - (string_of_equality equality); - Cic.Implicit None - | BasicProof term -> term - | ProofBlock (subst, eq_URI, t', (pos, eq), eq') -> - let name, ty, eq_ty, left, right = t' in - let bo = - Cic.Appl [Cic.MutInd (HelmLibraryObjects.Logic.eq_URI, 0, []); - eq_ty; left; right] - in - let t' = Cic.Lambda (name, ty, CicSubstitution.lift 1 bo) in -(* Printf.printf " ProofBlock: eq = %s, eq' = %s" *) -(* (string_of_equality eq) (string_of_equality eq'); *) -(* print_newline (); *) - let proof' = build_term_proof eq in - let eqproof = build_term_proof eq' in - let _, _, (ty, what, other, _), menv', args' = eq in - let what, other = if pos = Utils.Left then what, other else other, what in - CicMetaSubst.apply_subst subst - (Cic.Appl [Cic.Const (eq_URI, []); ty; - what; t'; eqproof; other; proof']) + do_build_proof proof ;; @@ -253,6 +330,7 @@ let meta_convertibility t1 t2 = ;; +(* let replace_metas (* context *) term = let module C = Cic in let rec aux = function @@ -295,8 +373,10 @@ let replace_metas (* context *) term = in aux term ;; +*) +(* let restore_metas (* context *) term = let module C = Cic in let rec aux = function @@ -335,14 +415,16 @@ let restore_metas (* context *) term = in aux term ;; +*) - +(* let rec restore_subst (* context *) subst = List.map (fun (i, (c, t, ty)) -> i, (c, restore_metas (* context *) t, ty)) subst ;; +*) let rec check_irl start = function @@ -358,6 +440,9 @@ let rec is_simple_term = function | Cic.Appl l -> List.for_all is_simple_term l | Cic.Meta (i, l) -> check_irl 1 l | Cic.Rel _ -> true + | Cic.Const _ -> true + | Cic.MutInd (_, _, []) -> true + | Cic.MutConstruct (_, _, _, []) -> true | _ -> false ;; @@ -378,9 +463,6 @@ let unification_simple metasenv context t1 t2 ugraph = let module U = CicUnification in let lookup = lookup_subst in let rec occurs_check subst what where = - (* Printf.printf "occurs_check %s %s" *) - (* (CicPp.ppterm what) (CicPp.ppterm where); *) - (* print_newline (); *) match where with | t when what = t -> true | C.Appl l -> List.exists (occurs_check subst what) l @@ -390,57 +472,32 @@ let unification_simple metasenv context t1 t2 ugraph = | _ -> false in let rec unif subst menv s t = -(* Printf.printf "unif %s %s\n%s\n" (CicPp.ppterm s) (CicPp.ppterm t) *) -(* (print_subst subst); *) -(* print_newline (); *) let s = match s with C.Meta _ -> lookup s subst | _ -> s and t = match t with C.Meta _ -> lookup t subst | _ -> t in - (* Printf.printf "after apply_subst: %s %s\n%s" *) - (* (CicPp.ppterm s) (CicPp.ppterm t) (print_subst subst); *) - (* print_newline (); *) match s, t with | s, t when s = t -> subst, menv | C.Meta (i, _), C.Meta (j, _) when i > j -> unif subst menv t s | C.Meta _, t when occurs_check subst s t -> raise (U.UnificationFailure "Inference.unification.unif") -(* | C.Meta (i, l), C.Meta (j, l') -> *) -(* let _, _, ty = CicUtil.lookup_meta i menv in *) -(* let _, _, ty' = CicUtil.lookup_meta j menv in *) -(* let binding1 = lookup s subst in *) -(* let binding2 = lookup t subst in *) -(* let subst, menv = *) -(* if binding1 != s then *) -(* if binding2 != t then *) -(* unif subst menv binding1 binding2 *) -(* else *) -(* if binding1 = t then *) -(* subst, menv *) -(* else *) -(* ((j, (context, binding1, ty'))::subst, *) -(* List.filter (fun (m, _, _) -> j <> m) menv) *) -(* else *) -(* if binding2 != t then *) -(* if s = binding2 then *) -(* subst, menv *) -(* else *) -(* ((i, (context, binding2, ty))::subst, *) -(* List.filter (fun (m, _, _) -> i <> m) menv) *) -(* else *) -(* ((i, (context, t, ty))::subst, *) -(* List.filter (fun (m, _, _) -> i <> m) menv) *) -(* in *) -(* subst, menv *) - - | C.Meta (i, l), t -> - let _, _, ty = CicUtil.lookup_meta i menv in - let subst = - if not (List.mem_assoc i subst) then (i, (context, t, ty))::subst - else subst - in - let menv = List.filter (fun (m, _, _) -> i <> m) menv in - subst, menv + | C.Meta (i, l), t -> ( + try + let _, _, ty = CicUtil.lookup_meta i menv in + let subst = + if not (List.mem_assoc i subst) then (i, (context, t, ty))::subst + else subst + in + let menv = menv in (* List.filter (fun (m, _, _) -> i <> m) menv in *) + subst, menv + with CicUtil.Meta_not_found m -> + let names = names_of_context context in + debug_print ( + Printf.sprintf "Meta_not_found %d!: %s %s\n%s\n\n%s" m + (CicPp.pp t1 names) (CicPp.pp t2 names) + (print_metasenv menv) (print_metasenv metasenv)); + assert false + ) | _, C.Meta _ -> unif subst menv t s | C.Appl (hds::_), C.Appl (hdt::_) when hds <> hdt -> raise (U.UnificationFailure "Inference.unification.unif") @@ -449,25 +506,19 @@ let unification_simple metasenv context t1 t2 ugraph = List.fold_left2 (fun (subst', menv) s t -> unif subst' menv s t) (subst, menv) tls tlt - with e -> + with Invalid_argument _ -> raise (U.UnificationFailure "Inference.unification.unif") ) | _, _ -> raise (U.UnificationFailure "Inference.unification.unif") in let subst, menv = unif [] metasenv t1 t2 in - (* Printf.printf "DONE!: subst = \n%s\n" (print_subst subst); *) - (* print_newline (); *) -(* let rec fix_term = function *) -(* | (C.Meta (i, l) as t) -> *) -(* lookup t subst *) -(* | C.Appl l -> C.Appl (List.map fix_term l) *) -(* | t -> t *) -(* in *) -(* let rec fix_subst = function *) -(* | [] -> [] *) -(* | (i, (c, t, ty))::tl -> (i, (c, fix_term t, fix_term ty))::(fix_subst tl) *) -(* in *) -(* List.rev (fix_subst subst), menv, ugraph *) + let menv = + List.filter + (fun (m, _, _) -> + try let _ = List.find (fun (i, _) -> m = i) subst in false + with Not_found -> true) + menv + in List.rev subst, menv, ugraph ;; @@ -475,9 +526,12 @@ let unification_simple metasenv context t1 t2 ugraph = let unification metasenv context t1 t2 ugraph = (* Printf.printf "| unification %s %s\n" (CicPp.ppterm t1) (CicPp.ppterm t2); *) let subst, menv, ug = - if not (is_simple_term t1) || not (is_simple_term t2) then + if not (is_simple_term t1) || not (is_simple_term t2) then ( + debug_print ( + Printf.sprintf "NOT SIMPLE TERMS: %s %s" + (CicPp.ppterm t1) (CicPp.ppterm t2)); CicUnification.fo_unif metasenv context t1 t2 ugraph - else + ) else unification_simple metasenv context t1 t2 ugraph in let rec fix_term = function @@ -493,9 +547,10 @@ let unification metasenv context t1 t2 ugraph = in (* Printf.printf "| subst: %s\n" (print_subst ~prefix:" ; " subst); *) (* print_endline "|"; *) - (* fix_subst *) subst, menv, ug + fix_subst subst, menv, ug ;; + (* let unification = CicUnification.fo_unif;; *) exception MatchingFailure;; @@ -563,7 +618,7 @@ let matching_simple metasenv context t1 t2 ugraph = List.fold_left2 (fun (subst, menv) s t -> do_match subst menv s t) (subst, menv) ls lt - with e -> + with Invalid_argument _ -> (* print_endline (Printexc.to_string e); *) (* Printf.printf "NO MATCH: %s %s\n" (CicPp.ppterm s) (CicPp.ppterm t); *) (* print_newline (); *) @@ -590,6 +645,8 @@ let matching metasenv context t1 t2 ugraph = (* (\* print_newline (); *\) *) (* subst, menv, ug *) (* else *) +(* Printf.printf "matching %s %s" (CicPp.ppterm t1) (CicPp.ppterm t2); *) +(* print_newline (); *) try let subst, metasenv, ugraph = (* CicUnification.fo_unif metasenv context t1 t2 ugraph *) @@ -612,9 +669,12 @@ let matching metasenv context t1 t2 ugraph = (* print_newline (); *) subst, metasenv, ugraph - with e -> + with + | CicUnification.UnificationFailure _ + | CicUnification.Uncertain _ -> (* Printf.printf "failed to match %s %s\n" *) (* (CicPp.ppterm t1) (CicPp.ppterm t2); *) +(* print_endline (Printexc.to_string e); *) raise MatchingFailure ;; @@ -630,8 +690,6 @@ let beta_expand ?(metas_ok=true) ?(match_only=false) let module S = CicSubstitution in let module C = Cic in - let print_info = false in - (* let _ = *) (* let names = names_of_context context in *) (* Printf.printf "beta_expand:\nwhat: %s, %s\nwhere: %s, %s\n" *) @@ -920,11 +978,11 @@ let beta_expand ?(metas_ok=true) ?(match_only=false) (* else *) ((C.Rel (1 + lift_amount), subst', metasenv', ugraph')::res, lifted_term) - with e -> - if print_info then ( - print_endline ("beta_expand ERROR!: " ^ (Printexc.to_string e)); - ); - res, lifted_term + with + | MatchingFailure + | CicUnification.UnificationFailure _ + | CicUnification.Uncertain _ -> + res, lifted_term in (* Printf.printf "exit aux\n"; *) retval @@ -962,10 +1020,6 @@ let beta_expand ?(metas_ok=true) ?(match_only=false) (* if match_only then replace_metas (\* context *\) where *) (* else where *) (* in *) - if print_info then ( - Printf.printf "searching %s inside %s\n" - (CicPp.ppterm what) (CicPp.ppterm where); - ); aux 0 where context metasenv [] ugraph in let mapfun = @@ -989,6 +1043,9 @@ let find_equalities ?(eq_uri=HelmLibraryObjects.Logic.eq_URI) context proof = let module S = CicSubstitution in let module T = CicTypeChecker in let newmeta = ProofEngineHelpers.new_meta_of_proof ~proof in + let ok_types ty menv = + List.for_all (fun (_, _, mt) -> mt = ty) menv + in let rec aux index newmeta = function | [] -> [], newmeta | (Some (_, C.Decl (term)))::tl -> @@ -998,7 +1055,7 @@ let find_equalities ?(eq_uri=HelmLibraryObjects.Logic.eq_URI) context proof = (* let newmeta = ProofEngineHelpers.new_meta_of_proof ~proof in *) let (head, newmetas, args, newmeta) = ProofEngineHelpers.saturate_term newmeta [] - context (S.lift index term) + context (S.lift index term) 0 in let p = if List.length args = 0 then @@ -1007,8 +1064,16 @@ let find_equalities ?(eq_uri=HelmLibraryObjects.Logic.eq_URI) context proof = C.Appl ((C.Rel index)::args) in ( match head with - | C.Appl [C.MutInd (uri, _, _); ty; t1; t2] when uri = eq_uri -> - Printf.printf "OK: %s\n" (CicPp.ppterm term); + | C.Appl [C.MutInd (uri, _, _); ty; t1; t2] + when (UriManager.eq uri eq_uri) && (ok_types ty newmetas) -> + debug_print ( + Printf.sprintf "OK: %s" (CicPp.ppterm term)); +(* debug_print ( *) +(* Printf.sprintf "args: %s\n" *) +(* (String.concat ", " (List.map CicPp.ppterm args))); *) +(* debug_print ( *) +(* Printf.sprintf "newmetas:\n%s\n" *) +(* (print_metasenv newmetas)); *) let o = !Utils.compare_terms t1 t2 in let w = compute_equality_weight ty t1 t2 in let proof = BasicProof p in @@ -1016,7 +1081,8 @@ let find_equalities ?(eq_uri=HelmLibraryObjects.Logic.eq_URI) context proof = Some e, (newmeta+1) | _ -> None, newmeta ) - | C.Appl [C.MutInd (uri, _, _); ty; t1; t2] when uri = eq_uri -> + | C.Appl [C.MutInd (uri, _, _); ty; t1; t2] + when UriManager.eq uri eq_uri -> let t1 = S.lift index t1 and t2 = S.lift index t2 in let o = !Utils.compare_terms t1 t2 in @@ -1039,17 +1105,128 @@ let find_equalities ?(eq_uri=HelmLibraryObjects.Logic.eq_URI) context proof = ;; +let equations_blacklist = + List.fold_left + (fun s u -> UriManager.UriSet.add (UriManager.uri_of_string u) s) + UriManager.UriSet.empty [ + "cic:/Coq/Init/Logic/eq.ind#xpointer(1/1/1)"; + "cic:/Coq/Init/Logic/trans_eq.con"; + "cic:/Coq/Init/Logic/f_equal.con"; + "cic:/Coq/Init/Logic/f_equal2.con"; + "cic:/Coq/Init/Logic/f_equal3.con"; + "cic:/Coq/Init/Logic/sym_eq.con"; +(* "cic:/Coq/Logic/Eqdep/UIP_refl.con"; *) +(* "cic:/Coq/Init/Peano/mult_n_Sm.con"; *) + + (* ALB !!!! questo e` imbrogliare, ma x ora lo lasciamo cosi`... + perche' questo cacchio di teorema rompe le scatole :'( *) + "cic:/Rocq/SUBST/comparith/mult_n_2.con"; + ] +;; + +let find_library_equalities ~(dbd:Mysql.dbd) context status maxmeta = + let module C = Cic in + let module S = CicSubstitution in + let module T = CicTypeChecker in + let candidates = + List.fold_left + (fun l uri -> + let suri = UriManager.string_of_uri uri in + if UriManager.UriSet.mem uri equations_blacklist then + l + else + let t = CicUtil.term_of_uri uri in + let ty, _ = + CicTypeChecker.type_of_aux' [] context t CicUniv.empty_ugraph + in + (t, ty)::l) + [] + (MetadataQuery.equations_for_goal ~dbd status) + in + let eq_uri1 = UriManager.uri_of_string HelmLibraryObjects.Logic.eq_XURI + and eq_uri2 = HelmLibraryObjects.Logic.eq_URI in + let iseq uri = + (UriManager.eq uri eq_uri1) || (UriManager.eq uri eq_uri2) + in + let ok_types ty menv = + List.for_all (fun (_, _, mt) -> mt = ty) menv + in + let rec aux newmeta = function + | [] -> [], newmeta + | (term, termty)::tl -> + debug_print ( + Printf.sprintf "Examining: %s (%s)" + (UriManager.string_of_uri (CicUtil.uri_of_term term))(* (CicPp.ppterm term) *) (CicPp.ppterm termty)); + let res, newmeta = + match termty with + | C.Prod (name, s, t) -> + let head, newmetas, args, newmeta = + ProofEngineHelpers.saturate_term newmeta [] context termty 0 + in + let p = + if List.length args = 0 then + term + else + C.Appl (term::args) + in ( + match head with + | C.Appl [C.MutInd (uri, _, _); ty; t1; t2] + when (iseq uri) && (ok_types ty newmetas) -> + debug_print ( + Printf.sprintf "OK: %s" (CicPp.ppterm term)); + let o = !Utils.compare_terms t1 t2 in + let w = compute_equality_weight ty t1 t2 in + let proof = BasicProof p in + let e = (w, proof, (ty, t1, t2, o), newmetas, args) in + Some e, (newmeta+1) + | _ -> None, newmeta + ) + | C.Appl [C.MutInd (uri, _, _); ty; t1; t2] when iseq uri -> + let o = !Utils.compare_terms t1 t2 in + let w = compute_equality_weight ty t1 t2 in + let e = (w, BasicProof term, (ty, t1, t2, o), [], []) in + Some e, (newmeta+1) + | _ -> None, newmeta + in + match res with + | Some e -> + let tl, newmeta' = aux newmeta tl in + e::tl, max newmeta newmeta' + | None -> + aux newmeta tl + in + let found, maxm = aux maxmeta candidates in + (List.fold_left + (fun l e -> + if List.exists (meta_convertibility_eq e) l then ( + debug_print ( + Printf.sprintf "NO!! %s already there!" (string_of_equality e)); + l + ) + else e::l) + [] found), maxm +;; + + let fix_metas newmeta ((w, p, (ty, left, right, o), menv, args) as equality) = +(* print_endline ("fix_metas " ^ (string_of_int newmeta)); *) let table = Hashtbl.create (List.length args) in - let newargs, _ = + let is_this_case = ref false in + let newargs, newmeta = List.fold_right (fun t (newargs, index) -> match t with | Cic.Meta (i, l) -> Hashtbl.add table i index; +(* if index = 5469 then ( *) +(* Printf.printf "?5469 COMES FROM (%d): %s\n" *) +(* i (string_of_equality equality); *) +(* print_newline (); *) +(* is_this_case := true *) +(* ); *) ((Cic.Meta (index, l))::newargs, index+1) | _ -> assert false) - args ([], newmeta) + args ([], newmeta+1) in let repl where = ProofEngineReduction.replace ~equality:(=) ~what:args ~with_what:newargs @@ -1074,15 +1251,77 @@ let fix_metas newmeta ((w, p, (ty, left, right, o), menv, args) as equality) = List.filter (function Cic.Meta (i, _) -> List.mem i metas | _ -> assert false) newargs in - (newmeta + (List.length newargs) + 1, - (w, p, (ty, left, right, o), menv', newargs)) + let rec fix_proof = function + | NoProof -> NoProof + | BasicProof term -> BasicProof (repl term) + | ProofBlock (subst, eq_URI, t', (pos, eq), p) -> + +(* Printf.printf "fix_proof of equality %s, subst is:\n%s\n" *) +(* (string_of_equality equality) (print_subst subst); *) + + let subst' = + List.fold_left + (fun s arg -> + match arg with + | Cic.Meta (i, l) -> ( + try + let j = Hashtbl.find table i in + if List.mem_assoc i subst then + s + else +(* let _, context, ty = CicUtil.lookup_meta j menv' in *) +(* (i, (context, Cic.Meta (j, l), ty))::s *) + let _, context, ty = CicUtil.lookup_meta i menv in + (i, (context, Cic.Meta (j, l), ty))::s + with Not_found -> s + ) + | _ -> assert false) + [] args + in +(* let subst'' = *) +(* List.map *) +(* (fun (i, e) -> *) +(* try let j = Hashtbl.find table i in (j, e) *) +(* with _ -> (i, e)) subst *) +(* in *) + +(* Printf.printf "subst' is:\n%s\n" (print_subst subst'); *) +(* print_newline (); *) + + ProofBlock (subst' @ subst, eq_URI, t', (pos, eq), p) +(* | ProofSymBlock (ens, p) -> *) +(* let ens' = List.map (fun (u, t) -> (u, repl t)) ens in *) +(* ProofSymBlock (ens', fix_proof p) *) + | p -> assert false + in +(* (newmeta + (List.length newargs) + 2, *) + let neweq = (w, fix_proof p, (ty, left, right, o), menv', newargs) in +(* if !is_this_case then ( *) +(* print_endline "\nTHIS IS THE TROUBLE!!!"; *) +(* let pt = build_proof_term neweq in *) +(* Printf.printf "equality: %s\nproof: %s\n" *) +(* (string_of_equality neweq) (CicPp.ppterm pt); *) +(* print_endline (String.make 79 '-'); *) +(* ); *) + (newmeta + 1, neweq) +(* (w, fix_proof p, (ty, left, right, o), menv', newargs)) *) +;; + + +let term_is_equality ?(eq_uri=HelmLibraryObjects.Logic.eq_URI) term = + let iseq uri = UriManager.eq uri eq_uri in + match term with + | Cic.Appl [Cic.MutInd (uri, _, _); _; _; _] when iseq uri -> true + | _ -> false ;; exception TermIsNotAnEquality;; -let equality_of_term ?(eq_uri=HelmLibraryObjects.Logic.eq_URI) proof = function - | Cic.Appl [Cic.MutInd (uri, _, _); ty; t1; t2] when uri = eq_uri -> +let equality_of_term ?(eq_uri=HelmLibraryObjects.Logic.eq_URI) proof term = + let iseq uri = UriManager.eq uri eq_uri in + match term with + | Cic.Appl [Cic.MutInd (uri, _, _); ty; t1; t2] when iseq uri -> let o = !Utils.compare_terms t1 t2 in let w = compute_equality_weight ty t1 t2 in let e = (w, BasicProof proof, (ty, t1, t2, o), [], []) in @@ -1529,3 +1768,5 @@ let extract_differing_subterms t1 t2 = | hd::[] -> Some hd | _ -> None ;; + +