Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adapt to coq/coq#14773 (convert_concl has a ~cast argument) #429

Merged
merged 1 commit into from
Oct 9, 2021
Merged

Adapt to coq/coq#14773 (convert_concl has a ~cast argument) #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/depelim.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ let dependent_pattern ?(pattern_term=true) c =
in
let concllda, evd = List.fold_left mklambda (pf_concl gl, project gl) subst in
let conclapp = applistc concllda (List.rev_map pi1 subst) in
convert_concl ~check:false conclapp DEFAULTcast)
convert_concl ~cast:false ~check:false conclapp DEFAULTcast)

let annot_of_context ctx =
Array.map_of_list Context.Rel.Declaration.get_annot (List.rev ctx)
Expand Down Expand Up @@ -248,7 +248,7 @@ let pattern_call ?(pattern_term=true) c =
in
let concllda = List.fold_left mklambda (pf_concl gl) subst in
let conclapp = applistc concllda (List.rev_map pi1 subst) in
(convert_concl ~check:false conclapp DEFAULTcast))
(convert_concl ~cast:false ~check:false conclapp DEFAULTcast))

let destPolyRef sigma c =
let open GlobRef in
Expand Down
2 changes: 1 addition & 1 deletion src/equations_common.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ let autounfold_heads db db' cl gl =
if did then
match cl with
| Some hyp -> Proofview.V82.of_tactic (change_in_hyp ~check:true None (make_change_arg c') hyp) gl
| None -> Proofview.V82.of_tactic (convert_concl ~check:false c' DEFAULTcast) gl
| None -> Proofview.V82.of_tactic (convert_concl ~cast:false ~check:false c' DEFAULTcast) gl
else tclFAIL 0 (str "Nothing to unfold") gl

type hintdb_name = string
Expand Down
8 changes: 4 additions & 4 deletions src/principles_proofs.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ let _rewrite_try_change tac =
| Some _ -> Proofview.tclZERO (RewriteSucceeded concl')
| None -> Proofview.tclUNIT ())))
(function
| (RewriteSucceeded concl', _) -> convert_concl ~check:false concl' REVERTcast
| (RewriteSucceeded concl', _) -> convert_concl ~cast:true ~check:false concl' DEFAULTcast
| (exn, info) -> Proofview.tclZERO ~info exn))

let autorewrite_one b =
Expand Down Expand Up @@ -491,7 +491,7 @@ let aux_ind_fun info chop nested unfp unfids p =
in
Tacticals.New.tclTHENLIST
[observe_new "letin" (letin_pat_tac true None (Name id) (sigma, elim) occs);
observe_new "convert concl" (convert_concl ~check:false newconcl DEFAULTcast);
observe_new "convert concl" (convert_concl ~cast:false ~check:false newconcl DEFAULTcast);
observe_new "clear body" (clear_body [id]);
aux chop unfs unfids s]
| _ ->
Expand Down Expand Up @@ -898,7 +898,7 @@ let prove_unfolding_lemma info where_map f_cst funf_cst p unfp gl =
let my_simpl = opacified (to82 (simpl_in_concl)) in
let unfolds base base' =
tclTHEN (autounfold_heads [base] [base'] None)
(to82 (Tactics.reduct_in_concl ~check:false ((Reductionops.clos_norm_flags CClosure.betazeta), DEFAULTcast)))
(to82 (Tactics.reduct_in_concl ~cast:false ~check:false ((Reductionops.clos_norm_flags CClosure.betazeta), DEFAULTcast)))
in
let solve_rec_eq subst gl =
match kind (project gl) (pf_concl gl) with
Expand Down Expand Up @@ -1149,7 +1149,7 @@ let ind_elim_tac indid inds mutinds info ind_fun =
tclONCE (Tactics.apply app <*> Tactics.simpl_in_concl <*> eauto ~depth:None)]

| _, LetIn (_, b, _, t') ->
tclTHENLIST [Tactics.convert_concl ~check:false (subst1 b t') DEFAULTcast;
tclTHENLIST [Tactics.convert_concl ~cast:false ~check:false (subst1 b t') DEFAULTcast;
applyind (pred leninds) (b :: args)]
| _, Prod (_, _, t') ->
tclTHENLIST [Tactics.intro;
Expand Down