Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lambda-rust
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Simon Spies
lambda-rust
Commits
9b8d36ce
Commit
9b8d36ce
authored
8 years ago
by
Ralf Jung
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
https://gitlab.mpi-sws.org/FP/LambdaRust-coq
parents
6dcf60e2
a4e9ac66
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
opam.pins
+1
-1
1 addition, 1 deletion
opam.pins
theories/typing/type.v
+2
-4
2 additions, 4 deletions
theories/typing/type.v
theories/typing/unsafe/refcell/ref.v
+2
-4
2 additions, 4 deletions
theories/typing/unsafe/refcell/ref.v
with
5 additions
and
9 deletions
opam.pins
+
1
−
1
View file @
9b8d36ce
coq-iris https://gitlab.mpi-sws.org/FP/iris-coq
d1ec2aec60d1f069d5ed15282d7a2cfd1e8fb499
coq-iris https://gitlab.mpi-sws.org/FP/iris-coq
8b9f59ab3630176149621661c8f3ee7b456dfe5f
This diff is collapsed.
Click to expand it.
theories/typing/type.v
+
2
−
4
View file @
9b8d36ce
...
...
@@ -341,7 +341,6 @@ Section subtyping.
Lemma
type_incl_trans
ty1
ty2
ty3
:
type_incl
ty1
ty2
-∗
type_incl
ty2
ty3
-∗
type_incl
ty1
ty3
.
Proof
.
(* TODO: this iIntros takes suspiciously long. *)
iIntros
"(% & #Ho12 & #Hs12) (% & #Ho23 & #Hs23)"
.
iSplit
;
first
(
iPureIntro
;
etrans
;
done
)
.
iSplit
;
iAlways
;
iIntros
.
...
...
@@ -462,12 +461,11 @@ Section weakening.
E1
⊆+
E2
→
L1
⊆+
L2
→
subtype
E1
L1
ty1
ty2
→
subtype
E2
L2
ty1
ty2
.
Proof
.
(* TODO: There's no lemma relating `contains` to membership (∈)...?? *)
iIntros
(
HE12
[
L'
HL12
]
%
submseteq_Permutation
Hsub
)
"#LFT HE HL"
.
iIntros
(
HE12
?
Hsub
)
"#LFT HE HL"
.
iApply
(
Hsub
with
"LFT [HE] [HL]"
)
.
-
rewrite
/
elctx_interp_0
.
by
iApply
big_sepL_submseteq
.
-
iDestruct
"HL"
as
%
HL
.
iPureIntro
.
intros
??
.
apply
HL
.
rewrite
HL12
.
set_solver
.
eauto
using
elem_of_submseteq
.
Qed
.
End
weakening
.
...
...
This diff is collapsed.
Click to expand it.
theories/typing/unsafe/refcell/ref.v
+
2
−
4
View file @
9b8d36ce
...
...
@@ -28,7 +28,7 @@ Section ref.
▷
(
α
⊑
β
)
∗
▷
&
na
{
β
,
tid
,
refcell_invN
}(
refcell_inv
tid
lrc
γ
β
ty'
)
∗
&
na
{
κ
,
tid
,
refcell_refN
}(
own
γ
(
◯
reading_st
q
ν
))
|}
%
I
.
Next
Obligation
.
iIntros
(???[|[[]|][|[[]|][]]]);
try
iIntros
"[]"
.
by
iIntros
"_"
.
iIntros
(???[|[[]|][|[[]|][]]]);
try
iIntros
"[]"
;
auto
.
Qed
.
Next
Obligation
.
iIntros
(
α
ty
E
κ
l
tid
q
?)
"#LFT Hb Htok"
.
...
...
@@ -49,9 +49,7 @@ Section ref.
iMod
(
bor_sep
with
"LFT Hb"
)
as
"[Hinv Hb]"
.
done
.
iMod
(
bor_persistent_tok
with
"LFT Hinv Htok"
)
as
"[#Hinv $]"
.
done
.
iMod
(
bor_sep
with
"LFT Hb"
)
as
"[Hκν Hb]"
.
done
.
(* FIXME : I cannot write #Hκν directly. *)
iDestruct
(
frac_bor_lft_incl
with
"LFT >[Hκν]"
)
as
"Hκν"
;
last
iDestruct
"Hκν"
as
"#Hκν"
.
iDestruct
(
frac_bor_lft_incl
with
"LFT >[Hκν]"
)
as
"#Hκν"
.
{
iApply
bor_fracture
;
try
done
.
by
rewrite
Qp_mult_1_r
.
}
iMod
(
bor_na
with
"Hb"
)
as
"#Hb"
.
done
.
eauto
20
.
Qed
.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment