Skip to content

Commit 1d1fefd

Browse files
aleksnanevskikevinlopez
and
kevinlopez
authored
v2.0 (#27)
* blah * adding files * renaming * blah * removed interlude.v * started refactoring model.v * minor * started refactoring examples * continuing refactoring * refactored a bunch of examples. going on with graph.v * started refactoring graph.v * minor * wip * continuing with refactoring graph.v. * blah * blah * blah * comments about do we want to follow dangling edges to their dangling target node or not. i think not. * comments * minor * minor * blah * wip * wip * refactored schorr.v * committed schorr * minor * minor * minor * minor * moved some helper lemmas to seqext.v * blah * blah * blah * blah * blah * blah * blah * blah * wip * some cleaning up in congprog.v * cleanup in congprog.v * cleanup * cleanup * blah * ported proofs of congr_prog * modified congprog to use postconditions with vfun. * abstracting the code in congprog.v * defining shape predicate * made abstract type of root pointers of arrays and kvmaps be small (ie.. declared as Set) * developed a number of lemmas about star. to be moved to other files later * defining shape predicate * defining shape predicate * blah * reorgainzation of pred.v prelude.v and consequences. also, largely cleaned up kvmaps.v and hashtable.v to get the inheritance and hiding to behave properly * removed some files that shouldn't be here * moved additional lemmas from individual files to fcsl-pcm. also, cleaned up congprog, hashtab, kvmaps, etc. * minor * sectioning of congmath.v * minor * modifying comments * changed natmap to add view for last_val * hm * removed extraneous lemmas from unionmap.v * minor * changed In_dom_umfilt lemma to use exists2 instead of exists. * found a way to view "weird" lemmas in natmap.v as non-weird. removed the corresponding comment, and repositioned the lemmas. * propagating changed to natmap.v from mathador * added alternative lemma for seq_lt irreflexivity, one that isn't given as an equation, but as implication into False. * renaming slt_irrN into sltnn * added validPt2 and domPt2 * propagating changes from mathador * blah * ibalh * blah * blah * blah * many changes introduced to deal with graphs * preparing for release * removed files inheritted from fcsl-pcm * added Marcos to the list of authors * regenerated .opam files from meta.yml * removed devcomments * removed some lemmas that have recently been included into mathcomp * regenerated htt/dune file * playing with dune * playing with dune * forgot some files * blah * blah * blah * blah * changed mustache files --------- Co-authored-by: kevinlopez <[email protected]>
1 parent 0a4c86f commit 1d1fefd

38 files changed

+4475
-3819
lines changed

.github/workflows/docker-action.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ jobs:
1616
strategy:
1717
matrix:
1818
image:
19-
- 'mathcomp/mathcomp:1.17.0-coq-8.15'
20-
- 'mathcomp/mathcomp:1.17.0-coq-8.18'
19+
- 'mathcomp/mathcomp:2.2.0-coq-8.19'
20+
- 'mathcomp/mathcomp:2.2.0-coq-8.20'
21+
- 'mathcomp/mathcomp:latest-coq-dev'
2122
fail-fast: false
2223
steps:
2324
- uses: actions/checkout@v2
2425
- uses: coq-community/docker-coq-action@v1
2526
with:
26-
opam_file: 'coq-htt-examples.opam'
27+
opam_file: 'coq-htt.opam'
2728
custom_image: ${{ matrix.image }}
2829

2930

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ that HTT implements Separation logic as a shallow embedding in Coq.
3737
- Aleksandar Nanevski (initial)
3838
- Germán Andrés Delbianco
3939
- Alexander Gryzlov
40+
- Marcos Grandury
4041
- License: [Apache-2.0](LICENSE)
41-
- Compatible Coq versions: Coq 8.15 to 8.17
42+
- Compatible Coq versions: Coq 8.19 to 8.20
4243
- Additional dependencies:
43-
- [MathComp ssreflect 1.17](https://math-comp.github.io)
44+
- [MathComp ssreflect 2.2](https://math-comp.github.io)
4445
- [MathComp algebra](https://math-comp.github.io)
45-
- [MathComp fingroup](https://math-comp.github.io)
46-
- [FCSL-PCM 1.8](https://github.com/imdea-software/fcsl-pcm)
46+
- [FCSL-PCM 2.0](https://github.com/imdea-software/fcsl-pcm)
4747
- [Dune](https://dune.build) 2.5 or later
4848
- Coq namespace: `htt`
4949
- Related publication(s):

_CoqProject

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,35 @@
1-
-Q . htt
2-
-arg "-w -notation-overridden,-local-declaration,-redundant-canonical-projection,-projection-no-head-constant"
1+
-Q examples htt
2+
-Q htt htt
3+
-docroot docs # where the documentation should go
34

4-
theories/options.v
5-
theories/interlude.v
6-
theories/domain.v
7-
theories/model.v
8-
theories/heapauto.v
5+
-arg -w -arg -notation-overridden
6+
-arg -w -arg -redundant-canonical-projection
7+
8+
# release-specific arguments
9+
-arg -w -arg -notation-incompatible-prefix # specific to coq8.20.0
10+
-arg -w -arg -deprecated-from-Coq # specific to coq8.21
11+
-arg -w -arg -deprecated-dirpath-Coq # specific to coq8.21
12+
13+
htt/options.v
14+
htt/domain.v
15+
htt/model.v
16+
htt/heapauto.v
917
examples/exploit.v
1018
examples/gcd.v
19+
examples/counter.v
1120
examples/llist.v
12-
examples/array.v
13-
examples/bubblesort.v
14-
examples/quicksort.v
15-
examples/stack.v
1621
examples/dlist.v
22+
examples/array.v
1723
examples/queue.v
1824
examples/cyclic.v
25+
examples/stack.v
1926
examples/bintree.v
2027
examples/bst.v
2128
examples/kvmaps.v
2229
examples/hashtab.v
23-
examples/counter.v
30+
examples/bubblesort.v
31+
examples/quicksort.v
2432
examples/congmath.v
25-
examples/tree.v
33+
examples/congprog.v
34+
examples/tree.v
2635
examples/union_find.v

coq-htt-examples.opam renamed to coq-htt-core.opam

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# This file was generated from `meta.yml`, please do not edit manually.
2+
# Follow the instructions on https://github.com/coq-community/templates to regenerate.
23

34
opam-version: "2.0"
45
maintainer: "[email protected]"
@@ -30,14 +31,13 @@ variables). The connection reconciles dependent types with effects of state and
3031
establishes Separation logic as a type theory for such effects. In implementation terms, it means
3132
that HTT implements Separation logic as a shallow embedding in Coq."""
3233

33-
build: [make "-j%{jobs}%"]
34-
install: [make "install"]
34+
build: ["dune" "build" "-p" name "-j" jobs]
3535
depends: [
36-
"coq" { (>= "8.15" & < "8.19~") | (= "dev") }
37-
"coq-mathcomp-ssreflect" { (>= "1.17.0" & < "1.18~") | (= "dev") }
36+
"dune" {>= "3.6"}
37+
"coq" { (>= "8.19" & < "8.21~") | (= "dev") }
38+
"coq-mathcomp-ssreflect" { (>= "2.2.0" & < "2.3~") | (= "dev") }
3839
"coq-mathcomp-algebra"
39-
"coq-mathcomp-fingroup"
40-
"coq-fcsl-pcm" { (>= "1.8.0" & < "1.9~") | (= "dev") }
40+
"coq-fcsl-pcm" { (>= "2.0.0" & < "2.1~") | (= "dev") }
4141
]
4242

4343
tags: [
@@ -50,4 +50,5 @@ authors: [
5050
"Aleksandar Nanevski"
5151
"Germán Andrés Delbianco"
5252
"Alexander Gryzlov"
53+
"Marcos Grandury"
5354
]

coq-htt.opam

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# This file was generated from `meta.yml`, please do not edit manually.
2-
# Follow the instructions on https://github.com/coq-community/templates to regenerate.
3-
42
opam-version: "2.0"
53
maintainer: "[email protected]"
64
version: "dev"
@@ -31,14 +29,13 @@ variables). The connection reconciles dependent types with effects of state and
3129
establishes Separation logic as a type theory for such effects. In implementation terms, it means
3230
that HTT implements Separation logic as a shallow embedding in Coq."""
3331

34-
build: ["dune" "build" "-p" name "-j" jobs]
32+
build: [make "-j%{jobs}%"]
33+
install: [make "install"]
3534
depends: [
36-
"dune" {>= "2.5"}
37-
"coq" { (>= "8.15" & < "8.19~") | (= "dev") }
38-
"coq-mathcomp-ssreflect" { (>= "1.17.0" & < "1.18~") | (= "dev") }
35+
"coq" { (>= "8.19" & < "8.21~") | (= "dev") }
36+
"coq-mathcomp-ssreflect" { (>= "2.2.0" & < "2.3~") | (= "dev") }
3937
"coq-mathcomp-algebra"
40-
"coq-mathcomp-fingroup"
41-
"coq-fcsl-pcm" { (>= "1.8.0" & < "1.9~") | (= "dev") }
38+
"coq-fcsl-pcm" { (>= "2.0.0" & < "2.1~") | (= "dev") }
4239
]
4340

4441
tags: [
@@ -51,4 +48,5 @@ authors: [
5148
"Aleksandar Nanevski"
5249
"Germán Andrés Delbianco"
5350
"Alexander Gryzlov"
51+
"Marcos Grandury"
5452
]

dune-project

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
(lang dune 2.5)
2-
(using coq 0.2)
1+
(lang dune 3.6)
2+
(using coq 0.6)
33
(name htt)

0 commit comments

Comments
 (0)