X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matitaB%2Fcomponents%2Fng_paramodulation%2FnCicBlob.ml;h=14454c58b2b0c571a9fe7d62a0095f32d8a09d7c;hb=4f3b04e9966484011328d5b0eb358da4416e29b0;hp=beef0ae453ba6ce55a80b1bd411b3603effb7630;hpb=d0d2ebcf0ad48c38dcd69142f5e080e987fc5536;p=helm.git diff --git a/matitaB/components/ng_paramodulation/nCicBlob.ml b/matitaB/components/ng_paramodulation/nCicBlob.ml index beef0ae45..14454c58b 100644 --- a/matitaB/components/ng_paramodulation/nCicBlob.ml +++ b/matitaB/components/ng_paramodulation/nCicBlob.ml @@ -11,15 +11,15 @@ (* $Id: terms.mli 9822 2009-06-03 15:37:06Z tassi $ *) -let eqPref = ref (fun _ -> assert false);; -let set_eqP t = eqPref := fun _ -> t;; - -let default_eqP() = +let default_eqP = let uri = NUri.uri_of_string "cic:/matita/basics/logic/eq.ind" in let ref = NReference.reference_of_spec uri (NReference.Ind(true,0,2)) in NCic.Const ref ;; +let eqPref = ref default_eqP;; +let set_eqP t = eqPref := t;; + let equivalence_relation = let uri = NUri.uri_of_string "cic:/matita/ng/properties/relations/eq_rel.con" in @@ -84,20 +84,22 @@ with type t = NCic.term and type input = NCic.term = struct ;; - let compare x y = + (* let compare x y = (* CSC: NCicPp.status is the best I can put here *) (* WR: and I can't guess a user id, so I must put None *) if NCicReduction.alpha_eq (new NCicPp.status None) [] [] [] x y then 0 (* if x = y then 0 *) else compare x y - ;; + ;; *) - let eqP = (!eqPref)() + let eqP = fun () -> !eqPref ;; let is_eq = function - | Terms.Node [ Terms.Leaf eqt ; ty; l; r ] when eq eqP eqt -> + | Terms.Node [ Terms.Leaf eqt ; ty; l; r ] when eq (eqP()) eqt -> Some (ty,l,r) + | Terms.Node [ Terms.Leaf eqt ; ty; l; r ] -> + None (* | Terms.Node [ Terms.Leaf eqt ; _; Terms.Node [Terms.Leaf eqt2 ; ty]; l; r] when eq equivalence_relation eqt && eq setoid_eq eqt2 ->