X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicEnvironment.ml;h=ef3bca22d06941ebfa20fe883d4423eb7ec87e0e;hb=235d5cc96af46d0406bdd28222f56b3ee2bf827e;hp=c2de425c6fbcf4a5bc046f0fd7794619df5012dc;hpb=14684f9b8fcc2ce4ffb0b9fa5d287c2ab5843760;p=helm.git

diff --git a/helm/software/components/ng_kernel/nCicEnvironment.ml b/helm/software/components/ng_kernel/nCicEnvironment.ml
index c2de425c6..ef3bca22d 100644
--- a/helm/software/components/ng_kernel/nCicEnvironment.ml
+++ b/helm/software/components/ng_kernel/nCicEnvironment.ml
@@ -11,26 +11,37 @@
 
 (* $Id$ *)
 
+module C = NCic
+module Ref = NReference
+
 exception CircularDependency of string Lazy.t;;
 exception ObjectNotFound of string Lazy.t;;
-exception BadDependency of string Lazy.t;;
+exception BadDependency of string Lazy.t * exn;;
 exception BadConstraint of string Lazy.t;;
 
-let type0 = [false, NUri.uri_of_string ("cic:/matita/pts/Type.univ")]
+let get_obj = ref (fun _ -> assert false);;
+let set_get_obj f = get_obj := f;;
+
+let type0 = []
+
+let max l1 l2 =
+ HExtlib.list_uniq ~eq:(fun (b1,u1) (b2,u2) -> b1=b2 && NUri.eq u1 u2)
+  (List.sort (fun (b1,u1) (b2,u2) ->
+    let res = compare b1 b2 in if res = 0 then NUri.compare u1 u2 else res)
+      (l1 @ l2))
 
 let le_constraints = ref [] (* strict,a,b *)
 
-let rec le_path_uri strict a b =
- if strict then
-  List.exists (fun (strict,x,y) -> NUri.eq y b && le_path_uri (not strict) a x)
-    !le_constraints
- else
-  NUri.eq a b ||
-   List.exists (fun (_,x,y) -> NUri.eq y b && le_path_uri false a x)
-     !le_constraints
+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 (fst a) (snd a) b;;
+let leq_path a b = le_path_uri [b] (fst a) (snd a) b;;
 
 let universe_leq a b = 
   match a, b with
@@ -39,18 +50,57 @@ let universe_leq a b =
      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 universe_eq a b = 
+  match a,b with 
+  | [(false,_)], [(false,_)] -> universe_leq b a && universe_leq a b
+  | _, [(false,_)]
+  | [(false,_)],_ -> false
+  | _ ->
+     raise (BadConstraint
+      (lazy "trying to check if two inferred universes are equal"))
+;;
+
+let pp_constraint b x y =  
+  NUri.name_of_uri x ^ (if b then " < " else " <= ") ^ NUri.name_of_uri y
+;;
+
+let pp_constraints () =
+  String.concat "\n" (List.map (fun (b,x,y) -> pp_constraint b x y) !le_constraints)
+;;
+
+let universes = ref [];;
 
-let add_le_constraint strict a b = 
+let add_constraint strict a b = 
   match a,b with
   | [false,a2],[false,b2] -> 
-      if le_path_uri (not strict) b2 a2 then
-       (raise (BadConstraint (lazy "universe inconsistency")));
-      le_constraints := (strict,a2,b2) :: !le_constraints  
+      if not (le_path_uri [] strict a2 b2) then (
+        if le_path_uri [] (not strict) b2 a2 then
+         (raise(BadConstraint(lazy("universe inconsistency adding "^pp_constraint strict a2 b2
+           ^ " to:\n" ^ pp_constraints ()))));
+        universes := a2 :: b2 :: 
+          List.filter (fun x -> not (NUri.eq x a2 || NUri.eq x b2)) !universes;
+        le_constraints := (strict,a2,b2) :: !le_constraints)
   | _ -> raise (BadConstraint
           (lazy "trying to add a constraint on an inferred universe"))
 ;;
 
+let sup l =
+  match l with
+  | [false,_] -> Some l
+  | l ->
+   let bigger_than acc (s1,n1) = List.filter (le_path_uri [] s1 n1) acc in
+   let solutions = List.fold_left bigger_than !universes l in
+   let rec aux = function
+     | [] -> None
+     | u :: tl ->
+         if List.exists (fun x -> le_path_uri [] true x u) solutions then aux tl
+         else Some [false,u]
+   in
+    aux solutions
+;;
+
+
+
 let typecheck_obj,already_set = ref (fun _ -> assert false), ref false;;
 let set_typecheck_obj f =
  if !already_set then
@@ -78,26 +128,23 @@ let get_checked_obj u =
     Not_found ->
      let saved_frozen_list = !frozen_list in
      try
