New test.

[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 30b688264776e8f2c77816fdf52e5ece0577daa5..4e92e6ebc9f2586b4356befdb71927cdb3a926a1 100644 (file)
--- a/helm/ocaml/cic_proof_checking/cicReductionMachine.ml
+++ b/helm/ocaml/cic_proof_checking/cicReductionMachine.ml
@@ -23,6 +23,8 @@
  * http://cs.unibo.it/helm/.
  *)
 
+(* TODO unify exceptions *)
+
 exception CicReductionInternalError;;
 exception WrongUriToInductiveDefinition;;
 exception Impossible of int;;
@@ -515,7 +517,7 @@ if List.mem uri params then prerr_endline "---- OK2" ;
              match List.nth context (n - 1 - k) with
                 None -> assert false
               | Some (_,C.Decl _) -> None
-              | Some (_,C.Def x) -> Some (S.lift (n - k) x)
+              | Some (_,C.Def (x,_)) -> Some (S.lift (n - k) x)
             end
            with
             _ -> None
@@ -558,7 +560,7 @@ if List.mem uri params then prerr_endline "---- OK2" ;
      | (k, e, ens, (C.LetIn (_,m,t) as t'), s) ->
         let m' = RS.compute_to_env ~reduce ~unwind k e ens m in
          reduce (k+1, m'::e, ens, t, s)
-     | (_, _, _, C.Appl [], _) -> raise (Impossible 1)
+     | (_, _, _, C.Appl [], _) -> assert false
      | (k, e, ens, C.Appl (he::tl), s) ->
         let tl' =
          List.map
@@ -765,7 +767,7 @@ module R = Reduction ClosuresOnStackByValueFromEnvOrEnsStrategy;;
 module R = Reduction
  ClosuresOnStackByValueFromEnvOrEnsByNameOnConstantsStrategy;;
 *)
-module R = Reduction ClosuresOnStackByValueFromEnvOrEnsStrategy;;
+module R = Reduction(ClosuresOnStackByValueFromEnvOrEnsStrategy);;
 
 let whd = R.whd;;
 
@@ -805,11 +807,14 @@ let are_convertible =
               ) true l1 l2
         | (C.Sort s1, C.Sort s2) -> true (*CSC da finire con gli universi *)
         | (C.Prod (name1,s1,t1), C.Prod(_,s2,t2)) ->
-           aux context s1 s2 && aux ((Some (name1, (C.Decl s1)))::context) t1 t2
+           aux context s1 s2 &&
+            aux ((Some (name1, (C.Decl s1)))::context) t1 t2
         | (C.Lambda (name1,s1,t1), C.Lambda(_,s2,t2)) ->
-           aux context s1 s2 && aux ((Some (name1, (C.Decl s1)))::context) t1 t2
+           aux context s1 s2 &&
+            aux ((Some (name1, (C.Decl s1)))::context) t1 t2
         | (C.LetIn (name1,s1,t1), C.LetIn(_,s2,t2)) ->
-           aux context s1 s2 && aux ((Some (name1, (C.Def s1)))::context) t1 t2
+           aux context s1 s2 &&
+            aux ((Some (name1, (C.Def (s1,None))))::context) t1 t2
         | (C.Appl l1, C.Appl l2) ->
            (try
              List.fold_right2 (fun  x y b -> aux context x y && b) l1 l2 true 
@@ -876,7 +881,7 @@ let are_convertible =
               fl1 fl2 true
         | (C.Cast _, _) | (_, C.Cast _)
         | (C.Implicit, _) | (_, C.Implicit) ->
-           raise (Impossible 3) (* we don't trust our whd ;-) *)
+            assert false
         | (_,_) -> false
     end
   in