Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Iris
Iris
Commits
3f715e68
Commit
3f715e68
authored
Mar 11, 2016
by
Ralf Jung
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.mpi-sws.org:FP/iris-coq
parents
d6dba217
3ecc71db
Pipeline
#314
passed with stage
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
algebra/sts.v
algebra/sts.v
+3
-3
No files found.
algebra/sts.v
View file @
3f715e68
...
...
@@ -385,6 +385,7 @@ Qed.
(* This is surprisingly different from to_validity_included. I am not sure
whether this is because to_validity_included is non-canonical, or this
one here is non-canonical - but I suspect both. *)
(*
Lemma sts_frag_included S1 S2 T1 T2 :
closed S2 T2 → S2 ≢ ∅ →
(sts_frag S1 T1 ≼ sts_frag S2 T2) ↔
...
...
@@ -392,7 +393,7 @@ Lemma sts_frag_included S1 S2 T1 T2 :
S2 ≡ S1 ∩ up_set S2 Tf).
Proof.
intros ??; split.
-
intros
[[???]
?].
(*
- intros [[???] ?].
destruct (to_validity_included (sts_dra.car sts) (sts_dra.frag S1 T1) (sts_dra.frag S2 T2)) as [Hfincl Htoincl].
intros Hcl2 HS2ne. split.
- intros Hincl. destruct Hfincl as ((Hcl1 & ?) & (z & EQ & Hval & Hdisj)).
...
...
@@ -413,7 +414,6 @@ Proof.
* by apply up_set_non_empty.
+ constructor; last done. by rewrite -HS.
Qed.
*)
Admitted
.
Lemma sts_frag_included' S1 S2 T :
closed S2 T → closed S1 T → S2 ≢ ∅ → S1 ≢ ∅ → S2 ≡ S1 ∩ up_set S2 ∅ →
...
...
@@ -421,7 +421,7 @@ Lemma sts_frag_included' S1 S2 T :
Proof.
intros. apply sts_frag_included; split_and?; auto.
exists ∅; split_and?; done || set_solver+.
Qed
.
Qed.
*)
End
stsRA
.
(** STSs without tokens: Some stuff is simpler *)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment