Skip to content
Snippets Groups Projects
Commit 581c9a28 authored by Ike Mulder's avatar Ike Mulder
Browse files

Merge branch 'ci/update-actris-to-dev.2024-09-04.0.d2b8a5fa' into 'master'

Update Actris to dev.2024-09-04.0.d2b8a5fa.

See merge request !24
parents 6209e201 49a024f0
No related branches found
No related tags found
1 merge request!24Update Actris to dev.2024-09-04.0.d2b8a5fa.
Pipeline #107983 passed
...@@ -10,7 +10,7 @@ bug-reports: "https://gitlab.mpi-sws.org/iris/diaframe/-/issues" ...@@ -10,7 +10,7 @@ bug-reports: "https://gitlab.mpi-sws.org/iris/diaframe/-/issues"
depends: [ depends: [
"coq-diaframe-heap-lang" {= version} "coq-diaframe-heap-lang" {= version}
"coq" { = "8.18.0" } "coq" { = "8.18.0" }
"coq-actris" { = "dev.2024-08-16.0.858f21a9" | = "~dev" } "coq-actris" { = "dev.2024-09-04.0.d2b8a5fa" | = "~dev" }
] ]
build: [make "-j%{jobs}%" "diaframe-actris"] build: [make "-j%{jobs}%" "diaframe-actris"]
install: [make "install-diaframe-actris"] install: [make "install-diaframe-actris"]
...@@ -119,7 +119,7 @@ Section actris_test. ...@@ -119,7 +119,7 @@ Section actris_test.
iSteps as "Hmap Hlk Hclient". iLöb as "IH". iSteps as "Hmap Hlk Hclient". iLöb as "IH".
wp_lam. wp_lam.
iSteps as (ms _ n _ Hnms) "??" / iSteps as (ms _ n _ Hnms) "??" /
as (ms _ n _ Hnms [|]) "??? _". as (ms _ n _ Hnms [|]) "????".
{ iPureIntro. destruct n; eauto. right. fold_leibniz. by apply Hnms. } { iPureIntro. destruct n; eauto. right. fold_leibniz. by apply Hnms. }
- iSteps; iPureIntro; multiset_solver. - iSteps; iPureIntro; multiset_solver.
- iSteps. - iSteps.
...@@ -167,7 +167,7 @@ Section actris_test. ...@@ -167,7 +167,7 @@ Section actris_test.
{{ ys', RET #(); llist IA l [] llist IB k (ys' ++ ys) ys' (xs ++ elements X) ≫= map }}. {{ ys', RET #(); llist IA l [] llist IB k (ys' ++ ys) ys' (xs ++ elements X) ≫= map }}.
Proof. Proof.
iStartProof2 => /=. iLöb as "IH" forall (n l xs X ys). iStartProof2 => /=. iLöb as "IH" forall (n l xs X ys).
iStep as (HnX) "???". wp_lam. iSteps as "Hc" / as (n b) "Hc HSnX". iStep as (HnX) "???". wp_lam. iSteps as "Hc" / as (n b) "HSnX Hc".
{ destruct HnX as [-> ->]; try lia. { destruct HnX as [-> ->]; try lia.
iSteps. iSteps.
iExists []; simpl. iExists []; simpl.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment