X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fcic_proof_checking%2FcicTypeChecker.ml;h=1756497c017bfac8d9333a94114c2041da721c01;hb=6719c0e318b312b51b089fea3d69d1b7103245ea;hp=6cbb44f8044432db90ae2cd361d2831cb132be8d;hpb=d025518bc5930796c748704b069a2719b34b00d3;p=helm.git

diff --git a/helm/software/components/cic_proof_checking/cicTypeChecker.ml b/helm/software/components/cic_proof_checking/cicTypeChecker.ml
index 6cbb44f80..1756497c0 100644
--- a/helm/software/components/cic_proof_checking/cicTypeChecker.ml
+++ b/helm/software/components/cic_proof_checking/cicTypeChecker.ml
@@ -572,15 +572,21 @@ and typecheck_mutual_inductive_defs ~logger uri (itl,_,indparamsno) ugraph =
                match
                 CicReduction.whd context con_sort, CicReduction.whd [] ty_sort
                with
-                  Cic.Sort (Cic.Type u1), Cic.Sort (Cic.Type u2) ->
+                  Cic.Sort (Cic.Type u1), Cic.Sort (Cic.Type u2) 
+                | Cic.Sort (Cic.CProp u1), Cic.Sort (Cic.CProp u2) 
+                | Cic.Sort (Cic.Type u1), Cic.Sort (Cic.CProp u2) ->
                    CicUniv.add_ge u2 u1 ugraph
+                | Cic.Sort (Cic.CProp u1), Cic.Sort (Cic.Type u2) ->
+                   CicUniv.add_gt u2 u1 ugraph
                 | Cic.Sort _, Cic.Sort Cic.Prop
-                | Cic.Sort Cic.CProp, Cic.Sort Cic.CProp
+                | Cic.Sort _, Cic.Sort Cic.CProp _
+                | Cic.Sort _, Cic.Sort Cic.Set
                 | Cic.Sort _, Cic.Sort Cic.Type _ -> ugraph
-                | _, _ ->
+                | a,b ->
                    raise
                     (TypeCheckerFailure
-                      (lazy ("Wrong constructor or inductive arity shape"))) in
+                      (lazy ("Wrong constructor or inductive arity shape: "^
+                        CicPp.ppterm a ^ " --- " ^ CicPp.ppterm b))) in
               (* let's check also the positivity conditions *)
               if
 		not
@@ -1154,7 +1160,7 @@ and check_allowed_sort_elimination ~subst ~metasenv ~logger context uri i
          ((Some (name,C.Decl so))::context) ta true
    | (C.Sort C.Prop, C.Sort C.Prop) when need_dummy -> true,ugraph
    | (C.Sort C.Prop, C.Sort C.Set)
-   | (C.Sort C.Prop, C.Sort C.CProp)
+   | (C.Sort C.Prop, C.Sort (C.CProp _))
    | (C.Sort C.Prop, C.Sort (C.Type _) ) when need_dummy ->
        (let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in
 	 match o with
@@ -1180,12 +1186,9 @@ and check_allowed_sort_elimination ~subst ~metasenv ~logger context uri i
 		       UriManager.string_of_uri uri)))
        )
    | (C.Sort C.Set, C.Sort C.Prop) when need_dummy -> true , ugraph
-   | (C.Sort C.CProp, C.Sort C.Prop) when need_dummy -> true , ugraph
    | (C.Sort C.Set, C.Sort C.Set) when need_dummy -> true , ugraph
