diff --git a/opam b/opam index d80a8a36089ef53f4e24c361381578ae803f23da..b1661244092b46a44ff0148149c2b7af232b68d0 100644 --- a/opam +++ b/opam @@ -11,5 +11,5 @@ build: [make "-j%{jobs}%"] install: [make "install"] remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/lrust'" ] depends: [ - "coq-iris" { (= "dev.2017-11-04.0") | (= "dev") } + "coq-iris" { (= "dev.2017-11-07.2") | (= "dev") } ] diff --git a/theories/lang/lang.v b/theories/lang/lang.v index bd1dc08479c9cf521c7baf0e7a6e87fe5344ea95..ff076bd1203608f29a711ea17ce1d976f107571f 100644 --- a/theories/lang/lang.v +++ b/theories/lang/lang.v @@ -638,7 +638,7 @@ Proof. apply: (irreducible_fill (K:=ectx_language.fill K)); first done. apply prim_head_irreducible; unfold stuck_term. - inversion 1. - - apply ectxi_language_sub_values. + - apply ectxi_language_sub_redexes_are_values. intros [] ??; simplify_eq/=; eauto; discriminate_list. Qed. diff --git a/theories/lang/races.v b/theories/lang/races.v index 8fa7a5476eb0d22807e902c4d800012323247bc4..bc7399c106ca576e281b731638715b3e7dc5a615 100644 --- a/theories/lang/races.v +++ b/theories/lang/races.v @@ -76,7 +76,7 @@ Lemma next_access_head_reductible_ctx e σ σ' a l K : Proof. intros Hhead Hred. apply prim_head_reducible. - eapply (reducible_fill (K:=ectx_language.fill K)), Hred. destruct Hhead; eauto. - - apply ectxi_language_sub_values. intros [] ? ->; inversion Hhead; eauto. + - apply ectxi_language_sub_redexes_are_values. intros [] ? ->; inversion Hhead; eauto. Qed. Definition head_reduce_not_to_stuck (e : expr) (σ : state) := diff --git a/theories/lang/tactics.v b/theories/lang/tactics.v index e890b4880e27e80c2fac2de25b1b730984752f97..91f722458b3295372bbc32fe8686062543d29bff 100644 --- a/theories/lang/tactics.v +++ b/theories/lang/tactics.v @@ -160,7 +160,7 @@ Proof. destruct e; simpl; try done; repeat (case_match; try done); inversion 1; try (apply val_irreducible; rewrite ?language.to_of_val; naive_solver eauto); []. rewrite -[stuck_term](fill_empty). apply stuck_irreducible. - - apply ectxi_language_sub_values=> /= Ki e' Hfill. + - apply ectxi_language_sub_redexes_are_values=> /= Ki e' Hfill. revert He. destruct e; simpl; try done; repeat (case_match; try done); rewrite ?bool_decide_spec; destruct Ki; inversion Hfill; subst; clear Hfill;