added flag to change Set into Type on the fly, that helps on some coq objects using...

diff --git a/helm/software/components/cic/cicParser.ml b/helm/software/components/cic/cicParser.ml
index 9fac7badba3a10e0b8eb166df6ca67d88ff31bc0..0f36f1a04d8b2ab886eb3861d904469efec20511 100644 (file)
--- a/helm/software/components/cic/cicParser.ml
+++ b/helm/software/components/cic/cicParser.ml
@@ -296,14 +296,17 @@ let uri_list_of_string =
   fun s ->
     List.map uri_of_string (Str.split space_RE s)
 
+let impredicative_set = ref true;;
+
 let sort_of_string ctxt = function
   | "Prop" -> Cic.Prop
-  | "Set"  -> Cic.Set
   | "CProp" -> Cic.CProp
   (* THIS CASE IS HERE ONLY TO ALLOW THE PARSING OF COQ LIBRARY
    * THIS SHOULD BE REMOVED AS SOON AS univ_maker OR COQ'S EXPORTATION 
    * IS FIXED *)
   | "Type" ->  Cic.Type (CicUniv.fresh ~uri:ctxt.uri ())
+  | "Set" when !impredicative_set -> Cic.Set
+  | "Set" -> Cic.Type (CicUniv.fresh ~uri:ctxt.uri ())
   | s ->
       let len = String.length s in
       if not(len > 5) then parse_error ctxt "sort expected";

diff --git a/helm/software/components/cic/cicParser.mli b/helm/software/components/cic/cicParser.mli
index 9472b4c54606bd35a67c71c0b9766d73e8dd1fa1..d874293a16ee5b0c5e53000fedc4cbc34ab541b8 100644 (file)
--- a/helm/software/components/cic/cicParser.mli
+++ b/helm/software/components/cic/cicParser.mli
@@ -44,3 +44,4 @@ val annobj_of_xml: UriManager.uri -> string -> string option -> Cic.annobj
    * Both files are assumed to be gzipped. *)
 val obj_of_xml : UriManager.uri -> string -> string option -> Cic.obj
 
+val impredicative_set : bool ref