Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Glen Mével
iris-time-proofs
Commits
6436bf97
Commit
6436bf97
authored
May 07, 2021
by
Jacques-Henri Jourdan
Browse files
Fix CI.
parent
d50619d0
Changes
3
Hide whitespace changes
Inline
Side-by-side
opam
View file @
6436bf97
...
...
@@ -11,6 +11,6 @@ install: [make "install"]
remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/iris_time" ]
depends: [
"coq" { (>= "8.10.2" & < "8.13~") | (= "dev") }
"coq-iris" { (= "dev.2021-0
4-19.0.9e4493f9
") | (= "dev") }
"coq-iris" { (= "dev.2021-0
5-07.0.5119ab8b
") | (= "dev") }
"coq-tlc" { (= "20200328") | (= "dev") }
]
theories/ClockIntegers.v
View file @
6436bf97
...
...
@@ -10,7 +10,6 @@ Open Scope Z_scope.
*)
Section
clock_int
.
Context
`
{
timeReceiptHeapG
Σ
}.
Context
(
nmax
:
nat
).
Context
`
(
nmax
≤
max_mach_int
).
...
...
@@ -39,9 +38,8 @@ Section clock_int.
iDestruct
(
"Post"
with
"[H]"
)
as
"Post"
.
{
iIntros
"{$H} !%"
.
lia
.
}
wp_tick_op
=>//.
by
rewrite
/
bin_op_eval
/=
/
to_mach_int
/
mach_int_bounded
decide_
left
.
by
rewrite
/
bin_op_eval
/=
/
to_mach_int
/
mach_int_bounded
decide_
True_pi
.
Qed
.
End
clock_int
.
(*
...
...
@@ -80,7 +78,7 @@ Section snapclock_int.
(* FIXME : why isn't lia able to do this directly? *)
trans
0
.
unfold
min_mach_int
;
lia
.
lia
.
}
wp_tick_op
.
{
by
rewrite
/
bin_op_eval
/=
/
to_mach_int
/
mach_int_bounded
decide_
left
.
}
{
by
rewrite
/
bin_op_eval
/=
/
to_mach_int
/
mach_int_bounded
decide_
True_pi
.
}
iApply
"Post"
.
iSplit
.
auto
with
lia
.
rewrite
Z2Nat
.
inj_add
//
Nat
.
add_comm
//.
Qed
.
...
...
@@ -107,7 +105,6 @@ Section snapclock_int.
iDestruct
(
"Post"
with
"[H]"
)
as
"Post"
.
{
iSplit
;
auto
with
lia
.
}
wp_tick_op
=>//.
by
rewrite
/
bin_op_eval
/=
/
to_mach_int
/
mach_int_bounded
decide_
left
.
by
rewrite
/
bin_op_eval
/=
/
to_mach_int
/
mach_int_bounded
decide_
True_pi
.
Qed
.
End
snapclock_int
.
theories/union_find/Proof.v
View file @
6436bf97
...
...
@@ -755,7 +755,7 @@ Proof using.
repeat
iSplit
;
try
iPureIntro
.
{
applys
*
Inv_make
.
}
{
applys
*
Mem_make
.
}
iApply
mapsto_M_insert
;
[
done
|
|
by
iFrame
].
rewrite
/=
/
to_mach_int
decide_
left
/=
;
[
by
apply
(
proj2_sig
mach_int_0
)|].
rewrite
/=
/
to_mach_int
decide_
True_pi
/=
;
[
by
apply
(
proj2_sig
mach_int_0
)|].
intros
?.
by
rewrite
(
exists_proj1_pi
_
mach_int_0
).
Qed
.
...
...
@@ -1036,7 +1036,7 @@ Proof using.
assert
(
`
k1
=
`
k1'
)
as
->
by
lia
.
rewrite
(
_:
`
k1'
=
K
y
)
//.
rewrite
Z
.
add_comm
-(
Nat2Z
.
inj_add
1
).
done
.
}
wp_tick_seq
.
wp_tick_op
.
{
by
rewrite
/
bin_op_eval
/=
/
to_mach_int
decide_
left
.
}
{
by
rewrite
/
bin_op_eval
/=
/
to_mach_int
decide_
True_pi
.
}
iDestruct
(
mapsto_M_acc
_
x
with
"HM"
)
as
(
v''
Hv''
)
"[Hx HM]"
.
{
rewrite
lookup_insert_ne
//.
congruence
.
}
wp_tick_pair
.
wp_tick_inj
.
wp_tick_store
.
wp_tick_seq
.
...
...
@@ -1047,7 +1047,7 @@ Proof using.
iSplit
;
last
iApply
(
"HM"
with
"[%] Hx"
).
{
iPureIntro
.
applys
*
Mem_link_incr
HM
.
congruence
.
applys
update2_sym
.
}
rewrite
/=
-(
_:
(
`
k1
+
1
)
=
(
K
y
+
1
)%
nat
)
//.
{
by
rewrite
/
to_mach_int
decide_
left
/=.
}
{
by
rewrite
/
to_mach_int
decide_
True_pi
/=.
}
assert
(
`
k1
+
1
=
K
y
+
1
)%
Z
as
->
by
lia
.
by
rewrite
->
Nat2Z
.
inj_add
.
}
Qed
.
...
...
Write
Preview
Supports
Markdown
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