reorganized functions order

[helm.git] / helm / ocaml / cic_proof_checking / cicReductionMachine.ml

diff --git a/helm/ocaml/cic_proof_checking/cicReductionMachine.ml b/helm/ocaml/cic_proof_checking/cicReductionMachine.ml
index 8c1c5017daa6ee5b53877bc7269f49a45fca6675..4aee1b2b922292ae8a2998bc9a63582123eb263e 100644 (file)
--- a/helm/ocaml/cic_proof_checking/cicReductionMachine.ml
+++ b/helm/ocaml/cic_proof_checking/cicReductionMachine.ml
@@ -374,7 +374,7 @@ prerr_endline ("%%%%%UWVAR " ^ String.concat " ; " (List.map (function (uri,t) -
           in
            C.Meta (i, l')
        | C.Sort _ as t -> t
-       | C.Implicit as t -> t
+       | C.Implicit _ as t -> t
        | C.Cast (te,ty) -> C.Cast (unwind_aux m te, unwind_aux m ty) (*CSC ???*)
        | C.Prod (n,s,t) -> C.Prod (n, unwind_aux m s, unwind_aux (m + 1) t)
        | C.Lambda (n,s,t) -> C.Lambda (n, unwind_aux m s, unwind_aux (m + 1) t)
@@ -546,7 +546,7 @@ if List.mem uri params then prerr_endline "---- OK2" ;
         let t' = unwind k e ens t in
          if s = [] then t' else C.Appl (t'::(RS.from_stack_list ~unwind s))
      | (k, e, _, (C.Sort _ as t), s) -> t (* s should be empty *)
-     | (k, e, _, (C.Implicit as t), s) -> t (* s should be empty *)
+     | (k, e, _, (C.Implicit _ as t), s) -> t (* s should be empty *)
      | (k, e, ens, (C.Cast (te,ty) as t), s) ->
         reduce (k, e, ens, te, s) (* s should be empty *)
      | (k, e, ens, (C.Prod _ as t), s) ->
@@ -654,7 +654,7 @@ if List.mem uri params then prerr_endline "---- OK2" ;
                in
                 (* ts are already unwinded because they are a sublist of tl *)
                 reduce (k, e, ens, (List.nth pl (j-1)), (RS.to_stack_list ts)@s)
-          | C.Cast _ | C.Implicit ->
+          | C.Cast _ | C.Implicit _ ->
               raise (Impossible 2) (* we don't trust our whd ;-) *)
            | _ ->
              let t' = unwind k e ens t in
@@ -802,7 +802,7 @@ let are_convertible =
                   | _,None  -> true
                   | Some t1',Some t2' -> aux context t1' t2'
               ) true l1 l2
-        | (C.Sort s1, C.Sort s2) -> true (*CSC da finire con gli universi *)
+        | (C.Sort s1, C.Sort s2) when s1 = s2 || s2 = C.Type -> true
         | (C.Prod (name1,s1,t1), C.Prod(_,s2,t2)) ->
            aux context s1 s2 &&
             aux ((Some (name1, (C.Decl s1)))::context) t1 t2
@@ -877,7 +877,7 @@ let are_convertible =
                 b && aux context ty1 ty2 && aux (tys@context) bo1 bo2)
               fl1 fl2 true
         | (C.Cast _, _) | (_, C.Cast _)
-        | (C.Implicit, _) | (_, C.Implicit) ->
+        | (C.Implicit _, _) | (_, C.Implicit _) ->
             assert false
         | (_,_) -> false
     end