-      let obj =
-       try NCicLibrary.get_obj u
-       with
-        NCicLibrary.ObjectNotFound m -> raise (ObjectNotFound m)
-      in
-        frozen_list := (u,obj)::saved_frozen_list;
-        !typecheck_obj obj;
-        frozen_list := saved_frozen_list;
-        let obj = `WellTyped obj in
-        NUri.UriHash.add cache u obj;
-        obj
+      let obj = !get_obj u in
+       frozen_list := (u,obj)::saved_frozen_list;
+       !typecheck_obj obj;
+       frozen_list := saved_frozen_list;
+       let obj = `WellTyped obj in
+       NUri.UriHash.add cache u obj;
+       obj
      with
         Sys.Break as e ->
          frozen_list := saved_frozen_list;
          raise e
-      | Propagate (u',_) as e' ->
+      | Propagate (u',old_exn) as e' ->
          frozen_list := saved_frozen_list;
          let exn = `Exn (BadDependency (lazy (NUri.string_of_uri u ^
            " depends (recursively) on " ^ NUri.string_of_uri u' ^
-           " which is not well-typed"))) in
+           " which is not well-typed"), 
+           match old_exn with BadDependency (_,e) -> e | _ -> old_exn)) in
          NUri.UriHash.add cache u exn;
          if saved_frozen_list = [] then
           exn
@@ -118,69 +165,60 @@ let get_checked_obj u =
 ;;
 
 let get_checked_decl = function
-  | NReference.Ref (uri, NReference.Decl) ->
+  | Ref.Ref (uri, Ref.Decl) ->
       (match get_checked_obj uri with
-      | _,height,_,_, NCic.Constant (rlv,name,None,ty,att) ->
+      | _,height,_,_, C.Constant (rlv,name,None,ty,att) ->
           rlv,name,ty,att,height
-      | _,_,_,_, NCic.Constant (_,_,Some _,_,_) ->
+      | _,_,_,_, C.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 _) ->
+  | Ref.Ref (uri, Ref.Def _) ->
       (match get_checked_obj uri with
-      | _,height,_,_, NCic.Constant (rlv,name,Some bo,ty,att) ->
+      | _,height,_,_, C.Constant (rlv,name,Some bo,ty,att) ->
           rlv,name,bo,ty,att,height
-      | _,_,_,_, NCic.Constant (_,_,None,_,_) ->
+      | _,_,_,_, C.Constant (_,_,None,_,_) ->
           prerr_endline "get_checked_def on an axiom"; assert false
       | _ -> prerr_endline "get_checked_def on a non def 2"; assert false)
   | _ -> prerr_endline "get_checked_def on a non def"; assert false
 ;;
 
 let get_checked_indtys = function
-  | NReference.Ref (uri, (NReference.Ind (_,n)|NReference.Con (n,_))) ->
+  | Ref.Ref (uri, (Ref.Ind (_,n,_)|Ref.Con (n,_,_))) ->
       (match get_checked_obj uri with
-      | _,_,_,_, NCic.Inductive (inductive,leftno,tys,att) ->
+      | _,_,_,_, C.Inductive (inductive,leftno,tys,att) ->
         inductive,leftno,tys,att,n
       | _ -> prerr_endline "get_checked_indtys on a non ind 2"; assert false)
   | _ -> prerr_endline "get_checked_indtys on a non ind"; assert false
 ;;
 
 let get_checked_fixes_or_cofixes = function
-  | NReference.Ref (uri, (NReference.Fix (fixno,_,_)|NReference.CoFix fixno))->
+  | Ref.Ref (uri, (Ref.Fix _|Ref.CoFix _))->
       (match get_checked_obj uri with
-      | _,height,_,_, NCic.Fixpoint (_,funcs,att) ->
+      | _,height,_,_, C.Fixpoint (_,funcs,att) ->
          funcs, att, height
       | _ ->prerr_endline "get_checked_(co)fix on a non (co)fix 2";assert false)
-  | r -> prerr_endline ("get_checked_(co)fix on " ^ NReference.string_of_reference r); assert false
-;;
-
-let get_indty_leftno = function 
-  | 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
+  | _ -> prerr_endline "get_checked_(co)fix on a non (co)fix"; assert false
 ;;
 
-let get_relevance (NReference.Ref (_, infos) as r) =
+let get_relevance (Ref.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 _ ->
+     Ref.Def _ -> let res,_,_,_,_,_ = get_checked_def r in res
+   | Ref.Decl -> let res,_,_,_,_ = get_checked_decl r in res
+   | Ref.Ind _ ->
        let _,_,tl,_,n = get_checked_indtys r in
        let res,_,_,_ = List.nth tl n in
          res
-    | NReference.Con (_,i) ->
+    | Ref.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 ->
+    | Ref.Fix (fixno,_,_)
+    | Ref.CoFix fixno ->
         let fl,_,_ = get_checked_fixes_or_cofixes r in
         let res,_,_,_,_ = List.nth fl fixno in
           res