pl/frap
1
0
Fork 0
mirror of https://github.com/achlipala/frap.git synced 2024-11-28 07:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make the ht1 tactic a bit more robust in HoareLogic.v

Browse source 
(Without this change, the HtIf rule can fail to generalize and unify spuriously
with goals of the right shape)
This commit is contained in:
Clément Pit-Claudel 2021-04-12 15:07:34 -04:00
parent 2ed1d52171
commit 1e81721268
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
HoareLogic.v
View file

@ -215,9 +215,15 @@ Qed.
* rules. Some other obligations are generated, generally of implications * rules. Some other obligations are generated, generally of implications
* between assertions, and [ht] also makes a best effort to solve those. *) * between assertions, and [ht] also makes a best effort to solve those. *)
Ltac ht1 := apply HtSkip || apply HtAssign || apply HtWrite || eapply HtSeq Ltac ht1 :=
match goal with
| [ |- {{ _ }} _ {{ ?P }} ] =>
tryif is_evar P then
apply HtSkip || apply HtAssign || apply HtWrite || eapply HtSeq
|| eapply HtIf || eapply HtWhile || eapply HtAssert || eapply HtIf || eapply HtWhile || eapply HtAssert
|| eapply HtStrengthenPost. else
eapply HtStrengthenPost
end.
Ltac t := cbv beta; propositional; subst; Ltac t := cbv beta; propositional; subst;
repeat match goal with repeat match goal with

10
HoareLogic_template.v
View file

@ -186,9 +186,15 @@ Qed.
* rules. Some other obligations are generated, generally of implications * rules. Some other obligations are generated, generally of implications
* between assertions, and [ht] also makes a best effort to solve those. *) * between assertions, and [ht] also makes a best effort to solve those. *)
Ltac ht1 := apply HtSkip || apply HtAssign || apply HtWrite || eapply HtSeq Ltac ht1 :=
match goal with
| [ |- {{ _ }} _ {{ ?P }} ] =>
tryif is_evar P then
apply HtSkip || apply HtAssign || apply HtWrite || eapply HtSeq
|| eapply HtIf || eapply HtWhile || eapply HtAssert || eapply HtIf || eapply HtWhile || eapply HtAssert
|| eapply HtStrengthenPost. else
eapply HtStrengthenPost
end.
Ltac t := cbv beta; propositional; subst; Ltac t := cbv beta; propositional; subst;
repeat match goal with repeat match goal with