(* $Id$ *)
+let debug = ref false;;
+let indent = ref "";;
+let times = ref [];;
+let pp s =
+ if !debug then
+ prerr_endline (Printf.sprintf "%-20s" !indent ^ " " ^ Lazy.force s)
+;;
+let inside c =
+ if !debug then
+ begin
+ let time1 = Unix.gettimeofday () in
+ indent := !indent ^ String.make 1 c;
+ times := time1 :: !times;
+ prerr_endline ("{{{" ^ !indent ^ " ")
+ end
+;;
+let outside exc_opt =
+ if !debug then
+ begin
+ let time2 = Unix.gettimeofday () in
+ let time1 =
+ match !times with time1::tl -> times := tl; time1 | [] -> assert false in
+ prerr_endline ("}}} " ^ string_of_float (time2 -. time1));
+ (match exc_opt with
+ | Some e -> prerr_endline ("exception raised: " ^ Printexc.to_string e)
+ | None -> ());
+ try
+ indent := String.sub !indent 0 (String.length !indent -1)
+ with
+ Invalid_argument _ -> indent := "??"; ()
+ end
+;;
+
exception MetaSubstFailure of string Lazy.t
exception Uncertain of string Lazy.t
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)
+ (try
+ let _,_,bo,_ = NCicUtils.lookup_subst n subst in
+ aux k ms (NCicSubstitution.subst_meta l bo)
with
- NCicUtils.Subst_not_found _ -> None
- in
- (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
+ NCicUtils.Subst_not_found _ ->
+ (* 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'))
+ 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 (metasenv,subst) t
otherwise the occur check does not make sense in case of unification
of ?n with ?n *)
let delift ~unify metasenv subst context n l t =
+ (*D*) inside 'D'; try let rc =
let is_in_scope_meta subst = function
| NCic.Meta (i,_) ->
(try
| NotInTheList | MetaSubstFailure _ -> ms, j::tbr, tl
in
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)));
-*)
+ pp (lazy ("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)));
-*)
+ pp (lazy ("newmeta:" ^ NCicPp.ppterm
+ ~metasenv ~subst ~context (NCic.Meta (999,l1))));
+ pp (lazy (NCicPp.ppmetasenv ~subst metasenv));
if to_be_r = [] then
(metasenv, subst),
(if lc1' = lc1 then orig else NCic.Meta (i,l1))
raise (Uncertain msg)
else
raise (MetaSubstFailure msg)
+ (*D*) in outside None; rc with exn -> outside (Some exn); raise exn
;;
-let mk_meta ?(attrs=[]) metasenv context ty =
- let tyof = List.map (function `Name s -> `Name ("typeof_"^s) | x -> x) in
- let rec mk_meta attrs n metasenv context = function
- | `WithType ty ->
- let len = List.length context in
- let menv_entry = (n, (attrs, 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 (`IsSort::tyof attrs) n metasenv [] (`WithType ty)
- | `Type ->
- let metasenv, _, ty, _ =
- mk_meta (tyof attrs) (newmeta ()) metasenv context `Sort in
- mk_meta attrs n metasenv context (`WithType ty)
- | `Term ->
- let metasenv, _, ty, _ =
- mk_meta (tyof attrs) (newmeta ()) metasenv context `Type in
- mk_meta attrs n metasenv context (`WithType ty)
- in
- mk_meta attrs (newmeta ()) metasenv context ty
+let mk_meta ?(attrs=[]) metasenv context ?with_type kind =
+ assert(kind <> `IsSort || context = []);
+ let n = newmeta () in
+ let ty= match with_type with None-> NCic.Implicit (`Typeof n)| Some x ->x in
+ let len = List.length context in
+ let attrs = NCicUntrusted.set_kind kind attrs in
+ let menv_entry = (n, (attrs, context, ty)) in
+ menv_entry :: metasenv, n, NCic.Meta (n, (0,NCic.Irl len)), ty
+;;
+
+let extend_meta metasenv n =
+ try
+ let attrs,cc,ty = NCicUtils.lookup_meta n metasenv in
+ (match ty with
+ | NCic.Implicit (`Typeof _) ->
+ let mk_meta context kind =
+ let metasenv, _, ty, _ = mk_meta metasenv context kind in
+ (n, (attrs, cc, ty)) :: List.filter (fun x,_ -> x <> n) metasenv, ty
+ in
+ (match NCicUntrusted.kind_of_meta attrs with
+ | `IsSort
+ | `IsType -> mk_meta [] `IsSort
+ | `IsTerm -> mk_meta cc `IsType)
+ | ty -> metasenv, ty)
+ with NCicUtils.Meta_not_found _ -> assert false
;;
let saturate ?(delta=0) metasenv subst context ty goal_arity =
let rec aux metasenv = function
| NCic.Prod (name,s,t) as ty ->
let metasenv1, _, arg,_ =
- mk_meta ~attrs:[`Name name] metasenv context (`WithType s) in
+ mk_meta ~attrs:[`Name name] metasenv context ~with_type:s `IsTerm in
let t, metasenv1, args, pno =
aux metasenv1 (NCicSubstitution.subst arg t)
in
projects / helm.git / blobdiff