exception BadConstraint of string Lazy.t;;
let type0 = []
-let cprop = [false, NUri.uri_of_string ("cic:/matita/pts/CProp.univ")]
+
+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 *)
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_constraint strict a b =
match a,b with
| [false,a2],[false,b2] ->
if not (le_path_uri [] strict a2 b2) then (
if le_path_uri [] (not strict) b2 a2 then
- (raise (BadConstraint (lazy "universe inconsistency")));
+ (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
;;
let get_checked_fixes_or_cofixes = function
- | Ref.Ref (uri, (Ref.Fix (fixno,_,_)|Ref.CoFix fixno))->
+ | Ref.Ref (uri, (Ref.Fix _|Ref.CoFix _))->
(match get_checked_obj uri with
| _,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 " ^ Ref.string_of_reference r); assert false
+ | _ -> prerr_endline "get_checked_(co)fix on a non (co)fix"; assert false
;;
let get_relevance (Ref.Ref (_, infos) as r) =