X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Ftactics%2Fparamodulation%2Futils.ml;h=8a2722bb6820a1bf3d06652c8d9101be147dabad;hb=cab8b6ddde6291eb2bccad550bbd4634c00986ae;hp=c6e64b898753f435e54a959a4d5c09dfc216e1c6;hpb=b109559ac6795075508fd5c231a1bf2a3223031a;p=helm.git

diff --git a/helm/software/components/tactics/paramodulation/utils.ml b/helm/software/components/tactics/paramodulation/utils.ml
index c6e64b898..8a2722bb6 100644
--- a/helm/software/components/tactics/paramodulation/utils.ml
+++ b/helm/software/components/tactics/paramodulation/utils.ml
@@ -102,8 +102,8 @@ let metas_of_term term =
 	TermSet.union (aux s) (aux t)
     | C.Prod(n,s,t) ->
 	TermSet.union (aux s) (aux t)
-    | C.LetIn(n,s,t) ->
-	TermSet.union (aux s) (aux t)
+    | C.LetIn(n,s,ty,t) ->
+	TermSet.union (aux s) (TermSet.union (aux ty) (aux t))
     | t -> TermSet.empty (* TODO: maybe add other cases? *)
   in
   aux term
@@ -265,7 +265,7 @@ let weight_of_term ?(consider_metas=true) ?(count_metas_occurrences=false) term
     | C.Cast (t1, t2)
     | C.Lambda (_, t1, t2)
     | C.Prod (_, t1, t2)
-    | C.LetIn (_, t1, t2) ->
+    | C.LetIn (_, t1, _, t2) ->
         let w1 = aux t1 in
         let w2 = aux t2 in
         w1 + w2 + 1
@@ -506,12 +506,21 @@ let rec aux_ordering ?(recursion=true) t1 t2 =
   | C.Const _, _ -> Lt
   | _, C.Const _ -> Gt
 
-  | C.MutInd (u1, _, _), C.MutInd (u2, _, _) -> compare_uris u1 u2
+  | C.MutInd (u1, tno1, _), C.MutInd (u2, tno2, _) -> 
+       let res =  compare_uris u1 u2 in
+       if res <> Eq then res 
+       else 
+          let res = compare tno1 tno2 in
+          if res = 0 then Eq else if res < 0 then Lt else Gt
   | C.MutInd _, _ -> Lt
   | _, C.MutInd _ -> Gt
 
-  | C.MutConstruct (u1, _, _, _), C.MutConstruct (u2, _, _, _) ->
-      compare_uris u1 u2
+  | C.MutConstruct (u1, tno1, cno1, _), C.MutConstruct (u2, tno2, cno2, _) ->
+       let res =  compare_uris u1 u2 in
+       if res <> Eq then res 
+       else 
+          let res = compare (tno1,cno1) (tno2,cno2) in
+          if res = 0 then Eq else if res < 0 then Lt else Gt
   | C.MutConstruct _, _ -> Lt
   | _, C.MutConstruct _ -> Gt
 
@@ -552,7 +561,7 @@ let nonrec_kbo_w (t1, w1) (t2, w2) =
 let nonrec_kbo t1 t2 =
   let w1 = weight_of_term t1 in
   let w2 = weight_of_term t2 in
-  (* 
+  (*
   prerr_endline ("weight1 :"^(string_of_weight w1));
   prerr_endline ("weight2 :"^(string_of_weight w2)); 
   *)