Serious bug fixed: the max of two universes was computed using the polymorphic

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

diff --git a/helm/software/components/ng_kernel/nCicEnvironment.ml b/helm/software/components/ng_kernel/nCicEnvironment.ml
index b747dcd3fa5dce0d93fa6437f6ca87273510affb..fa229d6f6752b5e82948af0d89f00041891c7193 100644 (file)
--- a/helm/software/components/ng_kernel/nCicEnvironment.ml
+++ b/helm/software/components/ng_kernel/nCicEnvironment.ml
@@ -14,6 +14,42 @@
 exception CircularDependency of string Lazy.t;;
 exception ObjectNotFound of string Lazy.t;;
 exception BadDependency of string Lazy.t;;
+exception BadConstraint of string Lazy.t;;
+
+let type0 = [false, NUri.uri_of_string ("cic:/matita/pts/Type.univ")]
+
+let le_constraints = ref [] (* strict,a,b *)
+
+let rec le_path_uri avoid strict a b =
+ (not strict && NUri.eq a b) ||
+ List.exists
+  (fun (strict',x,y) ->
+     NUri.eq y b && not (List.exists (NUri.eq x) avoid) &&
+       le_path_uri (x::avoid) (strict && not strict') a x
+  ) !le_constraints
+;;
+
+let leq_path a b = le_path_uri [b] (fst a) (snd a) b;;
+
+let universe_leq a b = 
+  match a, b with
+  | a,[(false,b)] -> List.for_all (fun a -> leq_path a b) a
+  | _,_ ->
+     raise (BadConstraint
+      (lazy "trying to check if a universe is less or equal than an inferred universe"))
+
+let universe_eq a b = universe_leq b a || universe_leq a b
+
+let add_le_constraint strict a b = 
+  match a,b with
+  | [false,a2],[false,b2] -> 
+      if not (le_path_uri [] strict a2 b2) then (
+        if le_path_uri [] (not strict) b2 a2 then
+         (raise (BadConstraint (lazy "universe inconsistency")));
+        le_constraints := (strict,a2,b2) :: !le_constraints)
+  | _ -> raise (BadConstraint
+          (lazy "trying to add a constraint on an inferred universe"))
+;;
 
 let typecheck_obj,already_set = ref (fun _ -> assert false), ref false;;
 let set_typecheck_obj f =
@@ -81,8 +117,19 @@ let get_checked_obj u =
     | `Exn e -> raise e
 ;;
 
+let get_checked_decl = function
+  | NReference.Ref (uri, NReference.Decl) ->
+      (match get_checked_obj uri with
+      | _,height,_,_, NCic.Constant (rlv,name,None,ty,att) ->
+          rlv,name,ty,att,height
+      | _,_,_,_, NCic.Constant (_,_,Some _,_,_) ->
+          prerr_endline "get_checked_decl on a definition"; assert false
+      | _ -> prerr_endline "get_checked_decl on a non decl 2"; assert false)
+  | _ -> prerr_endline "get_checked_decl on a non decl"; assert false
+;;
+
 let get_checked_def = function
-  | NReference.Ref (_, uri, NReference.Def) ->
+  | NReference.Ref (uri, NReference.Def _) ->
       (match get_checked_obj uri with
       | _,height,_,_, NCic.Constant (rlv,name,Some bo,ty,att) ->
           rlv,name,bo,ty,att,height
@@ -93,7 +140,7 @@ let get_checked_def = function
 ;;
 
 let get_checked_indtys = function
-  | NReference.Ref (_, uri, (NReference.Ind (_,n)|NReference.Con (n,_))) ->
+  | NReference.Ref (uri, (NReference.Ind (_,n)|NReference.Con (n,_))) ->
       (match get_checked_obj uri with
       | _,_,_,_, NCic.Inductive (inductive,leftno,tys,att) ->
         inductive,leftno,tys,att,n
@@ -102,7 +149,7 @@ let get_checked_indtys = function
 ;;
 
 let get_checked_fixes_or_cofixes = function
-  | NReference.Ref (_, uri, (NReference.Fix (fixno,_)|NReference.CoFix fixno))->
+  | NReference.Ref (uri, (NReference.Fix (fixno,_,_)|NReference.CoFix fixno))->
       (match get_checked_obj uri with
       | _,height,_,_, NCic.Fixpoint (_,funcs,att) ->
          funcs, att, height
@@ -111,14 +158,35 @@ let get_checked_fixes_or_cofixes = function
 ;;
 
 let get_indty_leftno = function 
-  | NReference.Ref (_, uri, NReference.Ind _) 
-  | NReference.Ref (_, uri, NReference.Con _) ->
+  | NReference.Ref (uri, NReference.Ind _) 
+  | NReference.Ref (uri, NReference.Con _) ->
       (match get_checked_obj uri with
       | _,_,_,_, NCic.Inductive (_,left,_,_) -> left
       | _ ->prerr_endline "get_indty_leftno called on a non ind 2";assert false)
   | _ -> prerr_endline "get_indty_leftno called on a non indty";assert false
 ;;
 
+let get_relevance (NReference.Ref (_, infos) as r) =
+  match infos with
+     NReference.Def _ -> let res,_,_,_,_,_ = get_checked_def r in res
+   | NReference.Decl -> let res,_,_,_,_ = get_checked_decl r in res
+   | NReference.Ind _ ->
+       let _,_,tl,_,n = get_checked_indtys r in
+       let res,_,_,_ = List.nth tl n in
+         res
+    | NReference.Con (_,i) ->
+       let _,_,tl,_,n = get_checked_indtys r in
+       let _,_,_,cl = List.nth tl n in
+       let res,_,_ = List.nth cl (i - 1) in
+         res
+    | NReference.Fix (fixno,_,_)
+    | NReference.CoFix fixno ->
+        let fl,_,_ = get_checked_fixes_or_cofixes r in
+        let res,_,_,_,_ = List.nth fl fixno in
+          res
+;;
+
+
 let invalidate _ = 
   assert (!frozen_list = []);
   NUri.UriHash.clear cache