diff options
Diffstat (limited to 'tactics/refine.ml')
| -rw-r--r-- | tactics/refine.ml | 64 |
1 files changed, 47 insertions, 17 deletions
diff --git a/tactics/refine.ml b/tactics/refine.ml index 5b162729..84e9dccc 100644 --- a/tactics/refine.ml +++ b/tactics/refine.ml @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(* $Id: refine.ml 9364 2006-11-11 11:59:42Z herbelin $ *) +(* $Id: refine.ml 9841 2007-05-19 21:13:42Z herbelin $ *) (* JCF -- 6 janvier 1998 EXPERIMENTAL *) @@ -125,7 +125,7 @@ let replace_in_array keep_length env sigma a = v',mm,sgp let fresh env n = - let id = match n with Name x -> x | _ -> id_of_string "_" in + let id = match n with Name x -> x | _ -> id_of_string "_H" in next_global_ident_away true id (ids_of_named_context (named_context env)) let rec compute_metamap env sigma c = match kind_of_term c with @@ -158,17 +158,22 @@ let rec compute_metamap env sigma c = match kind_of_term c with end | LetIn (name, c1, t1, c2) -> - if occur_meta c1 then - error "Refine: body of let-in cannot contain existentials"; let v = fresh env name in + let th1 = compute_metamap env sigma c1 in let env' = push_named (v,Some c1,t1) env in - begin match compute_metamap env' sigma (subst1 (mkVar v) c2) with + let th2 = compute_metamap env' sigma (subst1 (mkVar v) c2) in + begin match th1,th2 with (* terme de preuve complet *) - | TH (_,_,[]) -> TH (c,[],[]) + | TH (_,_,[]), TH (_,_,[]) -> TH (c,[],[]) (* terme de preuve incomplet *) - | th -> - let m,mm,sgp = replace_by_meta env' sigma th in - TH (mkLetIn (Name v,c1,t1,m), mm, sgp) + | TH (c1,mm1,sgp1), TH (c2,mm2,sgp2) -> + let m1,mm1,sgp1 = + if sgp1=[] then (c1,mm1,[]) + else replace_by_meta env sigma th1 in + let m2,mm2,sgp2 = + if sgp2=[] then (c2,mm2,[]) + else replace_by_meta env' sigma th2 in + TH (mkNamedLetIn v m1 t1 m2, mm1@mm2, sgp1@sgp2) end (* 4. Application *) @@ -267,7 +272,8 @@ let rec tcc_aux subst (TH (c,mm,sgp) as _th) gl = refine c gl (* abstraction => intro *) - | Lambda (Name id,_,m), _ when isMeta (strip_outer_cast m) -> + | Lambda (Name id,_,m), _ -> + assert (isMeta (strip_outer_cast m)); begin match sgp with | [None] -> introduction id gl | [Some th] -> @@ -275,12 +281,23 @@ let rec tcc_aux subst (TH (c,mm,sgp) as _th) gl = (onLastHyp (fun id -> tcc_aux (mkVar id::subst) th)) gl | _ -> assert false end - - | Lambda _, _ -> - anomaly "invalid lambda passed to function tcc_aux" - (* let in *) - | LetIn (Name id,c1,t1,c2), _ when isMeta (strip_outer_cast c2) -> + | Lambda (Anonymous,_,m), _ -> (* if anon vars are allowed in evars *) + assert (isMeta (strip_outer_cast m)); + begin match sgp with + | [None] -> tclTHEN intro (onLastHyp (fun id -> clear [id])) gl + | [Some th] -> + tclTHEN + intro + (onLastHyp (fun id -> + tclTHEN + (clear [id]) + (tcc_aux (mkVar (*dummy*) id::subst) th))) gl + | _ -> assert false + end + + (* let in without holes in the body => possibly dependent intro *) + | LetIn (Name id,c1,t1,c2), _ when not (isMeta (strip_outer_cast c1)) -> let c = pf_concl gl in let newc = mkNamedLetIn id c1 t1 c in tclTHEN @@ -293,8 +310,21 @@ let rec tcc_aux subst (TH (c,mm,sgp) as _th) gl = | _ -> assert false) gl - | LetIn _, _ -> - anomaly "invalid let-in passed to function tcc_aux" + (* let in with holes in the body => unable to handle dependency + because of evars limitation, use non dependent assert instead *) + | LetIn (Name id,c1,t1,c2), _ -> + tclTHENS + (assert_tac true (Name id) t1) + [(match List.hd sgp with + | None -> tclIDTAC + | Some th -> onLastHyp (fun id -> tcc_aux (mkVar id::subst) th)); + (match List.tl sgp with + | [] -> refine (subst1 (mkVar id) c2) (* a complete proof *) + | [None] -> tclIDTAC (* a meta *) + | [Some th] -> (* a partial proof *) + onLastHyp (fun id -> tcc_aux (mkVar id::subst) th) + | _ -> assert false)] + gl (* fix => tactique Fix *) | Fix ((ni,_),(fi,ai,_)) , _ -> |