prerr_endline ("{{{" ^ !indent ^ " ")
end
;;
-let outside ok =
+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));
- if not ok then prerr_endline "exception raised!";
+ (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
| C.Appl [] | C.LetIn _ | C.Implicit _ -> assert false
;;
-let rec lambda_intros rdb metasenv subst context t args =
- let tty = NCicTypeChecker.typeof ~metasenv ~subst context t in
- let argsty =
- List.map
- (fun arg -> arg, NCicTypeChecker.typeof ~metasenv ~subst context arg) args in
- let context_of_args = context in
- let rec mk_lambda metasenv subst context n processed_args = function
- | [] ->
+let rec lambda_intros rdb metasenv subst context argsno ty =
+ pp (lazy ("LAMBDA INTROS: " ^ NCicPp.ppterm ~metasenv ~subst ~context ty));
+ match argsno with
+ 0 ->
let metasenv, _, bo, _ =
- NCicMetaSubst.mk_meta metasenv context
- (`WithType (NCicSubstitution.lift n tty))
+ NCicMetaSubst.mk_meta metasenv context (`WithType ty)
in
- metasenv, subst, bo
- | (arg,ty)::tail ->
- pp(lazy("arg{ " ^
- NCicPp.ppterm ~metasenv ~subst ~context:context_of_args arg ^ " : " ^
- NCicPp.ppterm ~metasenv ~subst ~context:context_of_args ty));
- let metasenv, subst, telescopic_ty =
- if processed_args = [] then metasenv, subst, ty else
- let _ = pp(lazy("delift")) in
- delift_type_wrt_terms rdb metasenv subst context
- (NCicSubstitution.lift n ty)
- (List.map (NCicSubstitution.lift n) (List.rev processed_args))
- in
- pp(lazy("arg} "^NCicPp.ppterm ~metasenv ~subst ~context telescopic_ty));
- let name = "HBeta"^string_of_int n in
- let metasenv, subst, bo =
- mk_lambda metasenv subst ((name,NCic.Decl telescopic_ty)::context) (n+1)
- (arg::processed_args) tail
- in
- metasenv, subst, NCic.Lambda (name, telescopic_ty, bo)
- in
- pp(lazy("LAMBDA_INTROS{ " ^
- NCicPp.ppterm ~metasenv ~subst ~context t ^ ":" ^
- NCicPp.ppterm ~metasenv ~subst ~context tty ^ " over " ^
- String.concat "," (List.map (NCicPp.ppterm ~metasenv ~subst ~context)args)));
- let rc = mk_lambda metasenv subst context 0 [] argsty in
- pp(lazy("LAMBDA_INTROS}"));
- rc
-
-and instantiate rdb test_eq_only metasenv subst context n lc t swap =
+ metasenv, bo
+ | _ ->
+ (match NCicReduction.whd ~subst context ty with
+ C.Prod (n,so,ta) ->
+ let metasenv,bo =
+ lambda_intros rdb metasenv subst
+ ((n,C.Decl so)::context) (argsno - 1) ta
+ in
+ metasenv,C.Lambda (n,so,bo)
+ | _ -> assert false)
+;;
+
+let rec instantiate rdb test_eq_only metasenv subst context n lc t swap =
(*D*) inside 'I'; try let rc =
pp (lazy(string_of_int n ^ " :=?= "^
NCicPp.ppterm ~metasenv ~subst ~context t));
let metasenv = List.filter (fun x,_ -> i <> x) metasenv in
metasenv, subst, m, j
| NCic.Appl (NCic.Meta _ as hd :: args) as t ->
- let metasenv, subst, lambda_Mj =
- lambda_intros rdb metasenv subst context t args
+ let metasenv, lambda_Mj =
+ lambda_intros rdb metasenv subst context (List.length args)
+ (NCicTypeChecker.typeof ~metasenv ~subst context hd)
in
let metasenv,subst= unify true metasenv subst context hd lambda_Mj in
let t = NCicReduction.whd ~subst context t in
List.filter (fun (m,_) -> not (n = m)) metasenv
in
metasenv, subst
- (*D*) in outside true; rc with exn -> outside false; raise exn
+ (*D*) in outside None; rc with exn -> outside (Some exn); raise exn
and unify rdb test_eq_only metasenv subst context t1 t2 =
(*D*) inside 'U'; try let rc =
| _, NCic.Meta (n, _) when is_locked n subst ->
(let (metasenv, subst), i =
match NCicReduction.whd ~subst context t1 with
- | NCic.Appl (NCic.Meta (i,l)::args) ->
- let metasenv, subst, lambda_Mj =
- lambda_intros rdb metasenv subst context t1 args
+ | NCic.Appl (NCic.Meta (i,l) as meta :: args) ->
+ let metasenv, lambda_Mj =
+ lambda_intros rdb metasenv subst context (List.length args)
+ (NCicTypeChecker.typeof ~metasenv ~subst context meta)
in
unify rdb test_eq_only metasenv subst context
(C.Meta (i,l)) lambda_Mj,
instantiate rdb test_eq_only metasenv subst context n lc
(NCicReduction.head_beta_reduce ~subst t) true
- | NCic.Appl (NCic.Meta (i,l)::args), _ ->
- let metasenv, subst, lambda_Mj =
- lambda_intros rdb metasenv subst context t1 args
+ | NCic.Appl (NCic.Meta (i,l) as meta :: args), _ ->
+ let metasenv, lambda_Mj =
+ lambda_intros rdb metasenv subst context (List.length args)
+ (NCicTypeChecker.typeof ~metasenv ~subst context meta)
in
let metasenv, subst =
try
unify rdb test_eq_only metasenv subst context
(C.Meta (i,l)) lambda_Mj
- with UnificationFailure msg | Uncertain msg ->
+ with UnificationFailure msg | Uncertain msg when not norm2->
(* failure: let's try again argument vs argument *)
raise (KeepReducing msg)
in
metasenv, ((i, (name, ctx, term, ty)) :: subst)
with Not_found -> assert false)
- | _, NCic.Appl (NCic.Meta (i,l)::args) ->
- let metasenv, subst, lambda_Mj =
- lambda_intros rdb metasenv subst context t2 args
+ | _, NCic.Appl (NCic.Meta (i,l) as meta :: args) ->
+ let metasenv, lambda_Mj =
+ lambda_intros rdb metasenv subst context (List.length args)
+ (NCicTypeChecker.typeof ~metasenv ~subst context meta)
in
let metasenv, subst =
try
unify rdb test_eq_only metasenv subst context
lambda_Mj (C.Meta (i,l))
- with UnificationFailure msg | Uncertain msg ->
+ with UnificationFailure msg | Uncertain msg when not norm1 ->
(* failure: let's try again argument vs argument *)
raise (KeepReducing msg)
in
| (C.Appl ((C.Const r1) as _hd1::tl1), C.Appl (C.Const r2::tl2))
when Ref.eq r1 r2 ->
let relevance = NCicEnvironment.get_relevance r1 in
- let relevance = match r1 with
- | Ref.Ref (_,Ref.Con (_,_,lno)) ->
- let relevance =
- try snd (HExtlib.split_nth lno relevance)
- with Failure _ -> []
- in
- HExtlib.mk_list false lno @ relevance
- | _ -> relevance
- in
let metasenv, subst, _ =
try
List.fold_left2
raise (Uncertain (mk_msg metasenv subst context t1 t2))
| UnificationFailure _ | Uncertain _ when not (norm1 && norm2) ->
raise (KeepReducing (mk_msg metasenv subst context t1 t2))
+ | KeepReducing _ | KeepReducingThis _ -> assert false
in
metasenv, subst
else
raise (UnificationFailure (mk_msg metasenv subst context t1 t2))
| _ -> raise (KeepReducing (mk_msg metasenv subst context t1 t2))
- (*D*) in outside true; rc with exn -> outside false; raise exn
+ (*D*) in outside None; rc with exn -> outside (Some exn); raise exn
in
let try_hints metasenv subst (_,t1 as mt1) (_,t2 as mt2) (* exc*) =
(*D*) inside 'H'; try let rc =
in
pp(lazy("FUNZIONA!"));
Some (metasenv, subst)
- (*D*) in outside true; rc with exn -> outside false; raise exn
+ (*D*) in outside None; rc with exn -> outside (Some exn); raise exn
with
KeepReducing _ | UnificationFailure _ | Uncertain _ -> cand_iter tl
+ | KeepReducingThis _ -> assert false
in
cand_iter candidates
- (*D*) in outside true; rc with exn -> outside false; raise exn
+ (*D*) in outside None; rc with exn -> outside (Some exn); raise exn
in
let put_in_whd m1 m2 =
NCicReduction.reduce_machine ~delta:max_int ~subst context m1,
NCicReduction.reduce_machine ~delta:max_int ~subst context m2
in
- let fo_unif_w_hints test_eq_only metasenv subst (_,t1 as m1) (_,t2 as m2) =
+ let fo_unif_w_hints test_eq_only metasenv subst (xx1,t1 as m1) (xx2,t2 as m2) =
try fo_unif test_eq_only metasenv subst m1 m2
with
| UnificationFailure _ as exn -> raise exn
when could_reduce (NCicReduction.unwind (fst m1))
|| could_reduce (NCicReduction.unwind (fst m2))
-> raise (Uncertain msg)
- (*D*) in outside true; rc with exn -> outside false; raise exn
+ (*D*) in outside None; rc with exn -> outside (Some exn); raise exn
in
try fo_unif_w_hints test_eq_only metasenv subst (false,t1) (false,t2)
with
| KeepReducing _ -> assert false)
| KeepReducing _ -> assert false
- (*D*) in outside true; rc with KeepReducing _ -> assert false | exn -> outside false; raise exn
+ (*D*) in outside None; rc with KeepReducing _ -> assert false | exn -> outside (Some exn); raise exn
and delift_type_wrt_terms rdb metasenv subst context t args =
let lc = List.rev args @ mk_irl (List.length context) (List.length args+1) in
projects / helm.git / commitdiff