(* $Id$ *)
+module C = NCic
+module Ref = NReference
+
exception CircularDependency of string Lazy.t;;
exception ObjectNotFound of string Lazy.t;;
exception BadDependency of string Lazy.t;;
exception BadConstraint of string Lazy.t;;
-let type0 = [false, NUri.uri_of_string ("cic:/matita/pts/Type.univ")]
+let type0 = []
let le_constraints = ref [] (* strict,a,b *)
-let rec le_path_uri strict a b =
- if strict then
- List.exists (fun (strict,x,y) -> NUri.eq y b && le_path_uri (not strict) a x)
- !le_constraints
- else
- NUri.eq a b ||
- List.exists (fun (_,x,y) -> NUri.eq y b && le_path_uri false a x)
- !le_constraints
+let rec le_path_uri avoid strict a b =
+ (not strict && NUri.eq a b) ||
+ List.exists
+ (fun (strict',x,y) ->
+ NUri.eq y b && not (List.exists (NUri.eq x) avoid) &&
+ le_path_uri (x::avoid) (strict && not strict') a x
+ ) !le_constraints
;;
-let leq_path a b = le_path_uri (fst a) (snd a) b;;
+let leq_path a b = le_path_uri [b] (fst a) (snd a) b;;
let universe_leq a b =
match a, b with
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 = universe_leq b a && universe_leq a b
-let add_le_constraint strict a b =
+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 add_constraint strict a b =
match a,b with
| [false,a2],[false,b2] ->
- if le_path_uri (not strict) b2 a2 then
- (raise (BadConstraint (lazy "universe inconsistency")));
- le_constraints := (strict,a2,b2) :: !le_constraints
+ if not (le_path_uri [] strict a2 b2) then (
+ if le_path_uri [] (not strict) b2 a2 then
+ (raise(BadConstraint(lazy("universe inconsistency adding "^pp_constraint strict a2 b2
+ ^ " to:\n" ^ pp_constraints ()))));
+ le_constraints := (strict,a2,b2) :: !le_constraints)
| _ -> raise (BadConstraint
(lazy "trying to add a constraint on an inferred universe"))
;;
;;
let get_checked_decl = function
- | NReference.Ref (uri, NReference.Decl) ->
+ | Ref.Ref (uri, Ref.Decl) ->
(match get_checked_obj uri with
- | _,height,_,_, NCic.Constant (rlv,name,None,ty,att) ->
+ | _,height,_,_, C.Constant (rlv,name,None,ty,att) ->
rlv,name,ty,att,height
- | _,_,_,_, NCic.Constant (_,_,Some _,_,_) ->
+ | _,_,_,_, C.Constant (_,_,Some _,_,_) ->
prerr_endline "get_checked_decl on a definition"; assert false
| _ -> prerr_endline "get_checked_decl on a non decl 2"; assert false)
| _ -> prerr_endline "get_checked_decl on a non decl"; assert false
;;
let get_checked_def = function
- | NReference.Ref (uri, NReference.Def _) ->
+ | Ref.Ref (uri, Ref.Def _) ->
(match get_checked_obj uri with
- | _,height,_,_, NCic.Constant (rlv,name,Some bo,ty,att) ->
+ | _,height,_,_, C.Constant (rlv,name,Some bo,ty,att) ->
rlv,name,bo,ty,att,height
- | _,_,_,_, NCic.Constant (_,_,None,_,_) ->
+ | _,_,_,_, C.Constant (_,_,None,_,_) ->
prerr_endline "get_checked_def on an axiom"; assert false
| _ -> prerr_endline "get_checked_def on a non def 2"; assert false)
| _ -> prerr_endline "get_checked_def on a non def"; assert false
;;
let get_checked_indtys = function
- | NReference.Ref (uri, (NReference.Ind (_,n)|NReference.Con (n,_))) ->
+ | Ref.Ref (uri, (Ref.Ind (_,n,_)|Ref.Con (n,_,_))) ->
(match get_checked_obj uri with
- | _,_,_,_, NCic.Inductive (inductive,leftno,tys,att) ->
+ | _,_,_,_, C.Inductive (inductive,leftno,tys,att) ->
inductive,leftno,tys,att,n
| _ -> prerr_endline "get_checked_indtys on a non ind 2"; assert false)
| _ -> prerr_endline "get_checked_indtys on a non ind"; assert false
;;
let get_checked_fixes_or_cofixes = function
- | NReference.Ref (uri, (NReference.Fix (fixno,_,_)|NReference.CoFix fixno))->
+ | Ref.Ref (uri, (Ref.Fix _|Ref.CoFix _))->
(match get_checked_obj uri with
- | _,height,_,_, NCic.Fixpoint (_,funcs,att) ->
+ | _,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 " ^ NReference.string_of_reference r); assert false
-;;
-
-let get_indty_leftno = function
- | NReference.Ref (uri, NReference.Ind _)
- | NReference.Ref (uri, NReference.Con _) ->
- (match get_checked_obj uri with
- | _,_,_,_, NCic.Inductive (_,left,_,_) -> left
- | _ ->prerr_endline "get_indty_leftno called on a non ind 2";assert false)
- | _ -> prerr_endline "get_indty_leftno called on a non indty";assert false
+ | _ -> prerr_endline "get_checked_(co)fix on a non (co)fix"; assert false
;;
-let get_relevance (NReference.Ref (_, infos) as r) =
+let get_relevance (Ref.Ref (_, infos) as r) =
match infos with
- NReference.Def _ -> let res,_,_,_,_,_ = get_checked_def r in res
- | NReference.Decl -> let res,_,_,_,_ = get_checked_decl r in res
- | NReference.Ind _ ->
+ Ref.Def _ -> let res,_,_,_,_,_ = get_checked_def r in res
+ | Ref.Decl -> let res,_,_,_,_ = get_checked_decl r in res
+ | Ref.Ind _ ->
let _,_,tl,_,n = get_checked_indtys r in
let res,_,_,_ = List.nth tl n in
res
- | NReference.Con (_,i) ->
+ | Ref.Con (_,i,_) ->
let _,_,tl,_,n = get_checked_indtys r in
let _,_,_,cl = List.nth tl n in
let res,_,_ = List.nth cl (i - 1) in
res
- | NReference.Fix (fixno,_,_)
- | NReference.CoFix fixno ->
+ | Ref.Fix (fixno,_,_)
+ | Ref.CoFix fixno ->
let fl,_,_ = get_checked_fixes_or_cofixes r in
let res,_,_,_,_ = List.nth fl fixno in
res
projects / helm.git / blobdiff