Most warnings turned into errors and avoided

[helm.git] / matita / components / ng_paramodulation / nCicBlob.ml

diff --git a/matita/components/ng_paramodulation/nCicBlob.ml b/matita/components/ng_paramodulation/nCicBlob.ml
index e141272affa53b058df09ff2179c79070696f339..b1f2cfa6f2d9cb4774a56c3e89862209759b8983 100644 (file)
--- 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,8 +86,7 @@ with type t = NCic.term and type input = NCic.term = struct
   ;;
   
   let compare x y = 
-    if NCicReduction.alpha_eq [] [] [] x y  then 0 
-    (* if x = y  then 0 *)
+    if eq x y then 0
     else compare x y
   ;;
 
@@ -97,7 +103,9 @@ with type t = NCic.term and type input = NCic.term = struct
     | _ -> None
 
   let pp t = 
-    NCicPp.ppterm ~context:C.context ~metasenv:C.metasenv ~subst:C.subst t;;
+    (* CSC: NCicPp.status is the best I can put here *)
+    (new NCicPp.status)#ppterm ~context:C.context
+      ~metasenv:C.metasenv ~subst:C.subst t;;
 
   type input = NCic.term
 
@@ -118,8 +126,9 @@ with type t = NCic.term and type input = NCic.term = struct
 
   let saturate t ty = 
     let sty, _, args = 
-      NCicMetaSubst.saturate ~delta:0 C.metasenv C.subst C.context
-        ty 0
+      (* CSC: NCicPp.status is the best I can put here *)
+      NCicMetaSubst.saturate (new NCicPp.status) ~delta:0 C.metasenv C.subst
+       C.context ty 0
     in
     let proof = 
       if args = [] then Terms.Leaf t