Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
Iris
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rodolphe Lepigre
Iris
Commits
59a8f5bf
Commit
59a8f5bf
authored
Aug 09, 2016
by
Ralf Jung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
better spacing for functor declarations
parent
7b6a32fe
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
9 deletions
+7
-9
heap_lang/lib/barrier/proof.v
heap_lang/lib/barrier/proof.v
+2
-3
heap_lang/lib/counter.v
heap_lang/lib/counter.v
+1
-1
heap_lang/lib/lock.v
heap_lang/lib/lock.v
+1
-1
heap_lang/lib/spawn.v
heap_lang/lib/spawn.v
+2
-3
heap_lang/lib/ticket_lock.v
heap_lang/lib/ticket_lock.v
+1
-1
No files found.
heap_lang/lib/barrier/proof.v
View file @
59a8f5bf
...
...
@@ -7,15 +7,14 @@ From iris.program_logic Require Import saved_prop sts.
From
iris
.
heap_lang
Require
Import
proofmode
.
From
iris
.
heap_lang
.
lib
.
barrier
Require
Import
protocol
.
(** The CMRAs we need. *)
(** The CMRAs
/functors
we need. *)
(* Not bundling heapG, as it may be shared with other users. *)
Class
barrierG
Σ
:
=
BarrierG
{
barrier_stsG
:
>
stsG
Σ
sts
;
barrier_savedPropG
:
>
savedPropG
Σ
idCF
;
}.
(** The Functors we need. *)
Definition
barrier
Σ
:
gFunctors
:
=
#[
sts
Σ
sts
;
savedProp
Σ
idCF
].
(* Show and register that they match. *)
Instance
subG_barrier
Σ
{
Σ
}
:
subG
barrier
Σ
Σ
→
barrierG
Σ
.
Proof
.
intros
[?
[?
_
]%
subG_inv
]%
subG_inv
.
split
;
apply
_
.
Qed
.
...
...
heap_lang/lib/counter.v
View file @
59a8f5bf
...
...
@@ -14,8 +14,8 @@ Global Opaque newcounter inc get.
(** The CMRA we need. *)
Class
counterG
Σ
:
=
CounterG
{
counter_tokG
:
>
authG
Σ
mnatUR
}.
Definition
counter
Σ
:
gFunctors
:
=
#[
auth
Σ
mnatUR
].
Instance
subG_counter
Σ
{
Σ
}
:
subG
counter
Σ
Σ
→
counterG
Σ
.
Proof
.
intros
[?
_
]%
subG_inv
.
split
;
apply
_
.
Qed
.
...
...
heap_lang/lib/lock.v
View file @
59a8f5bf
...
...
@@ -14,8 +14,8 @@ Global Opaque newlock acquire release.
(** The CMRA we need. *)
(* Not bundling heapG, as it may be shared with other users. *)
Class
lockG
Σ
:
=
LockG
{
lock_tokG
:
>
inG
Σ
(
exclR
unitC
)
}.
Definition
lock
Σ
:
gFunctors
:
=
#[
GFunctor
(
constRF
(
exclR
unitC
))].
Instance
subG_lock
Σ
{
Σ
}
:
subG
lock
Σ
Σ
→
lockG
Σ
.
Proof
.
intros
[?%
subG_inG
_
]%
subG_inv
.
split
;
apply
_
.
Qed
.
...
...
heap_lang/lib/spawn.v
View file @
59a8f5bf
...
...
@@ -16,12 +16,11 @@ Definition join : val :=
end
.
Global
Opaque
spawn
join
.
(** The CMRA we need. *)
(** The CMRA
& functor
we need. *)
(* Not bundling heapG, as it may be shared with other users. *)
Class
spawnG
Σ
:
=
SpawnG
{
spawn_tokG
:
>
inG
Σ
(
exclR
unitC
)
}.
(** The functor we need and register that they match. *)
Definition
spawn
Σ
:
gFunctors
:
=
#[
GFunctor
(
constRF
(
exclR
unitC
))].
Instance
subG_spawn
Σ
{
Σ
}
:
subG
spawn
Σ
Σ
→
spawnG
Σ
.
Proof
.
intros
[?%
subG_inG
_
]%
subG_inv
.
split
;
apply
_
.
Qed
.
...
...
heap_lang/lib/ticket_lock.v
View file @
59a8f5bf
...
...
@@ -35,9 +35,9 @@ Class tlockG Σ := TlockG {
tlock_G
:
>
authG
Σ
(
gset_disjUR
nat
)
;
tlock_exclG
:
>
inG
Σ
(
exclR
unitC
)
}.
Definition
tlock
Σ
:
gFunctors
:
=
#[
auth
Σ
(
gset_disjUR
nat
)
;
GFunctor
(
constRF
(
exclR
unitC
))].
Instance
subG_tlock
Σ
{
Σ
}
:
subG
tlock
Σ
Σ
→
tlockG
Σ
.
Proof
.
intros
[?
[?%
subG_inG
_
]%
subG_inv
]%
subG_inv
.
split
;
apply
_
.
Qed
.
...
...
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