X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_proof_checking%2FcicEnvironment.ml;h=ad61bcd0481795e7b4917b7f330411cc667a259b;hb=a6dd077a2b3e4d0c4395c2ee4cc2e1b6d10ab963;hp=05467185b1929faf6d266d176355a96d267c3c87;hpb=a900a71108e7011bfa6f22d491654c9098c615e0;p=helm.git

diff --git a/helm/ocaml/cic_proof_checking/cicEnvironment.ml b/helm/ocaml/cic_proof_checking/cicEnvironment.ml
index 05467185b..ad61bcd04 100644
--- a/helm/ocaml/cic_proof_checking/cicEnvironment.ml
+++ b/helm/ocaml/cic_proof_checking/cicEnvironment.ml
@@ -165,6 +165,9 @@ module Cache :
               ) l
             in
              C.Meta(i,l')
+         | C.Sort (C.Type u) -> 
+             CicUniv.assert_univ u;
+             C.Sort (C.Type (CicUniv.recons_univ u))
          | C.Sort _ as t -> t
          | C.Implicit _ as t -> t
          | C.Cast (te,ty) -> C.Cast (restore_in_term te, restore_in_term ty)
@@ -214,7 +217,7 @@ module Cache :
             in
              C.CoFix (i, liftedfl)
       in
-      function
+      function 
          C.Constant (name,bo,ty,params,attrs) ->
            let bo' =
              match bo with
@@ -292,14 +295,14 @@ module Cache :
        *)
       empty (); 
       HT.iter
-       (fun k v ->
+       (fun k (v,u) ->
          callback (UriManager.string_of_uri k);
          HT.add cacheOfCookedObjects 
            (UriManager.uri_of_string (UriManager.string_of_uri k))
             (***********************************************
                TSSI: FIXME add channel stuff for universes
             ************************************************)
-           ((restore_uris v),CicUniv.empty_ugraph))
+           (restore_uris v, CicUniv.recons_graph u))
        restored
     ;;
 
@@ -393,6 +396,7 @@ module Cache :
 	    None -> 
 	      assert false (* only NON dummy universes can be committed *)
 	  | Some g ->
+              CicUniv.assert_univs_have_uri g;
 	      frozen_list := List.remove_assq uri !frozen_list ;
 	      HT.add cacheOfCookedObjects uri (obj,g) 
     with
@@ -453,7 +457,7 @@ module Cache :
     * something. this means check and frozen must be empty.
     *)
    let remove uri =
-     if (!unchecked_list <> []) || (!frozen_list <> []) then
+     if !frozen_list <> [] then
        failwith "CicEnvironment.remove while type checking"
      else
        HT.remove cacheOfCookedObjects uri 
@@ -475,6 +479,8 @@ let dump_to_channel = Cache.dump_to_channel;;
 let restore_from_channel = Cache.restore_from_channel;;
 let empty = Cache.empty;;
 
+let total_parsing_time = ref 0.0
+
 let get_object_to_add uri =
  let filename = Http_getter.getxml' uri in
  let bodyfilename =
@@ -505,12 +511,15 @@ let get_object_to_add uri =
        | None -> ()
    end 
  in
- (* this brakes something : 
-  *   let _ = CicUniv.restart_numbering () in 
-  *)
+ (* restarts the numbering of named universes (the ones inside the cic) *)
+ let _ = CicUniv.restart_numbering () in 
  let obj = 
    try 
-     CicParser.obj_of_xml filename bodyfilename 
+     let time = Unix.gettimeofday() in
+     let rc = CicParser.obj_of_xml uri filename bodyfilename in
+     total_parsing_time := 
+       !total_parsing_time +. ((Unix.gettimeofday()) -. time );
+     rc
    with exn -> 
      cleanup ();
      (match exn with
@@ -652,12 +661,8 @@ let get_obj base_univ uri =
       o,(CicUniv.merge_ugraphs base_univ u)
   with Not_found ->
     (* this should be an error case, but if we trust the uri... *)
-    if trust_obj uri then
-      (* trusting we add it to the unchecked list *)
       let o,u = find_or_add_to_unchecked uri in
         o,(CicUniv.merge_ugraphs base_univ u)
-    else
-      raise Not_found
 ;; 
 
 exception OnlyPutOfInductiveDefinitionsIsAllowed
@@ -686,7 +691,7 @@ let in_library uri =
     true
   with Http_getter_types.Key_not_found _ -> false)
 
-let remove_term = Cache.remove
+let remove_obj = Cache.remove
   
 let list_uri () = 
   Cache.list_all_cooked_uris ()