Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Iris
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
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
Pierre Roux
Iris
Commits
80623a8c
Commit
80623a8c
authored
5 years ago
by
Dan Frumin
Browse files
Options
Downloads
Patches
Plain Diff
Get rid of a superflous argument to `fresh_locs`.
parent
5123ac6b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
theories/heap_lang/lang.v
+1
-1
1 addition, 1 deletion
theories/heap_lang/lang.v
theories/heap_lang/locations.v
+4
-4
4 additions, 4 deletions
theories/heap_lang/locations.v
with
5 additions
and
5 deletions
theories/heap_lang/lang.v
+
1
−
1
View file @
80623a8c
...
@@ -685,7 +685,7 @@ Lemma fill_item_no_val_inj Ki1 Ki2 e1 e2 :
...
@@ -685,7 +685,7 @@ Lemma fill_item_no_val_inj Ki1 Ki2 e1 e2 :
Proof
.
revert
Ki1
.
induction
Ki2
,
Ki1
;
naive_solver
eauto
with
f_equal
.
Qed
.
Proof
.
revert
Ki1
.
induction
Ki2
,
Ki1
;
naive_solver
eauto
with
f_equal
.
Qed
.
Lemma
alloc_fresh
v
n
σ
:
Lemma
alloc_fresh
v
n
σ
:
let
l
:=
fresh_locs
(
dom
(
gset
loc
)
σ
.(
heap
))
n
in
let
l
:=
fresh_locs
(
dom
(
gset
loc
)
σ
.(
heap
))
in
0
<
n
→
0
<
n
→
head_step
(
AllocN
((
Val
$
LitV
$
LitInt
$
n
))
(
Val
v
))
σ
[]
head_step
(
AllocN
((
Val
$
LitV
$
LitInt
$
n
))
(
Val
v
))
σ
[]
(
Val
$
LitV
$
LitLoc
l
)
(
state_init_heap
l
n
v
σ
)
[]
.
(
Val
$
LitV
$
LitLoc
l
)
(
state_init_heap
l
n
v
σ
)
[]
.
...
...
This diff is collapsed.
Click to expand it.
theories/heap_lang/locations.v
+
4
−
4
View file @
80623a8c
...
@@ -30,13 +30,13 @@ Proof. destruct l; rewrite /loc_add /=; f_equal; lia. Qed.
...
@@ -30,13 +30,13 @@ Proof. destruct l; rewrite /loc_add /=; f_equal; lia. Qed.
Instance
loc_add_inj
l
:
Inj
eq
eq
(
loc_add
l
)
.
Instance
loc_add_inj
l
:
Inj
eq
eq
(
loc_add
l
)
.
Proof
.
destruct
l
;
rewrite
/
Inj
/
loc_add
/=
;
intros
;
simplify_eq
;
lia
.
Qed
.
Proof
.
destruct
l
;
rewrite
/
Inj
/
loc_add
/=
;
intros
;
simplify_eq
;
lia
.
Qed
.
Definition
fresh_locs
(
ls
:
gset
loc
)
(
n
:
Z
)
:
loc
:=
Definition
fresh_locs
(
ls
:
gset
loc
)
:
loc
:=
{|
loc_car
:=
set_fold
(
λ
k
r
,
(
1
+
loc_car
k
)
`
max
`
r
)
%
Z
1
%
Z
ls
|}
.
{|
loc_car
:=
set_fold
(
λ
k
r
,
(
1
+
loc_car
k
)
`
max
`
r
)
%
Z
1
%
Z
ls
|}
.
Lemma
fresh_locs_fresh
ls
n
i
:
Lemma
fresh_locs_fresh
ls
i
:
(
0
≤
i
)
%
Z
→
(
i
<
n
)
%
Z
→
fresh_locs
ls
n
+
ₗ
i
∉
ls
.
(
0
≤
i
)
%
Z
→
fresh_locs
ls
+
ₗ
i
∉
ls
.
Proof
.
Proof
.
intros
Hi
_
.
cut
(
∀
l
,
l
∈
ls
→
loc_car
l
<
loc_car
(
fresh_locs
ls
n
)
+
i
)
%
Z
.
intros
Hi
.
cut
(
∀
l
,
l
∈
ls
→
loc_car
l
<
loc_car
(
fresh_locs
ls
)
+
i
)
%
Z
.
{
intros
help
Hf
%
help
.
simpl
in
*.
lia
.
}
{
intros
help
Hf
%
help
.
simpl
in
*.
lia
.
}
apply
(
set_fold_ind_L
(
λ
r
ls
,
∀
l
,
l
∈
ls
→
(
loc_car
l
<
r
+
i
)
%
Z
));
apply
(
set_fold_ind_L
(
λ
r
ls
,
∀
l
,
l
∈
ls
→
(
loc_car
l
<
r
+
i
)
%
Z
));
set_solver
by
eauto
with
lia
.
set_solver
by
eauto
with
lia
.
...
...
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