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
38ff0fc1
Commit
38ff0fc1
authored
4 years ago
by
Simon Friis Vindum
Browse files
Options
Downloads
Patches
Plain Diff
Add changes to changelog, properly reorder IsOp instance for nat
parent
e68b2730
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+7
-0
7 additions, 0 deletions
CHANGELOG.md
theories/algebra/numbers.v
+5
-5
5 additions, 5 deletions
theories/algebra/numbers.v
with
12 additions
and
5 deletions
CHANGELOG.md
+
7
−
0
View file @
38ff0fc1
...
@@ -200,6 +200,11 @@ Coq development, but not every API-breaking change is listed. Changes marked
...
@@ -200,6 +200,11 @@ Coq development, but not every API-breaking change is listed. Changes marked
exists
`heap_lang.derived_laws`
.
exists
`heap_lang.derived_laws`
.
*
Remove global
`Open Scope Z_scope`
from
`heap_lang.lang`
, and leave it up to
*
Remove global
`Open Scope Z_scope`
from
`heap_lang.lang`
, and leave it up to
reverse dependencies if they want to
`Open Scope Z_scope`
or not.
reverse dependencies if they want to
`Open Scope Z_scope`
or not.
*
Add
`min_nat`
, a RA for natural numbers with
`min`
as the operation.
*
Rename
`mnat`
to
`max_nat`
and "box" it by creating a separate type for it.
*
Move the RAs for
`nat`
and
`positive`
and the
`mnat`
RA into a separate
module. They must now be imported from
`From iris.algebra Require Import
numbers`
.
The following
`sed`
script should perform most of the renaming (FIXME: incomplete)
The following
`sed`
script should perform most of the renaming (FIXME: incomplete)
(on macOS, replace
`sed`
by
`gsed`
, installed via e.g.
`brew install gnu-sed`
):
(on macOS, replace
`sed`
by
`gsed`
, installed via e.g.
`brew install gnu-sed`
):
...
@@ -221,6 +226,8 @@ s/\blist_singletonM_included\b/list_singleton_included/g
...
@@ -221,6 +226,8 @@ s/\blist_singletonM_included\b/list_singleton_included/g
s/\bauth_both_frac_op\b/auth_both_op/g
s/\bauth_both_frac_op\b/auth_both_op/g
# inv_sep
# inv_sep
s/\binv_sep\b/inv_split/g
s/\binv_sep\b/inv_split/g
# mnat rename
s/\bmnat\b/max_nat/g
' $(find theories -name "*.v")
' $(find theories -name "*.v")
```
```
...
...
This diff is collapsed.
Click to expand it.
theories/algebra/numbers.v
+
5
−
5
View file @
38ff0fc1
...
@@ -36,6 +36,11 @@ Section nat.
...
@@ -36,6 +36,11 @@ Section nat.
intros
??;
apply
local_update_unital_discrete
=>
z
_
.
intros
??;
apply
local_update_unital_discrete
=>
z
_
.
compute
-
[
minus
plus
];
lia
.
compute
-
[
minus
plus
];
lia
.
Qed
.
Qed
.
(* This one has a higher precendence than [is_op_op] so we get a [+] instead
of an [⋅]. *)
Global
Instance
is_op_plus
(
n1
n2
:
nat
)
:
IsOp
(
n1
+
n2
)
n1
n2
.
Proof
.
done
.
Qed
.
End
nat
.
End
nat
.
(** ** Natural numbers with [max] as the operation. *)
(** ** Natural numbers with [max] as the operation. *)
...
@@ -130,11 +135,6 @@ Section min_nat.
...
@@ -130,11 +135,6 @@ Section min_nat.
Global
Instance
:
@
IdemP
min_nat
(
=
)
(
⋅
)
.
Global
Instance
:
@
IdemP
min_nat
(
=
)
(
⋅
)
.
Proof
.
intros
[
x
]
.
rewrite
min_nat_op_min
.
apply
f_equal
.
lia
.
Qed
.
Proof
.
intros
[
x
]
.
rewrite
min_nat_op_min
.
apply
f_equal
.
lia
.
Qed
.
(* This one has a higher precendence than [is_op_op] so we get a [+] instead
of an [⋅]. *)
Global
Instance
is_op_plus
(
n1
n2
:
nat
)
:
IsOp
(
n1
+
n2
)
n1
n2
.
Proof
.
done
.
Qed
.
End
min_nat
.
End
min_nat
.
(** ** Positive integers with [Pos.add] as the operation. *)
(** ** Positive integers with [Pos.add] as the operation. *)
...
...
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