...

[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 6f94e4a771fe3c8e0e443254b61bd2c8481e8bdc..b71fb499a579b1dbf426e159bf2fcf5c64e879cf 100644 (file)
--- a/helm/software/components/ng_kernel/nCicReduction.ml
+++ b/helm/software/components/ng_kernel/nCicReduction.ml
@@ -380,9 +380,9 @@ module Reduction(RS : Strategy) =
            let _,_, term,_ = NCicUtils.lookup_subst n subst in
            aux (k, e, NCicSubstitution.subst_meta l term,s)
          with  NCicUtils.Subst_not_found _ -> config)
-     | (_, _, NCic.Sort _, _) as config -> config
      | (_, _, NCic.Implicit _, _) -> assert false
-     | (_, _, NCic.Prod _, _) as config -> config
+     | (_, _, NCic.Sort _, _)
+     | (_, _, NCic.Prod _, _)
      | (_, _, NCic.Lambda _, []) as config -> config
      | (k, e, NCic.Lambda (_,_,t), p::s) ->
          aux (k+1, (RS.stack_to_env ~reduce:aux ~unwind p)::e, t,s)
@@ -495,7 +495,10 @@ let are_convertible whd ?(subst=[])  =
        true
      else
        match (t1,t2) with
-       | (C.Sort (C.Type a), C.Sort (C.Type b)) -> a <= b
+       | (C.Sort (C.Type a), C.Sort (C.Type b)) when not test_eq_only -> 
+           NCicEnvironment.universe_leq a b
+       | (C.Sort (C.Type a), C.Sort (C.Type b)) -> 
+           NCicEnvironment.universe_eq a b
        | (C.Sort s1,C.Sort (C.Type _)) -> (not test_eq_only)
        | (C.Sort s1, C.Sort s2) -> s1 = s2
 
@@ -512,7 +515,7 @@ let are_convertible whd ?(subst=[])  =
 
        | (C.Meta (n1,(s1, C.Irl i1)), C.Meta (n2,(s2, C.Irl i2))) 
           when n1 = n2 && s1 = s2 -> true
-       | (C.Meta (n1,(s1, l1)), C.Meta (n2,(s2, l2))) when n1 = n2 -> 
+       | (C.Meta (n1,(s1, l1)), C.Meta (n2,(s2, l2))) when n1 = n2 &&
           let l1 = NCicUtils.expand_local_context l1 in
           let l2 = NCicUtils.expand_local_context l2 in
           (try List.for_all2 
@@ -520,7 +523,7 @@ let are_convertible whd ?(subst=[])  =
               (NCicSubstitution.lift s1 t1) 
               (NCicSubstitution.lift s2 t2))  
             l1 l2
-          with Invalid_argument _ -> assert false)
+          with Invalid_argument _ -> assert false) -> true
 
        | C.Meta (n1,l1), _ ->
           (try 
@@ -535,6 +538,15 @@ let are_convertible whd ?(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
+           (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)
@@ -571,17 +583,22 @@ let are_convertible whd ?(subst=[])  =
      let rec convert_machines ((k1,e1,t1,s1 as m1),(k2,e2,t2,s2 as m2),delta) =
        (alpha_eq test_eq_only
          (R.unwind (k1,e1,t1,[])) (R.unwind (k2,e2,t2,[])) &&
+        let relevance =
+          match t1 with
+              C.Const r -> NCicEnvironment.get_relevance r
+            | _ -> [] in
         try
-         List.for_all 
-           (fun (t1,t2) ->
-             let t1 = RS.from_stack t1 and t2 = RS.from_stack t2 in
-             convert_machines (small_delta_step t1 t2))
-           (List.combine s1 s2)
+         HExtlib.list_forall_default3
+           (fun t1 t2 b  ->
+             not b ||
+             let t1 = RS.from_stack t1 in
+             let t2 = RS.from_stack t2 in
+             convert_machines (small_delta_step t1 t2)) s1 s2 true relevance
         with Invalid_argument _ -> false) || 
        (delta > 0 &&
           let delta = delta - 1 in 
           let red = R.reduce ~delta ~subst context in
-          convert_machines (red delta m1,red delta m2,delta))
+          convert_machines (red m1,red m2,delta))
      in
      convert_machines (small_delta_step (0,[],t1,[]) (0,[],t2,[]))
  in