fixed some regressions

[helm.git] / helm / software / components / ng_kernel / nCicReduction.ml

diff --git a/helm/software/components/ng_kernel/nCicReduction.ml b/helm/software/components/ng_kernel/nCicReduction.ml
index c6abbd0e03968529ef960cac19c5cdbe11322181..61bb201b7f685e0e6c3bf615c4b4406aba719cb5 100644 (file)
--- a/helm/software/components/ng_kernel/nCicReduction.ml
+++ b/helm/software/components/ng_kernel/nCicReduction.ml
@@ -13,6 +13,7 @@
 
 module C = NCic
 module Ref = NReference
+module E = NCicEnvironment
 
 module type Strategy = sig
   type stack_term
@@ -171,7 +172,7 @@ let whd = R.whd
 let (===) x y = Pervasives.compare x y = 0 ;;
 
 (* t1, t2 must be well-typed *)
-let are_convertible ?(subst=[])  =
+let are_convertible ?(subst=[]) get_relevance =
  let rec aux test_eq_only context t1 t2 =
    let rec alpha_eq test_eq_only t1 t2 =
      if t1 === t2 then
@@ -188,8 +189,9 @@ let are_convertible ?(subst=[])  =
        | (C.Prod (name1,s1,t1), C.Prod(_,s2,t2)) ->
            aux true context s1 s2 &&
            aux test_eq_only ((name1, C.Decl s1)::context) t1 t2
-       | (C.Lambda (name1,s1,t1), C.Lambda(_,s2,t2)) ->
-          aux true context s1 s2 && 
+       | (C.Lambda (name1,s1,t1), C.Lambda(_,_,t2)) ->
+          (* thanks to inversion of well typedness, the source 
+           * of these lambdas must be already convertible *)
           aux test_eq_only ((name1, C.Decl s1)::context) t1 t2
        | (C.LetIn (name1,ty1,s1,t1), C.LetIn(_,ty2,s2,t2)) ->
           aux test_eq_only context ty1 ty2 &&
@@ -221,27 +223,36 @@ let are_convertible ?(subst=[])  =
               aux test_eq_only context t1 term
            with NCicUtils.Subst_not_found _ -> false)
 
-       | (C.Appl (C.Const r1::tl1), C.Appl (C.Const r2::tl2)) ->
-          r1 = r2 &&
-           let relevance = NCicEnvironment.get_relevance r1 in
+       | (C.Appl (hd1::tl1), C.Appl (hd2::tl2)) ->
+           aux test_eq_only context hd1 hd2 &&
+          let relevance = get_relevance ~subst context hd1 tl1 in
            (try
              HExtlib.list_forall_default3
               (fun t1 t2 b -> not b || aux test_eq_only context t1 t2)
               tl1 tl2 true relevance
             with Invalid_argument _ -> false)
 
-       | (C.Appl l1, C.Appl l2) ->
-          (try List.for_all2 (aux test_eq_only context) l1 l2
-           with Invalid_argument _ -> false)
-
-       | (C.Match (ref1,outtype1,term1,pl1),
-          C.Match (ref2,outtype2,term2,pl2)) -> 
+       | (C.Match (Ref.Ref (_,Ref.Ind (_,tyno,_)) as ref1,outtype1,term1,pl1),
+          C.Match (ref2,outtype2,term2,pl2)) ->
+          let _,_,itl,_,_ = E.get_checked_indtys ref1 in
+          let _,_,ty,_ = List.nth itl tyno in
+          let rec remove_prods ~subst context ty = 
+             let ty = whd ~subst context ty in
+             match ty with
+             | C.Sort _ -> ty
+            | C.Prod (name,so,ta) -> remove_prods ~subst ((name,(C.Decl so))::context) ta
+             | _ -> assert false
+           in
+           let is_prop = 
+             match remove_prods ~subst [] ty with
+             | C.Sort C.Prop -> true
+             | _ -> false
+           in
            Ref.eq ref1 ref2 &&
            aux test_eq_only context outtype1 outtype2 &&
-           aux test_eq_only context term1 term2 &&
+           (is_prop || aux test_eq_only context term1 term2) &&
            (try List.for_all2 (aux test_eq_only context) pl1 pl2
             with Invalid_argument _ -> false)
-
        | (C.Implicit _, _) | (_, C.Implicit _) -> assert false
        | (_,_) -> false
   in