X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcomponents%2Fng_paramodulation%2FnCicBlob.ml;h=be5158452065511f0169d3c9f7b2b38b36e9ba82;hb=578ba04e1a0812f538729fbc02ea38d2cfd0ed3e;hp=b9314a20317203d127413454acc13727d7c8616a;hpb=894d518aa760c9f816ddb0dc2b3fa88e1fe20a94;p=helm.git diff --git a/matita/components/ng_paramodulation/nCicBlob.ml b/matita/components/ng_paramodulation/nCicBlob.ml index b9314a203..be5158452 100644 --- a/matita/components/ng_paramodulation/nCicBlob.ml +++ b/matita/components/ng_paramodulation/nCicBlob.ml @@ -45,19 +45,26 @@ with type t = NCic.term and type input = NCic.term = struct type t = NCic.term - let eq x y = x = y;; - (* NCicReduction.alpha_eq C.metasenv C.subst C.context x y;; *) + let eq x y = + (* CSC: NCicPp.status is the best I can put here *) + x = y || + NCicReduction.alpha_eq (new NCicPp.status) C.metasenv C.subst C.context x y;; let height_of_ref = function | NReference.Def h -> h | NReference.Fix(_,_,h) -> h | _ -> 0 +external old_hash_param : + int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc";; + +let old_hash = old_hash_param 10 100;; + let compare_refs (NReference.Ref (u1,r1)) (NReference.Ref (u2,r2)) = let x = height_of_ref r2 - height_of_ref r1 in if x = 0 then - Hashtbl.hash (NUri.string_of_uri u1,r1) - - Hashtbl.hash (NUri.string_of_uri u2,r2) + old_hash (NUri.string_of_uri u1,r1) - + old_hash (NUri.string_of_uri u2,r2) else x let rec compare x y = @@ -79,9 +86,7 @@ with type t = NCic.term and type input = NCic.term = struct ;; let compare x y = - (* CSC: NCicPp.status is the best I can put here *) - if NCicReduction.alpha_eq (new NCicPp.status) [] [] [] x y then 0 - (* if x = y then 0 *) + if eq x y then 0 else compare x y ;;