-   | (C.Sort C.Set, C.Sort C.CProp) when need_dummy -> true , ugraph
-   | (C.Sort C.CProp, C.Sort C.Set) when need_dummy -> true , ugraph
-   | (C.Sort C.CProp, C.Sort C.CProp) when need_dummy -> true , ugraph
-   | ((C.Sort C.Set, C.Sort (C.Type _)) | (C.Sort C.CProp, C.Sort (C.Type _)))
+   | (C.Sort C.Set, C.Sort (C.Type _)) 
+   | (C.Sort C.Set, C.Sort (C.CProp _))
       when need_dummy ->
        (let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in
 	 match o with
@@ -1207,6 +1210,7 @@ and check_allowed_sort_elimination ~subst ~metasenv ~logger context uri i
               UriManager.string_of_uri uri)))
        )
    | (C.Sort (C.Type _), C.Sort _) when need_dummy -> true , ugraph
+   | (C.Sort (C.CProp _), C.Sort _) when need_dummy -> true , ugraph
    | (_,_) -> false,ugraph
  in
   check_allowed_sort_elimination_aux ugraph context arity2 need_dummy
@@ -1832,12 +1836,10 @@ end;
    let t1' = CicReduction.whd ~subst context t1 in
    let t2' = CicReduction.whd ~subst ((Some (name,C.Decl s))::context) t2 in
    match (t1', t2') with
-      (C.Sort s1, C.Sort s2)
-        when (s2 = C.Prop or s2 = C.Set or s2 = C.CProp) -> 
+    | (C.Sort s1, C.Sort (C.Prop | C.Set)) ->
          (* different from Coq manual!!! *)
-         C.Sort s2,ugraph
+         t2',ugraph
     | (C.Sort (C.Type t1), C.Sort (C.Type t2)) -> 
-      (* TASSI: CONSRTAINTS: the same in doubletypeinference, cicrefine *)
        let t' = CicUniv.fresh() in
         (try
          let ugraph1 = CicUniv.add_ge t' t1 ugraph in
@@ -1845,9 +1847,32 @@ end;
           C.Sort (C.Type t'),ugraph2
         with
          CicUniv.UniverseInconsistency msg -> raise (TypeCheckerFailure msg))
-    | (C.Sort _,C.Sort (C.Type t1)) -> 
-        (* TASSI: CONSRTAINTS: the same in doubletypeinference, cicrefine *)
-        C.Sort (C.Type t1),ugraph (* c'e' bisogno di un fresh? *)
+    | (C.Sort (C.CProp t1), C.Sort (C.CProp t2)) -> 
+       let t' = CicUniv.fresh() in
+        (try
+         let ugraph1 = CicUniv.add_ge t' t1 ugraph in
+         let ugraph2 = CicUniv.add_ge t' t2 ugraph1 in
+          C.Sort (C.CProp t'),ugraph2
+        with
+         CicUniv.UniverseInconsistency msg -> raise (TypeCheckerFailure msg))
+    | (C.Sort (C.Type t1), C.Sort (C.CProp t2)) -> 
+       let t' = CicUniv.fresh() in
+        (try
+         let ugraph1 = CicUniv.add_ge t' t1 ugraph in
+         let ugraph2 = CicUniv.add_ge t' t2 ugraph1 in
+          C.Sort (C.CProp t'),ugraph2
+        with
+         CicUniv.UniverseInconsistency msg -> raise (TypeCheckerFailure msg))
+    | (C.Sort (C.CProp t1), C.Sort (C.Type t2)) -> 
+       let t' = CicUniv.fresh() in
+        (try
+         let ugraph1 = CicUniv.add_gt t' t1 ugraph in
+         let ugraph2 = CicUniv.add_ge t' t2 ugraph1 in
+          C.Sort (C.Type t'),ugraph2
+        with
+         CicUniv.UniverseInconsistency msg -> raise (TypeCheckerFailure msg))
+    | (C.Sort _,C.Sort (C.Type t1)) -> C.Sort (C.Type t1),ugraph 
+    | (C.Sort _,C.Sort (C.CProp t1)) -> C.Sort (C.CProp t1),ugraph 
     | (C.Meta _, C.Sort _) -> t2',ugraph
     | (C.Meta _, (C.Meta (_,_) as t))
     | (C.Sort _, (C.Meta (_,_) as t)) when CicUtil.is_closed t ->