X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2FnCicBlob.ml;h=bc7289176776131a7837e35c0a86dd811d9b93ca;hb=0581f3c8dc2098b82cd31a0fbed224a95652bd88;hp=b02a1ebc0b4cadb1614a44f46971d601ccc6170b;hpb=dc2c1fd44709365c30436fdfe320b324b2592ba6;p=helm.git diff --git a/helm/software/components/ng_paramodulation/nCicBlob.ml b/helm/software/components/ng_paramodulation/nCicBlob.ml index b02a1ebc0..bc7289176 100644 --- a/helm/software/components/ng_paramodulation/nCicBlob.ml +++ b/helm/software/components/ng_paramodulation/nCicBlob.ml @@ -15,9 +15,10 @@ let eqPref = ref (fun _ -> assert false);; let set_eqP t = eqPref := fun _ -> t;; let default_eqP() = - let uri = NUri.uri_of_string "cic:/matita/ng/Plogic/equality/peq.ind" in + let uri = NUri.uri_of_string "cic:/matita/ng/Plogic/equality/eq.ind" in let ref = NReference.reference_of_spec uri (NReference.Ind(true,0,2)) in NCic.Const ref +;; let set_default_eqP() = eqPref := default_eqP @@ -45,7 +46,8 @@ with type t = NCic.term and type input = NCic.term = struct type t = NCic.term - let eq x y = NCicReduction.alpha_eq C.metasenv C.subst C.context x y;; + let eq x y = x = y;; + (* NCicReduction.alpha_eq C.metasenv C.subst C.context x y;; *) let rec compare x y = match x,y with @@ -59,11 +61,14 @@ with type t = NCic.term and type input = NCic.term = struct | ( NCic.Meta _ | NCic.Appl _ ), NCic.Const _ -> 1 | NCic.Appl _, NCic.Meta _ -> ~-1 | NCic.Meta _, NCic.Appl _ -> 1 - | _ -> assert false + | _ -> Pervasives.compare x y + (* was assert false, but why? *) + ;; let compare x y = - if NCicReduction.alpha_eq C.metasenv C.subst C.context x y then 0 + (* if NCicReduction.alpha_eq C.metasenv C.subst C.context x y then 0 *) + if x = y then 0 else compare x y ;; @@ -89,7 +94,7 @@ with type t = NCic.term and type input = NCic.term = struct let saturate t ty = let sty, _, args = - NCicMetaSubst.saturate ~delta:max_int C.metasenv C.subst C.context + NCicMetaSubst.saturate ~delta:0 C.metasenv C.subst C.context ty 0 in let proof =