snapshot (first version in which some extensions work, e.g. infix +)

[helm.git] / helm / ocaml / cic_proof_checking / cicEnvironment.ml

diff --git a/helm/ocaml/cic_proof_checking/cicEnvironment.ml b/helm/ocaml/cic_proof_checking/cicEnvironment.ml
index 08166d5640443006405c87e76b9ed1ea8d9e834b..ad61bcd0481795e7b4917b7f330411cc667a259b 100644 (file)
--- 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
@@ -510,13 +513,10 @@ let get_object_to_add uri =
  in
  (* restarts the numbering of named universes (the ones inside the cic) *)
  let _ = CicUniv.restart_numbering () in 
- (* HACK ORRIBILE: fa in modo che il parser metta degli universi fresh non
-  * anonimi *)
- let _ = CicParser3.set_uri uri in 
  let obj = 
    try 
      let time = Unix.gettimeofday() in
-     let rc = CicParser.obj_of_xml filename bodyfilename in
+     let rc = CicParser.obj_of_xml uri filename bodyfilename in
      total_parsing_time := 
        !total_parsing_time +. ((Unix.gettimeofday()) -. time );
      rc