exception MetaSubstFailure of string Lazy.t
exception Uncertain of string Lazy.t
-(*
-(*** Functions to apply a substitution ***)
-
-let apply_subst_gen ~appl_fun subst term =
- let rec um_aux =
- let module C = Cic in
- let module S = CicSubstitution in
- function
- C.Rel _ as t -> t
- | C.Var (uri,exp_named_subst) ->
- let exp_named_subst' =
- List.map (fun (uri, t) -> (uri, um_aux t)) exp_named_subst
- in
- C.Var (uri, exp_named_subst')
- | C.Meta (i, l) ->
- (try
- let (_, t,_) = lookup_subst i subst in
- um_aux (S.subst_meta l t)
- with CicUtil.Subst_not_found _ ->
- (* unconstrained variable, i.e. free in subst*)
- let l' =
- List.map (function None -> None | Some t -> Some (um_aux t)) l
- in
- C.Meta (i,l'))
- | C.Sort _
- | C.Implicit _ as t -> t
- | C.Cast (te,ty) -> C.Cast (um_aux te, um_aux ty)
- | C.Prod (n,s,t) -> C.Prod (n, um_aux s, um_aux t)
- | C.Lambda (n,s,t) -> C.Lambda (n, um_aux s, um_aux t)
- | C.LetIn (n,s,ty,t) -> C.LetIn (n, um_aux s, um_aux ty, um_aux t)
- | C.Appl (hd :: tl) -> appl_fun um_aux hd tl
- | C.Appl _ -> assert false
- | C.Const (uri,exp_named_subst) ->
- let exp_named_subst' =
- List.map (fun (uri, t) -> (uri, um_aux t)) exp_named_subst
- in
- C.Const (uri, exp_named_subst')
- | C.MutInd (uri,typeno,exp_named_subst) ->
- let exp_named_subst' =
- List.map (fun (uri, t) -> (uri, um_aux t)) exp_named_subst
- in
- C.MutInd (uri,typeno,exp_named_subst')
- | C.MutConstruct (uri,typeno,consno,exp_named_subst) ->
- let exp_named_subst' =
- List.map (fun (uri, t) -> (uri, um_aux t)) exp_named_subst
- in
- C.MutConstruct (uri,typeno,consno,exp_named_subst')
- | C.MutCase (sp,i,outty,t,pl) ->
- let pl' = List.map um_aux pl in
- C.MutCase (sp, i, um_aux outty, um_aux t, pl')
- | C.Fix (i, fl) ->
- let fl' =
- List.map (fun (name, i, ty, bo) -> (name, i, um_aux ty, um_aux bo)) fl
- in
- C.Fix (i, fl')
- | C.CoFix (i, fl) ->
- let fl' =
- List.map (fun (name, ty, bo) -> (name, um_aux ty, um_aux bo)) fl
- in
- C.CoFix (i, fl')
- in
- um_aux term
-;;
-
-let apply_subst =
- let appl_fun um_aux he tl =
- let tl' = List.map um_aux tl in
- let t' =
- match um_aux he with
- Cic.Appl l -> Cic.Appl (l@tl')
- | he' -> Cic.Appl (he'::tl')
- in
- begin
- match he with
- Cic.Meta (m,_) -> CicReduction.head_beta_reduce t'
- | _ -> t'
- end
- in
- fun subst t ->
-(* incr apply_subst_counter; *)
-match subst with
- [] -> t
- | _ -> apply_subst_gen ~appl_fun subst t
-;;
-
-let profiler = HExtlib.profile "U/CicMetaSubst.apply_subst"
-let apply_subst s t =
- profiler.HExtlib.profile (apply_subst s) t
-
-
-let apply_subst_context subst context =
- match subst with
- [] -> context
- | _ ->
-(*
- incr apply_subst_context_counter;
- context_length := !context_length + List.length context;
-*)
- List.fold_right
- (fun item context ->
- match item with
- | Some (n, Cic.Decl t) ->
- let t' = apply_subst subst t in
- Some (n, Cic.Decl t') :: context
- | Some (n, Cic.Def (t, ty)) ->
- let ty' = apply_subst subst ty in
- let t' = apply_subst subst t in
- Some (n, Cic.Def (t', ty')) :: context
- | None -> None :: context)
- context []
-
-let apply_subst_metasenv subst metasenv =
-(*
- incr apply_subst_metasenv_counter;
- metasenv_length := !metasenv_length + List.length metasenv;
-*)
-match subst with
- [] -> metasenv
- | _ ->
- List.map
- (fun (n, context, ty) ->
- (n, apply_subst_context subst context, apply_subst subst ty))
- (List.filter
- (fun (i, _, _) -> not (List.mem_assoc i subst))
- metasenv)
-
-let tempi_type_of_aux_subst = ref 0.0;;
-let tempi_subst = ref 0.0;;
-let tempi_type_of_aux = ref 0.0;;
-*)
-
-let newmeta =
+let newmeta,maxmeta =
let maxmeta = ref 0 in
- fun () -> incr maxmeta; !maxmeta
+ (fun () -> incr maxmeta; !maxmeta),
+ (fun () -> !maxmeta)
;;
exception NotInTheList;;
-let position n (shift, lc) =
+let position to_skip n (shift, lc) =
match lc with
+ | NCic.Irl _ when to_skip > 0 -> assert false (* unclear to me *)
| NCic.Irl len when n <= shift || n > shift + len -> raise NotInTheList
- | NCic.Itl len -> n - shift
+ | NCic.Irl _ -> n - shift
| NCic.Ctx tl ->
- let rec aux k = function
+ let rec aux to_skip k = function
| [] -> raise NotInTheList
- | (Cic.Rel m)::_ when m + shift = n -> k
- | _::tl -> aux (k+1) tl
+ | _ :: tl when to_skip > 0 -> aux (to_skip - 1) (k+1) tl
+ | (NCic.Rel m)::_ when m + shift = n -> k
+ | _::tl -> aux to_skip (k+1) tl
in
- aux 1 tl
+ aux to_skip 1 tl
+;;
+
+let pack_lc orig =
+ let rec are_contiguous k = function
+ | [] -> true
+ | (NCic.Rel j) :: tl when j = k+1 -> are_contiguous j tl
+ | _ -> false
+ in
+ match orig with
+ | _, NCic.Ctx [] -> 0, NCic.Irl 0
+ | shift, NCic.Ctx (NCic.Rel k::tl as l) when are_contiguous k tl ->
+ shift+k-1, NCic.Irl (List.length l)
+ | _ -> orig
+;;
+
+
+
+let mk_perforated_irl shift len restrictions =
+ let rec aux n =
+ if n = 0 then [] else
+ if List.mem (n+shift) restrictions then aux (n-1)
+ else (NCic.Rel n) :: aux (n-1)
+ in
+ pack_lc (shift, NCic.Ctx (List.rev (aux len)))
;;
exception Occur;;
let rec force_does_not_occur metasenv subst restrictions t =
- let rec aux k = function
- | C.Rel r when List.mem (r - k) restrictions -> raise Occur
- | C.Meta (n, l) as t ->
- (* we ignore the subst since restrict will take care of already
- * instantiated/restricted metavariabels *)
- let more_to_be_restricted = ref [] in
- let l' =
- let i = ref 0 in
- HExtlib.map_option
- (fun t ->
- incr i ;
- try
- let (*subst, metasenv,*) t = aux k t in Some t
- with Occur ->
- more_to_be_restricted := !i :: !more_to_be_restricted; None)
- l
+ let rec aux k ms = function
+ | NCic.Rel r when List.mem (r - k) restrictions -> raise Occur
+ | NCic.Rel r as orig ->
+ let amount =
+ List.length (List.filter (fun x -> x < r - k) restrictions)
+ in
+ if amount > 0 then ms, NCic.Rel (r - amount) else ms, orig
+ | NCic.Meta (n, (shift,lc as l)) as orig ->
+ let meta_chain =
+ try
+ Some (NCicUtils.lookup_subst n subst)
+ with
+ NCicUtils.Subst_not_found _ -> None
in
- if !more_to_be_restricted = [] then
- if l = l' then t else NCic.Meta (n, l')
- else
- let metasenv, subst, newmeta =
- restrict metasenv subst n !more_to_be_restricted
- in
- (*metasenv, subst,*) NCic.Meta (newmeta, l')
- | t -> NCicUtils.map (fun _ k -> k+1) k aux t
+ (match meta_chain with
+ Some (_,_,bo,_) ->
+ aux k ms (NCicSubstitution.subst_meta l bo)
+ | None ->
+ (* we ignore the subst since restrict will take care of already
+ * instantiated/restricted metavariabels *)
+ let (metasenv,subst as ms), restrictions_for_n, l' =
+ let l = NCicUtils.expand_local_context lc in
+
+ let ms, _, restrictions_for_n, l =
+ List.fold_right
+ (fun t (ms, i, restrictions_for_n, l) ->
+ try
+ let ms, t = aux (k-shift) ms t in
+ ms, i-1, restrictions_for_n, t::l
+ with Occur ->
+ ms, i-1, i::restrictions_for_n, l)
+ l (ms, List.length l, [], [])
+ in
+
+ ms, restrictions_for_n, pack_lc (shift, NCic.Ctx l)
+ in
+ if restrictions_for_n = [] then
+ ms, if l = l' then orig else NCic.Meta (n, l')
+ else
+ let metasenv, subst, newmeta =
+ restrict metasenv subst n restrictions_for_n
+ in
+ (metasenv, subst), NCic.Meta (newmeta, l'))
+ | t -> NCicUntrusted.map_term_fold_a (fun _ k -> k+1) k aux ms t
in
- aux 0 t
+ aux 0 (metasenv,subst) t
and force_does_not_occur_in_context metasenv subst restrictions = function
| name, NCic.Decl t as orig ->
- let metasenv, subst, t' =
- force_does_not_occur metasenv subst restrictions t
- in
+ let (metasenv, subst), t' =
+ force_does_not_occur metasenv subst restrictions t in
metasenv, subst, (if t == t' then orig else (name,NCic.Decl t'))
| name, NCic.Def (bo, ty) as orig ->
- let metasenv, subst, bo' =
+ let (metasenv, subst), bo' =
force_does_not_occur metasenv subst restrictions bo in
- let metasenv, subst, ty' =
+ let (metasenv, subst), ty' =
force_does_not_occur metasenv subst restrictions ty in
metasenv, subst,
(if bo == bo' && ty == ty' then orig else (name, NCic.Def (bo', ty')))
| [] -> metasenv, subst, restrictions, []
| hd::tl as orig ->
let metasenv, subst, restricted, tl' =
- erase_in_context metasenv subst (i+1) restrictions tl in
- if List.mem i restricted then
+ erase_in_context metasenv subst (pos+1) restrictions tl in
+ if List.mem pos restricted then
metasenv, subst, restricted, tl'
else
try
let metasenv, subst, hd' =
- let delifted_restricted = List.map ((+) ~-i) restricted in
- force_does_not_occur_in_context
- metasenv susbst delifted_restricted hd
+ let delifted_restricted =
+ List.map ((+) ~-pos) (List.filter ((<=) pos) restricted) in
+ force_does_not_occur_in_context
+ metasenv subst delifted_restricted hd
in
metasenv, subst, restricted,
(if hd' == hd && tl' == tl then orig else (hd' :: tl'))
with Occur ->
- metasenv, subst, (i :: restricted), tl'
+ metasenv, subst, (pos :: restricted), tl'
and restrict metasenv subst i restrictions =
assert (restrictions <> []);
try
let name, ctx, bo, ty = NCicUtils.lookup_subst i subst in
try
- let name, ctx, ty = NCicUtils.lookup_meta i metasenv in
let metasenv, subst, restrictions, newctx =
- erase_in_context metasenv subst 1 restrictions in
- let metasenv, subst, _ =
+ erase_in_context metasenv subst 1 restrictions ctx in
+ let (metasenv, subst), newty =
force_does_not_occur metasenv subst restrictions ty in
- let metasenv, subst, _ =
+ let (metasenv, subst), newbo =
force_does_not_occur metasenv subst restrictions bo in
- (* we don't care newly generated bo/tys since up to subst they are
- * convertible (only metas are substituted for metas *)
- metasenv, subst, ?
+ let j = newmeta () in
+ let subst_entry_j = j, (name, newctx, newbo, newty) in
+ let reloc_irl = mk_perforated_irl 0 (List.length ctx) restrictions in
+ let subst_entry_i = i, (name, ctx, NCic.Meta (j, reloc_irl), ty) in
+ let new_subst =
+ subst_entry_j :: List.map
+ (fun (n,_) as orig -> if i = n then subst_entry_i else orig) subst
+ in
+(*
+ prerr_endline ("restringo nella subst: " ^string_of_int i ^ " -> " ^
+ string_of_int j ^ "\n" ^
+ NCicPp.ppsubst ~metasenv [subst_entry_j] ^ "\n\n" ^
+ NCicPp.ppsubst ~metasenv [subst_entry_i] ^ "\n" ^
+ NCicPp.ppterm ~metasenv ~subst ~context:ctx bo ^ " ---- " ^
+ NCicPp.ppterm ~metasenv ~subst ~context:newctx newbo
+ );
+*)
+ metasenv, new_subst, j
with Occur -> raise (MetaSubstFailure (lazy (Printf.sprintf
("Cannot restrict the context of the metavariable ?%d over "^^
"the hypotheses %s since ?%d is already instantiated "^^
"with %s and at least one of the hypotheses occurs in "^^
- "the substituted term" i (String.concat ", "
+ "the substituted term") i (String.concat ", "
(List.map (fun x -> fst (List.nth ctx (x-1))) restrictions)) i
- (NCicPp.ppterm ~metasenv ~subst ~context:ctx bo)))))
+ (NCicPp.ppterm ~metasenv ~subst ~context:ctx bo))))
with NCicUtils.Subst_not_found _ ->
try
let name, ctx, ty = NCicUtils.lookup_meta i metasenv in
- let metasenv, subst, restrictions, newctx =
- erase_in_context metasenv subst 1 restrictions in
- let metasenv, subst, newty =
- force_does_not_occur metasenv subst restrictions ty in
- let j = newmeta () in
- let metasenv_entry = j, (name, newctx, newty) in
- let subst_entry = i,(name,ctx, NCic.Meta (j, irl - restrictions), ty) in
- List.map
- (fun (n,x) as orig -> if i = n then metasenv_entry else orig) metasenv,
- subst_entry :: subst, j
+ try
+ let metasenv, subst, restrictions, newctx =
+ erase_in_context metasenv subst 1 restrictions ctx in
+ let (metasenv, subst), newty =
+ force_does_not_occur metasenv subst restrictions ty in
+ let j = newmeta () in
+ let metasenv_entry = j, (name, newctx, newty) in
+ let reloc_irl =
+ mk_perforated_irl 0 (List.length ctx) restrictions in
+ let subst_entry = i, (name, ctx, NCic.Meta (j, reloc_irl), ty) in
+ List.map
+ (fun (n,_) as orig -> if i = n then metasenv_entry else orig)
+ metasenv,
+ subst_entry :: subst, j
+ with Occur -> raise (MetaSubstFailure (lazy (Printf.sprintf
+ ("Cannot restrict the context of the metavariable ?%d "^^
+ "over the hypotheses %s since metavariable's type depends "^^
+ "on at least one of them") i (String.concat ", "
+ (List.map (fun x -> fst (List.nth ctx (x-1))) restrictions)))))
with
| NCicUtils.Meta_not_found _ -> assert false
- | Occur -> raise (MetaSubstFailure (lazy (Printf.sprintf
- ("Cannot restrict the context of the metavariable ?%d "^^
- "over the hypotheses %s since metavariable's type depends "^^
- "on at least one of them" i (String.concat ", "
- (List.map (fun x -> fst (List.nth ctx (x-1))) restrictions))))))
+;;
+
+let rec flexible_arg subst = function
+ | NCic.Meta (i,_) | NCic.Appl (NCic.Meta (i,_) :: _)->
+ (try
+ let _,_,t,_ = List.assoc i subst in
+ flexible_arg subst t
+ with Not_found -> true)
+ | _ -> false
+;;
+
+let in_scope_tag = "tag:in_scope" ;;
+let out_scope_tag_prefix = "tag:out_scope:"
+let out_scope_tag n = out_scope_tag_prefix ^ string_of_int n ;;
+let is_out_scope_tag tag =
+ String.length tag > String.length out_scope_tag_prefix &&
+ String.sub tag 0 (String.length out_scope_tag_prefix) = out_scope_tag_prefix
+;;
+let int_of_out_scope_tag tag =
+ int_of_string
+ (String.sub tag (String.length out_scope_tag_prefix)
+ (String.length tag - (String.length out_scope_tag_prefix)))
+;;
+
+
+exception Found;;
(* INVARIANT: we suppose that t is not another occurrence of Meta(n,_),
otherwise the occur check does not make sense in case of unification
of ?n with ?n *)
-let delift metasenv subst context n l t =
- let to_be_restricted = ref [] in
- let rec aux k = function
- | NCic.Rel n as t when n <= k -> t
+let delift ~unify metasenv subst context n l t =
+ let is_in_scope_meta subst = function
+ | NCic.Meta (i,_) ->
+ (try
+ let tag, _, _, _ = NCicUtils.lookup_subst i subst in
+ tag = Some in_scope_tag
+ with NCicUtils.Subst_not_found _ -> false)
+ | _ -> false
+ in
+ let contains_in_scope subst t =
+ let rec aux _ () = function
+ | NCic.Meta _ as t ->
+ if is_in_scope_meta subst t then raise Found
+ else ()
+ | t ->
+ if is_in_scope_meta subst t then raise Found
+ else NCicUtils.fold (fun _ () -> ()) () aux () t
+ in
+ try aux () () t; false with Found -> true
+ in
+ let unify_list in_scope =
+ match l with
+ | _, NCic.Irl _ -> fun _ _ _ _ _ -> None
+ | shift, NCic.Ctx l -> fun metasenv subst context k t ->
+ if flexible_arg subst t || contains_in_scope subst t then None else
+ let lb = List.map (fun t -> t, flexible_arg subst t) l in
+ HExtlib.list_findopt
+ (fun (li,flexible) i ->
+ if flexible || i < in_scope then None else
+ let li = NCicSubstitution.lift (k+shift) li in
+ match unify metasenv subst context li t with
+ | Some (metasenv,subst) ->
+ Some ((metasenv, subst), NCic.Rel (i+1+k))
+ | None -> None)
+ lb
+ in
+ let rec aux (context,k,in_scope) (metasenv, subst as ms) t =
+ match unify_list in_scope metasenv subst context k t with
+ | Some x -> x
+ | None ->
+ match t with
+ | NCic.Rel n as t when n <= k -> ms, t
| NCic.Rel n ->
(try
match List.nth context (n-k-1) with
| _,NCic.Def (bo,_) ->
- (try C.Rel ((position (n-k) l) + k)
+ (try ms, NCic.Rel ((position in_scope (n-k) l) + k)
with NotInTheList ->
(* CSC: This bit of reduction hurts performances since it is
* possible to have an exponential explosion of the size of the
* proof. required for nat/nth_prime.ma *)
- aux k (NCicSubstitution.lift n bo))
- | _,NCic.Decl _ -> NCic.Rel ((position (n-k) l) + k)
+ aux (context,k,in_scope) ms (NCicSubstitution.lift n bo))
+ | _,NCic.Decl _ -> ms, NCic.Rel ((position in_scope (n-k) l) + k)
with Failure _ -> assert false) (*Unbound variable found in delift*)
+ | NCic.Meta (i,_) when i=n ->
+ raise (MetaSubstFailure (lazy (Printf.sprintf (
+ "Cannot unify the metavariable ?%d with a term that has "^^
+ "as subterm %s in which the same metavariable "^^
+ "occurs (occur check)") i
+ (NCicPp.ppterm ~context ~metasenv ~subst t))))
| NCic.Meta (i,l1) as orig ->
(try
- let _,_,t,_ = NCicUtil.lookup_subst i subst in
- aux k (NCicSubstitution.subst_meta l1 t)
- with NCicUtil.Subst_not_found _ ->
- (* see the top level invariant *)
- if (i = n) then
- raise (MetaSubstFailure (lazy (Printf.sprintf (
- "Cannot unify the metavariable ?%d with a term that has "^^
- "as subterm %s in which the same metavariable "^^
- "occurs (occur check)") i
- (NCicPp.ppterm ~context ~metasenv ~subst t))))
+ let tag,c,t,ty = NCicUtils.lookup_subst i subst in
+ let in_scope, clear =
+ match tag with
+ | Some tag when tag = in_scope_tag -> 0, true
+ | Some tag when is_out_scope_tag tag->int_of_out_scope_tag tag,true
+ | _ -> in_scope, false
+ in
+ let ms =
+ if not clear then ms
+ else
+ metasenv,
+ (i,(None,c,t,ty)) :: List.filter (fun j,_ -> i <> j) subst
+ in
+ aux (context,k,in_scope) ms (NCicSubstitution.subst_meta l1 t)
+ with NCicUtils.Subst_not_found _ ->
+ if snd l1 = NCic.Irl 0 || snd l1 = NCic.Ctx [] then ms, orig
else
let shift1,lc1 = l1 in
let shift,lc = l in
+ let shift = shift + k in
match lc, lc1 with
| NCic.Irl len, NCic.Irl len1
- when shift1 < shift || len1 + shift1 > len + shift ->
- let restrictions =
- HExtlib.list_seq 1 (shift - shift1) @
- HExtlib.list_seq (shift+len+1) (shift1+len1)
- in
- let subst, metasenv, newmeta =
+ when shift1 + len1 < shift || shift1 > shift + len ->
+ let restrictions = HExtlib.list_seq 1 (len1 + 1) in
+ let metasenv, subst, newmeta =
restrict metasenv subst i restrictions
in
- (* return that meta *)
- assert false
- | NCic.Irl len, NCic.Irl len1 when shift = 0 -> orig
+ (metasenv, subst),
+ NCic.Meta (newmeta, (0,NCic.Irl (max 0 (k-shift1))))
| NCic.Irl len, NCic.Irl len1 ->
- NCic.Meta (i, (shift1 - shift, lc1))
- | _ ->
+ let low_restrictions, new_shift =
+ if k <= shift1 && shift1 < shift then
+ HExtlib.list_seq 1 (shift - shift1 + 1), k
+ else if shift1 < k (* <= shift *) then
+ let save_below = k - shift1 in
+ HExtlib.list_seq (save_below + 1) (shift - shift1 + 1),
+ shift1
+ else [], shift1 - shift + k
+ in
+ let high_restrictions =
+ let last = shift + len in
+ let last1 = shift1 + len1 in
+ if last1 > last then
+ let high_gap = last1 - last in
+ HExtlib.list_seq (len1 - high_gap + 1) (len1 + 1)
+ else []
+ in
+ let restrictions = low_restrictions @ high_restrictions in
+ if restrictions = [] then
+ if shift = k then ms, orig
+ else ms, NCic.Meta (i, (new_shift, lc1))
+ else
+ let metasenv, subst, newmeta =
+ restrict metasenv subst i restrictions
+ in
+(* {{{
+ prerr_endline ("RESTRICTIONS FOR: " ^
+ NCicPp.ppterm ~metasenv ~subst ~context:[]
+ (NCic.Meta (i,l1))^" that was part of a term unified with "
+ ^ NCicPp.ppterm ~metasenv ~subst ~context:[] (NCic.Meta
+ (n,l)) ^ " ====> " ^ String.concat "," (List.map
+ string_of_int restrictions) ^ "\nMENV:\n" ^
+ NCicPp.ppmetasenv ~subst metasenv ^ "\nSUBST:\n" ^
+ NCicPp.ppsubst subst ~metasenv);
+}}} *)
+ let newlc_len = len1 - List.length restrictions in
+ let meta =
+ NCic.Meta(newmeta,(new_shift, NCic.Irl newlc_len))
+ in
+ assert (
+ let _, cctx, _ = NCicUtils.lookup_meta newmeta metasenv in
+ List.length cctx = newlc_len);
+ (metasenv, subst), meta
+
+ | _ ->
let lc1 = NCicUtils.expand_local_context lc1 in
- let rec deliftl j = function
- | [] -> []
+ let lc1 = List.map (NCicSubstitution.lift shift1) lc1 in
+ let rec deliftl tbr j ms = function
+ | [] -> ms, tbr, []
| t::tl ->
- let tl = deliftl (j+1) tl in
- try (aux (k+shift1) t)::tl
+ let ms, tbr, tl = deliftl tbr (j+1) ms tl in
+ try
+ let ms, t = aux (context,k,in_scope) ms t in
+ ms, tbr, t::tl
with
- | NotInTheList | MetaSubstFailure _ ->
- to_be_restricted := (i,j)::!to_be_restricted;
- tl
+ | NotInTheList | MetaSubstFailure _ -> ms, j::tbr, tl
in
- let l1 = deliftl 1 l1 in
- C.Meta(i,l1)) (* or another ?k and possibly compress l1 *)
- | t -> NCicUtils.map (fun _ k -> k+1) k aux t
- in
- let t = aux 0 t in
- let metasenv, subst = restrict subst !to_be_restricted metasenv in
- metasenv, subst, t
-;;
-
+ let (metasenv, subst), to_be_r, lc1' = deliftl [] 1 ms lc1 in
+(*
+ prerr_endline ("TO BE RESTRICTED: " ^
+ (String.concat "," (List.map string_of_int to_be_r)));
+*)
+ let l1 = pack_lc (0, NCic.Ctx lc1') in
(*
+ prerr_endline ("newmeta:" ^ NCicPp.ppterm
+ ~metasenv ~subst ~context (NCic.Meta (999,l1)));
+*)
+ if to_be_r = [] then
+ (metasenv, subst),
+ (if lc1' = lc1 then orig else NCic.Meta (i,l1))
+ else
+ let metasenv, subst, newmeta =
+ restrict metasenv subst i to_be_r in
+ (metasenv, subst), NCic.Meta(newmeta,l1))
+
+ | t ->
+ NCicUntrusted.map_term_fold_a
+ (fun e (c,k,s) -> (e::c,k+1,s)) (context,k,in_scope) aux ms t
in
- let res =
- try
- deliftaux 0 t
- with
- NotInTheList ->
+ try aux (context,0,0) (metasenv,subst) t
+ with NotInTheList ->
(* This is the case where we fail even first order unification. *)
(* The reason is that our delift function is weaker than first *)
(* order (in the sense of alpha-conversion). See comment above *)
(* related to the delift function. *)
-(* debug_print (lazy "First Order UnificationFailure during delift") ;
-debug_print(lazy (sprintf
- "Error trying to abstract %s over [%s]: the algorithm only tried to abstract over bound variables"
- (ppterm subst t)
- (String.concat "; "
- (List.map
- (function Some t -> ppterm subst t | None -> "_") l
- )))); *)
- let msg = (lazy (sprintf
- "Error trying to abstract %s over [%s]: the algorithm only tried to abstract over bound variables"
- (ppterm ~metasenv subst t)
- (String.concat "; "
- (List.map
- (function Some t -> ppterm ~metasenv subst t | None -> "_")
- l))))
+ let msg = (lazy (Printf.sprintf
+ ("Error trying to abstract %s over [%s]: the algorithm only tried to "^^
+ "abstract over bound variables") (NCicPp.ppterm ~metasenv ~subst
+ ~context t) (String.concat "; " (List.map (NCicPp.ppterm ~metasenv
+ ~subst ~context) (let shift, lc = l in List.map (NCicSubstitution.lift
+ shift) (NCicUtils.expand_local_context lc))))))
in
+ let shift, lc = l in
+ let lc = NCicUtils.expand_local_context lc in
+ let l = List.map (NCicSubstitution.lift shift) lc in
if
- List.exists
- (function
- Some t -> CicUtil.is_meta_closed (apply_subst subst t)
- | None -> true) l
+ List.exists (fun t-> NCicUntrusted.metas_of_term subst context t <> [])l
then
raise (Uncertain msg)
else
raise (MetaSubstFailure msg)
- in
- let (metasenv, subst) = restrict subst !to_be_restricted metasenv in
- res, metasenv, subst
;;
-*)
-
-(*
-(* delifts a term t of n levels strating from k, that is changes (Rel m)
- * to (Rel (m - n)) when m > (k + n). if k <= m < k + n delift fails
- *)
-let delift_rels_from subst metasenv k n =
- let rec liftaux subst metasenv k =
- let module C = Cic in
- function
- C.Rel m as t ->
- if m < k then
- t, subst, metasenv
- else if m < k + n then
- raise DeliftingARelWouldCaptureAFreeVariable
- else
- C.Rel (m - n), subst, metasenv
- | C.Var (uri,exp_named_subst) ->
- let exp_named_subst',subst,metasenv =
- List.fold_right
- (fun (uri,t) (l,subst,metasenv) ->
- let t',subst,metasenv = liftaux subst metasenv k t in
- (uri,t')::l,subst,metasenv) exp_named_subst ([],subst,metasenv)
- in
- C.Var (uri,exp_named_subst'),subst,metasenv
- | C.Meta (i,l) ->
- (try
- let (_, t,_) = lookup_subst i subst in
- liftaux subst metasenv k (CicSubstitution.subst_meta l t)
- with CicUtil.Subst_not_found _ ->
- let l',to_be_restricted,subst,metasenv =
- let rec aux con l subst metasenv =
- match l with
- [] -> [],[],subst,metasenv
- | he::tl ->
- let tl',to_be_restricted,subst,metasenv =
- aux (con + 1) tl subst metasenv in
- let he',more_to_be_restricted,subst,metasenv =
- match he with
- None -> None,[],subst,metasenv
- | Some t ->
- try
- let t',subst,metasenv = liftaux subst metasenv k t in
- Some t',[],subst,metasenv
- with
- DeliftingARelWouldCaptureAFreeVariable ->
- None,[i,con],subst,metasenv
- in
- he'::tl',more_to_be_restricted@to_be_restricted,subst,metasenv
- in
- aux 1 l subst metasenv in
- let metasenv,subst = restrict subst to_be_restricted metasenv in
- C.Meta(i,l'),subst,metasenv)
- | C.Sort _ as t -> t,subst,metasenv
- | C.Implicit _ as t -> t,subst,metasenv
- | C.Cast (te,ty) ->
- let te',subst,metasenv = liftaux subst metasenv k te in
- let ty',subst,metasenv = liftaux subst metasenv k ty in
- C.Cast (te',ty'),subst,metasenv
- | C.Prod (n,s,t) ->
- let s',subst,metasenv = liftaux subst metasenv k s in
- let t',subst,metasenv = liftaux subst metasenv (k+1) t in
- C.Prod (n,s',t'),subst,metasenv
- | C.Lambda (n,s,t) ->
- let s',subst,metasenv = liftaux subst metasenv k s in
- let t',subst,metasenv = liftaux subst metasenv (k+1) t in
- C.Lambda (n,s',t'),subst,metasenv
- | C.LetIn (n,s,ty,t) ->
- let s',subst,metasenv = liftaux subst metasenv k s in
- let ty',subst,metasenv = liftaux subst metasenv k ty in
- let t',subst,metasenv = liftaux subst metasenv (k+1) t in
- C.LetIn (n,s',ty',t'),subst,metasenv
- | C.Appl l ->
- let l',subst,metasenv =
- List.fold_right
- (fun t (l,subst,metasenv) ->
- let t',subst,metasenv = liftaux subst metasenv k t in
- t'::l,subst,metasenv) l ([],subst,metasenv) in
- C.Appl l',subst,metasenv
- | C.Const (uri,exp_named_subst) ->
- let exp_named_subst',subst,metasenv =
- List.fold_right
- (fun (uri,t) (l,subst,metasenv) ->
- let t',subst,metasenv = liftaux subst metasenv k t in
- (uri,t')::l,subst,metasenv) exp_named_subst ([],subst,metasenv)
- in
- C.Const (uri,exp_named_subst'),subst,metasenv
- | C.MutInd (uri,tyno,exp_named_subst) ->
- let exp_named_subst',subst,metasenv =
- List.fold_right
- (fun (uri,t) (l,subst,metasenv) ->
- let t',subst,metasenv = liftaux subst metasenv k t in
- (uri,t')::l,subst,metasenv) exp_named_subst ([],subst,metasenv)
- in
- C.MutInd (uri,tyno,exp_named_subst'),subst,metasenv
- | C.MutConstruct (uri,tyno,consno,exp_named_subst) ->
- let exp_named_subst',subst,metasenv =
- List.fold_right
- (fun (uri,t) (l,subst,metasenv) ->
- let t',subst,metasenv = liftaux subst metasenv k t in
- (uri,t')::l,subst,metasenv) exp_named_subst ([],subst,metasenv)
- in
- C.MutConstruct (uri,tyno,consno,exp_named_subst'),subst,metasenv
- | C.MutCase (sp,i,outty,t,pl) ->
- let outty',subst,metasenv = liftaux subst metasenv k outty in
- let t',subst,metasenv = liftaux subst metasenv k t in
- let pl',subst,metasenv =
- List.fold_right
- (fun t (l,subst,metasenv) ->
- let t',subst,metasenv = liftaux subst metasenv k t in
- t'::l,subst,metasenv) pl ([],subst,metasenv)
- in
- C.MutCase (sp,i,outty',t',pl'),subst,metasenv
- | C.Fix (i, fl) ->
- let len = List.length fl in
- let liftedfl,subst,metasenv =
- List.fold_right
- (fun (name, i, ty, bo) (l,subst,metasenv) ->
- let ty',subst,metasenv = liftaux subst metasenv k ty in
- let bo',subst,metasenv = liftaux subst metasenv (k+len) bo in
- (name,i,ty',bo')::l,subst,metasenv
- ) fl ([],subst,metasenv)
- in
- C.Fix (i, liftedfl),subst,metasenv
- | C.CoFix (i, fl) ->
- let len = List.length fl in
- let liftedfl,subst,metasenv =
- List.fold_right
- (fun (name, ty, bo) (l,subst,metasenv) ->
- let ty',subst,metasenv = liftaux subst metasenv k ty in
- let bo',subst,metasenv = liftaux subst metasenv (k+len) bo in
- (name,ty',bo')::l,subst,metasenv
- ) fl ([],subst,metasenv)
- in
- C.CoFix (i, liftedfl),subst,metasenv
- in
- liftaux subst metasenv k
-let delift_rels subst metasenv n t =
- delift_rels_from subst metasenv 1 n t
-*)
+let mk_meta ?name metasenv context ty =
+ let tyof = function Some s -> Some ("typeof_"^s) | None -> None in
+ let rec mk_meta name n metasenv context = function
+ | `WithType ty ->
+ let len = List.length context in
+ let menv_entry = (n, (name, context, ty)) in
+ menv_entry :: metasenv, n, NCic.Meta (n, (0,NCic.Irl len)), ty
+ | `Sort ->
+ let ty = NCic.Implicit (`Typeof n) in
+ mk_meta (tyof name) n metasenv [] (`WithType ty)
+ | `Type ->
+ let metasenv, _, ty, _ =
+ mk_meta (tyof name) (newmeta ()) metasenv context `Sort in
+ mk_meta name n metasenv context (`WithType ty)
+ | `Term ->
+ let metasenv, _, ty, _ =
+ mk_meta (tyof name) (newmeta ()) metasenv context `Type in
+ mk_meta name n metasenv context (`WithType ty)
+ in
+ mk_meta name (newmeta ()) metasenv context ty
+;;
+let saturate ?(delta=0) metasenv subst context ty goal_arity =
+ assert (goal_arity >= 0);
+ let rec aux metasenv = function
+ | NCic.Prod (name,s,t) as ty ->
+ let metasenv1, _, arg,_ =
+ mk_meta ~name:name metasenv context (`WithType s) in
+ let t, metasenv1, args, pno =
+ aux metasenv1 (NCicSubstitution.subst arg t)
+ in
+ if pno + 1 = goal_arity then
+ ty, metasenv, [], goal_arity+1
+ else
+ t, metasenv1, arg::args, pno+1
+ | ty ->
+ match NCicReduction.whd ~subst context ty ~delta with
+ | NCic.Prod _ as ty -> aux metasenv ty
+ | ty -> ty, metasenv, [], 0
+ in
+ let res, newmetasenv, arguments, _ = aux metasenv ty in
+ res, newmetasenv, arguments
+;;
projects / helm.git / blobdiff