in
(context',ty,C.LetIn(n,s,bo))
| _ as t ->
- let irl =
+ if howmany <= 0 then
+ let irl =
CicMkImplicit.identity_relocation_list_for_metavariable context
- in
- context, t, (C.Meta (newmeta,irl))
+ in
+ context, t, (C.Meta (newmeta,irl))
+ else
+ raise (Fail "intro(s): not enough products or let-ins")
in
collect_context context howmany ty
[],[] -> []
| uri::tl,[] ->
let ty =
- let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in
+ let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in
match o with
- C.Variable (_,_,ty,_,_) ->
- CicSubstitution.subst_vars !exp_named_subst_diff ty
- | _ -> raise (WrongUriToVariable (UriManager.string_of_uri uri))
+ C.Variable (_,_,ty,_,_) ->
+ CicSubstitution.subst_vars !exp_named_subst_diff ty
+ | _ -> raise (WrongUriToVariable (UriManager.string_of_uri uri))
in
(* CSC: patch to generate ?1 : ?2 : Type in place of ?1 : Type to simulate ?1 :< Type
(match ty with
let subst_item = uri,C.Meta (fresh_meta',[]) in
newmetasenvfragment :=
(fresh_meta,[],C.Sort (C.Type (CicUniv.fresh()))) ::
- (* TASSI: ?? *)
+ (* TASSI: ?? *)
(fresh_meta',[],C.Meta (fresh_meta,[])) :: !newmetasenvfragment ;
exp_named_subst_diff := !exp_named_subst_diff @ [subst_item] ;
subst_item::(aux (tl,[]))
(* prerr_endline ("me: " ^ CicMetaSubst.ppmetasenv newmetasenv'' subst); *)
let subst_in =
(* if we just apply the subtitution, the type is irrelevant:
- we may use Implicit, since it will be dropped *)
+ we may use Implicit, since it will be dropped *)
CicMetaSubst.apply_subst ((metano,(context,bo',Cic.Implicit None))::subst)
in
let (newproof, newmetasenv''') =
let (curi,metasenv,proofbo,proofty) = proof in
let metano,context,ty = CicUtil.lookup_meta goal metasenv in
let termty,_ = T.type_of_aux' metasenv context term CicUniv.empty_ugraph in
- (* TASSI: FIXME *)
let uri,exp_named_subst,typeno,args =
match termty with
C.MutInd (uri,typeno,exp_named_subst) -> (uri,exp_named_subst,typeno,[])
let eliminator_uri =
let buri = U.buri_of_uri uri in
let name =
- let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in
+ let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in
match o with
C.InductiveDefinition (tys,_,_,_) ->
let (name,_,_,_) = List.nth tys typeno in
| _ -> assert false
in
let ty_ty,_ = T.type_of_aux' metasenv context ty CicUniv.empty_ugraph in
- (* TASSI: FIXME *)
let ext =
match ty_ty with
C.Sort C.Prop -> "_ind"
in
let eliminator_ref = C.Const (eliminator_uri,exp_named_subst) in
let ety,_ =
- T.type_of_aux' metasenv context eliminator_ref CicUniv.empty_ugraph in
+ T.type_of_aux' metasenv context eliminator_ref CicUniv.empty_ugraph in
let rec find_args_no =
function
C.Prod (_,_,t) -> 1 + find_args_no t
in
let metasenv', term_to_refine' =
CicMkImplicit.expand_implicits metasenv [] context term_to_refine in
- let refined_term,_,metasenv'',_ = (* TASSI: FIXME *)
+ let refined_term,_,metasenv'',_ =
CicRefine.type_of_aux' metasenv' context term_to_refine'
- CicUniv.empty_ugraph
+ CicUniv.empty_ugraph
in
let new_goals =
ProofEngineHelpers.compare_metasenvs
mk_tactic (elim_tac ~term)
;;
-let elim_intros_tac ~term =
- Tacticals.then_ ~start:(elim_tac ~term)
- ~continuation:(intros_tac ())
+let elim_intros_tac ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[])
+ ?depth ?using what =
+ Tacticals.then_ ~start:(elim_tac ~term:what)
+ ~continuation:(intros_tac ~mk_fresh_name_callback ?howmany:depth ())
;;
(* The simplification is performed only on the conclusion *)
-let elim_intros_simpl_tac ~term =
- Tacticals.then_ ~start:(elim_tac ~term)
+let elim_intros_simpl_tac ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name ~subst:[])
+ ?depth ?using what =
+ Tacticals.then_ ~start:(elim_tac ~term:what)
~continuation:
(Tacticals.thens
- ~start:(intros_tac ())
+ ~start:(intros_tac ~mk_fresh_name_callback ?howmany:depth ())
~continuations:
[ReductionTactics.simpl_tac
~pattern:(ProofEngineTypes.conclusion_pattern None)])
;;
-
-exception NotConvertible
-
-(*CSC: Bug (or feature?). [with_what] is parsed in the context of the goal, *)
-(*CSC: while [what] can have a richer context (because of binders) *)
-(*CSC: So it is _NOT_ possible to use those binders in the [with_what] term. *)
-(*CSC: Is that evident? Is that right? Or should it be changed? *)
-let change_tac ~pattern with_what =
-(*
- let change_tac ~what ~with_what ~pattern (proof, goal) =
- let curi,metasenv,pbo,pty = proof in
- let metano,context,ty = CicUtil.lookup_meta goal metasenv in
- (* are_convertible works only on well-typed terms *)
- let _,u =
- CicTypeChecker.type_of_aux' metasenv context with_what
- CicUniv.empty_ugraph
- in (* TASSI: FIXME *)
- let b,_ =
- CicReduction.are_convertible context what with_what u
- in
- if b then
- begin
- let replace =
- ProofEngineReduction.replace
- ~equality:(==) ~what:[what] ~with_what:[with_what]
- in
- let ty' = replace ty in
- let context' =
- List.map
- (function
- Some (name,Cic.Def (t,None))->
- Some (name,Cic.Def ((replace t),None))
- | Some (name,Cic.Decl t) -> Some (name,Cic.Decl (replace t))
- | None -> None
- | Some (_,Cic.Def (_,Some _)) -> assert false
- ) context
- in
- let metasenv' =
- List.map
- (function
- (n,_,_) when n = metano -> (metano,context',ty')
- | _ as t -> t
- ) metasenv
- in
- (curi,metasenv',pbo,pty), [metano]
- end
- else
- raise (ProofEngineTypes.Fail "Not convertible")
- in
- mk_tactic (change_tac ~what ~with_what ~pattern)
-*) assert false
projects / helm.git / blobdiff