From e051894d0277450868aa7c1ff720439871beba22 Mon Sep 17 00:00:00 2001 From: Ralf Jung <jung@mpi-sws.org> Date: Fri, 12 Aug 2022 17:48:53 -0400 Subject: [PATCH] nicer proof script fix --- theories/typing/lib/cell.v | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/theories/typing/lib/cell.v b/theories/typing/lib/cell.v index 3b0284d8..1383b30b 100644 --- a/theories/typing/lib/cell.v +++ b/theories/typing/lib/cell.v @@ -194,7 +194,7 @@ Section typing. iIntros (α Ï ret arg). inv_vec arg=>c x. simpl_subst. iApply type_deref; [solve_typing..|]. iIntros (c'); simpl_subst. - iApply type_new; [solve_typing..|]; iIntros (r); simpl_subst. + iApply (type_new (ty_size ty)); [solve_typing..|]; iIntros (r); simpl_subst. (* Drop to Iris level. *) iIntros (tid qmax) "#LFT #HE Htl HL HC". rewrite 3!tctx_interp_cons tctx_interp_singleton !tctx_hasty_val. @@ -209,7 +209,7 @@ Section typing. iDestruct (ty_size_eq with "Hrown") as ">Heq". iDestruct "Heq" as %Heq. (* FIXME: Changing the order of $Hr↦ $Hc'↦ breaks applying...?? *) wp_apply (wp_memcpy with "[$Hr↦ $Hc'↦]"). - { rewrite Heq /= ?Nat2Z.id //. } + { rewrite Heq //. } { f_equal. done. } iIntros "[Hr↦ Hc'↦]". wp_seq. iDestruct "Hx" as "[Hx↦ Hx†]". iDestruct "Hx↦" as (vx) "[Hx↦ Hxown]". @@ -225,7 +225,7 @@ Section typing. { rewrite 2!tctx_interp_cons tctx_interp_singleton !tctx_hasty_val. iFrame "Hc". rewrite !tctx_hasty_val' //. iSplitL "Hx↦ Hx†". - iFrame. iExists _. iFrame. iNext. iApply uninit_own. done. - - try rewrite !Nat2Z.id. iFrame. iExists _. iFrame. } + - iFrame. iExists _. iFrame. } iApply type_delete; [solve_typing..|]. iApply type_delete; [solve_typing..|]. iApply type_jump; solve_typing. -- GitLab