Skip to content

fixing bug from new dev rocq #52

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

Merged
aleksnanevski merged 1 commit into from
Aug 26, 2026
Merged

fixing bug from new dev rocq #52

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
5 changes: 3 additions & 2 deletions htt/heapauto.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,8 @@ Lemma gX G A (s : spec G A) g (m : heap) m0 j tm k wh r2
valid (untag (f n)) -> Q (Exn x) (f n)) ->
vrf (PullX.unpack fg) e Q.
Proof.
case: e=>e /= H; case: fu=>_ ->/= Em Hp Hv Hx; rewrite -{}Em in Hp.
case: (model_has_spec e)=>/= H E.
case: fu=>_ ->/= Em Hp Hv Hx; rewrite -{}Em in Hp.
rewrite (pullX (Syntactify.untag fm)) formE joinCA joinA.
apply: vrfV=>/validL/Hp/H V.
apply/vrf_frame/vrf_post/V.
Expand Down Expand Up @@ -520,7 +521,7 @@ Lemma gR G A (s : spec G A) g m r (e : STspec G s)
valid (untag (f n)) -> Q (Exn x) (f n)) ->
vrf (f m) e Q.
Proof.
case: e=>e /= H Hp Hv Hx; rewrite formE.
case: (model_has_spec e)=>/= H E Hp Hv Hx; rewrite formE.
apply: vrfV=>/validL/Hp/H V.
apply/vrf_frame/vrf_post/V.
by case=>[x|ex] n _ =>[/Hv|/Hx]; rewrite formE.
Expand Down
36 changes: 28 additions & 8 deletions htt/model.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,21 @@ Parameter vrf_dealloc : forall x A (v : A) j (Q : post unit),
Definition has_spec G A (s : spec G A) (e : ST A) :=
forall g i, (s g).1 i -> vrf i e (s g).2.

(* want this structure, but must work around rocq bug *)
(*
Structure STspec G A (s : spec G A) := STprog {
model :> ST A;
_ : model \In has_spec s}.
*)

Parameter STspec : forall G A, spec G A -> Type.
Parameter STprog : forall G A (s : spec G A) (model : ST A),
model \In has_spec s -> STspec s.
Parameter model : forall G A (s : spec G A),
STspec s -> ST A.
Coercion model : STspec >-> ST.
Parameter model_has_spec : forall G A (s : spec G A) (e : STspec s),
exists pf : model e \In has_spec s, e = STprog pf.

Arguments STspec G [A] s.

Expand Down Expand Up @@ -171,6 +183,7 @@ Parameter ffix : forall G A (B : A -> Type) (s : forall x : A, spec G (B x)),
forall x : A, STspec G (s x).
End VrfSig.


(********************************)
(* Definition of the Hoare type *)
(********************************)
Expand Down Expand Up @@ -345,9 +358,17 @@ Abbreviation vrf i e Q := (vrf' e i Q).
Definition has_spec (e : ST A) :=
forall g i, (s g).1 i -> vrf i e (s g).2.

Structure STspec := STprog {
model :> ST A;
_ : model \In has_spec}.
Structure STspec' := STprog' {
model' :> ST A;
_ : model' \In has_spec}.

Definition STspec := STspec'.
Definition STprog : forall model : ST A,
model \In has_spec -> STspec := STprog'.
Definition model : STspec -> ST A := model'.
Lemma model_has_spec : forall e : STspec,
exists pf : model e \In has_spec, e = STprog pf.
Proof. by case=>m pf; exists pf. Qed.

Lemma modelE e1 e2 : e1 = e2 <-> model e1 = model e2.
Proof.
Expand Down Expand Up @@ -1181,8 +1202,8 @@ Lemma gE G A (pq : spec G A) (e : STspec G pq) g (Q : post A) i :
valid m -> Q (Exn x) m) ->
vrf i e Q.
Proof.
case: e=>e /= /[apply] Hp Hv He; apply: vrfV=>V /=.
by apply/vrf_post/Hp; case=>[v|ex] m Vm H; [apply: Hv | apply: He].
case: (model_has_spec e)=>pf E /pf Hp Hv He; apply: vrfV=>V /=.
by apply/vrf_post/Hp; case=>[v|ex] m Vm H; [apply: Hv|apply: He].
Qed.

Arguments gE {G A pq e} g {Q}.
Expand Down Expand Up @@ -1268,9 +1289,8 @@ Lemma gU G A (pq : spec G A) (e : STspec G pq) i (Q : post A) g :
valid (m \+ i) -> Q (Exn x) (m \+ i)) ->
vrf i e Q.
Proof.
case: e=>e /= /[apply] Hp Hv Hx; rewrite -(unitL i).
apply/vrf_frame/vrf_post/Hp.
by case=>[x|ex] n _ =>[/Hv|/Hx].
case: (model_has_spec e)=>pf E /pf Hp Hv Hx; rewrite -(unitL i).
by apply/vrf_frame/vrf_post/Hp; case=>[x|ex] n _ =>[/Hv|/Hx].
Qed.

Notation "[gU]" := (gU tt) (at level 0).
Expand Down
Loading