- if not(len > 5) then parse_error ctxt "sort expected";
- if not(String.sub s 0 5 = "Type:") then parse_error ctxt "sort expected";
- try
- Cic.Type
- (CicUniv.fresh
- ~uri:ctxt.uri
- ~id:(int_of_string (String.sub s 5 (len - 5))) ())
+ let sort_len, mk_sort =
+ if len > 5 && String.sub s 0 5 = "Type:" then 5,fun x -> Cic.Type x
+ else if len > 6 && String.sub s 0 6 = "CProp:" then 6,fun x->Cic.CProp x
+ else parse_error ctxt "sort expected"
+ in
+ let s = String.sub s sort_len (len - sort_len) in
+ let i = String.index s ':' in
+ let id = int_of_string (String.sub s 0 i) in
+ let suri = String.sub s (i+1) (len - sort_len - i - 1) in
+ let uri = UriManager.uri_of_string suri in
+ try mk_sort (CicUniv.fresh ~uri ~id ())